danielgrippi
6deb924c32
fixed header; compose message on top right
2011-09-27 21:09:26 -07:00
danielgrippi
8c586c4567
added html5 boilerplate meta tags to mobile; stripped functionality to add back
2011-09-27 21:09:25 -07:00
danielgrippi
49bee9bf19
fix the build
2011-09-26 20:53:06 -07:00
Gonzalo Rodriguez
e0ffd7c63e
Merge branch 'master' into aspect_nav_rework
...
Conflicts:
features/posts_from_main_page.feature
public/javascripts/aspect-filters.js
spec/javascripts/aspect-filters-spec.js
2011-09-27 00:08:05 -03:00
Ilya Zhitomirskiy
d36da2a266
ms iz made the aspect stream ajax in
2011-09-26 19:34:35 -07:00
Maxwell Salzberg
bc1aef4999
MS IZ start to implement followed tags in the stream
2011-09-16 18:19:34 -07:00
danielgrippi
91e649977c
MS DG update copyright
2011-09-14 11:23:12 -07:00
danielgrippi
2d1bb92a5a
added missing sample() in _selected_contacts.html.haml
2011-09-11 15:18:46 -07:00
danielgrippi
ec4dc7a905
Created AspectStream; removed all logic from AspectsController#index
2011-09-11 14:16:48 -07:00
danielgrippi
fe915ecb09
don't redirect to AspectsController#new from AspectsController#index if no aspect is present
2011-09-10 09:25:38 -07:00
danielgrippi
36a9e1643e
touched up AspectsController#index for readability's sake
2011-09-10 09:24:35 -07:00
Gonzalo Rodriguez
04786bc43e
Improvements on aspect navigation rework
2011-09-08 02:13:15 -03:00
Gonzalo Rodriguez
1a6ee84ed5
Refactor aspect listings partial. Splited in two, one for index and
...
other for contacts.
2011-09-07 00:09:39 -03:00
Sarah Mei
b60101b9ad
Use explicit parameters instead of request format to determine whether we render a remote or non-remote form in aspects#new.
...
Facebox needs to get back a text/html response. We were using text/javascript to indicate that we wanted a remote form and text/html to indicate we wanted a non-remote form. The trouble is, if we request with text/javascript then that is the format we get back. It doesn't really make sense to use formats that way anyway, so I changed it to an explicit parameter. This had the nice side effect of simplifying our new-aspect views.
2011-08-28 16:08:57 -07:00
Dan Hansen
6b040c7b4a
clean up websocket receiver, add specs to content updater
2011-08-22 20:03:38 -05:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
c3bcb9c962
Revert "Revert "Merge branch 'issue1586-aspectdropdown-when-posting'""
...
This reverts commit a407f12463
2011-08-18 16:48:20 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
a407f12463
Revert "Merge branch 'issue1586-aspectdropdown-when-posting'"
...
This reverts commit 2777f16f4f8b278adff6
2011-08-18 16:16:14 -07:00
Raphael Sofaer
cc3eeac98e
Merge the aspect dropdown in the publisher with master, some things are still broken
2011-08-16 14:59:53 -07:00
Raphael Sofaer
140268365c
Simplify aspect dropdown views
2011-08-16 12:43:08 -07:00
danielgrippi
75f3accd37
moved facebook friend inviter/finder into contacts layout & re-added search
2011-08-12 17:05:01 -07:00
Andrej Kacian
2f3e504811
Add tooltip to aspect edit icon in aspect listings
2011-08-12 22:15:03 +02:00
Andrej Kacian
1062cc5bf6
Fix contact count displayed on the right for good. Also use only one randomization when selecting the random contacts to display.
2011-08-12 22:04:53 +02:00
Raphael Sofaer
56fc409a39
Most of the way towards getting posts feature working
2011-08-11 18:15:18 -07:00
ticho
d63251e6a8
Merge pull request #1703 from ticho/fix-right-bar-target-contact-count
...
Show correct contact count in right bar when changing target aspect.
2011-08-11 14:09:34 -07:00
Andrej Kacian
2a970145c8
Added icon to directly unfollow a tag to listing of followed tags.
2011-08-09 22:45:06 +02:00
Manuel Schölling
8b99ae9cb6
Changed translation and fixed misspelled function call
2011-08-07 22:00:23 +02:00
Raphael Sofaer
5eadc7d41c
Fix the last broken jasmine spec by restoring the #no_posts div
2011-08-05 15:09:16 -07:00
Andrej Kacian
2134fd2bc0
Move no_posts_message rendering above the stream, so that it doesn't get pushed down by new posts.
2011-08-04 21:45:22 +02:00
danielgrippi
b11c1a899f
add invitations partial back, removed set_invites (yay)
2011-08-03 18:47:06 -07:00
danielgrippi
b8b4ad3d84
added helpers for each of the getting started steps; make step sections dull if completed
2011-08-03 18:02:56 -07:00
danielgrippi
303b23883d
added featured users, left nav, and search boxes into getting started
2011-08-03 18:02:56 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
c2dc5fde08
dg iz reworked the getting started into a tab, need to remove the getting started steps
2011-08-03 18:02:56 -07:00
danielgrippi
6daf7f5ad9
add prompt to add more contacts if user has less than 2 contacts on aspect index
2011-08-01 15:31:13 -07:00
danielgrippi
756a20ecd4
link a user to featured users if user has zero contacts
2011-08-01 15:19:51 -07:00
Andrej Kacian
78c3d91abd
Show correct contact count in right bar when changing target aspect.
2011-07-31 12:29:56 +02:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
e42d7273a8
featured users section
2011-07-29 19:00:15 -07:00
Maxwell Salzberg
a320891df0
sample users so they are random, not the same all the time
2011-07-29 17:16:37 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
fd27fdc204
fix facebox not closing when adding a contact to an aspect via the dropdown menu
2011-07-29 15:06:24 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
00571b84cd
completed donate option
2011-07-29 11:33:30 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
7327c882b2
the working button in diaspora
2011-07-29 11:33:29 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
24fed68247
added the buttons
2011-07-29 11:33:29 -07:00
danielgrippi
68dafdbf0d
correct contact count on aspect/index
2011-07-28 16:23:31 -07:00
Raphael Sofaer
8ce5e72519
Use data-aspect_id, because integer html ids freak me out.
2011-07-28 15:51:00 -07:00
danielgrippi
ee95def580
removed js from the view. added grabbing hand while moving aspects
2011-07-28 15:34:01 -07:00
Raphael Sofaer
b367a486d3
Add helper clone to aspect sorting js, so that dragging doesn't click
2011-07-28 14:41:19 -07:00
Raphael Sofaer
ddd4424df8
Merge remote branch 'manuels/842-sortable-aspects'
...
Conflicts:
app/models/user.rb
db/schema.rb
2011-07-28 14:36:41 -07:00
Raphael Sofaer
192ae3a52b
Merge remote branch 'ticho/followed-tag-listing-separate-file'
2011-07-28 12:33:14 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
7b572bf40b
don't display connect to services unless services are configured on that pod
2011-07-27 00:11:24 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
73f9627338
moved invite people to the top
2011-07-26 23:31:42 -07:00
Andrej Kacian
2dd09cfaa2
Updated to fit current upstream master
2011-07-26 19:11:02 +02:00
Andrej Kacian
658e836f4c
Make the "No tags" string translatable
2011-07-25 23:09:53 +02:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
594c9b02b1
A admin is now able to allow open invitations
2011-07-11 13:32:02 -07:00
danielgrippi
7b7f3fc086
fix up aspects/edit popup a little
2011-07-10 18:34:47 -07:00
Manuel Schölling
0855144a0a
Issue #842 : Sortable aspects
...
Signed-off-by: Manuel Schölling <manuel.schoelling@gmx.de>
2011-07-10 20:37:11 +02:00
danielgrippi
ecaf7974e3
removed fixed sidebar for tag following
2011-07-05 16:27:41 -07:00
danielgrippi
632eacc51f
css fix on followed tags nav
2011-07-05 15:03:26 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
1e4ee472b7
WIP you can now follow a tag, needs a clean up, and ajax love
2011-07-05 15:03:26 -07:00
danielgrippi
1aed8e7e16
testing fixing left nav on aspect/index
2011-07-04 21:55:04 -07:00
Maxwell Salzberg
2f1118f95f
refactor AppConfig to guess what services are configured, and clean up the services view for a user. also, add a box so people can realize what they can connect
2011-07-04 13:54:05 -07:00
Raphael Sofaer
04f8abcf13
Check for all aspects in selected_contacts link switch, take out a couple extra steps
2011-07-04 08:39:07 -07:00
Raphael Sofaer
a715630471
make cucumber faster by logging in through a much simpler stubby controller. Save about 1m on my laptop.
2011-07-04 08:11:12 -07:00
Raphael Sofaer
af6547815e
Some view helper cleanup
2011-07-04 07:36:01 -07:00
Raphael Sofaer
f161377480
Stop loading contact objects on the main page, all we need is people
2011-07-02 16:28:52 -07:00
Raphael Sofaer
49d905c719
Some more translation stuff. @MrZYX the content thing in the Diaspora ID explanation is messed up, what's the best way to get bold text into the translation string?
2011-07-01 23:27:53 -07:00
danielgrippi
922ccd8423
limit contact photos in aspect/index.js
2011-07-01 22:30:21 -07:00
danielgrippi
24483548ec
need to grab all contacts on aspect index for autocomplete
2011-07-01 22:26:08 -07:00
danielgrippi
8bf6ad45a5
various bugfixes, added missing translations, made all tests pass (rspec, cucumber, jasmine)
2011-07-01 22:04:36 -07:00
danielgrippi
1a2ba034ab
added edit links in aspect_nav; removed ununsed icons; fixed facebox duplication on aspect/index
2011-07-01 17:23:58 -07:00
danielgrippi
f90dc0996a
More visual cleanup; top nav; edit aspects
2011-07-01 16:12:14 -07:00
danielgrippi
41773cb29e
Almost done with left-nav, added link to aspect edit facebox, colored share button
2011-07-01 14:22:38 -07:00
danielgrippi
60077bd70a
minor visual changes, more or less. facebox headers are now white.
2011-07-01 10:51:45 -07:00
danielgrippi
238e859dbe
add contact images to aspect index, removed comment background color, add vertical rule to people pages
2011-07-01 10:49:20 -07:00
danielgrippi
ca76db4550
DG RS left nav almost there. touched up publisher, among other things
2011-07-01 10:49:19 -07:00
danielgrippi
53c87562f4
switch aspect listings and info stuffs on aspect/index
2011-06-28 23:40:57 -07:00
danielgrippi
73fe74c834
updated selenium driver to work with FF5; added translations to contacts/index; fixed cucumber
2011-06-27 18:58:29 -07:00
Raphael Sofaer
5884a900a2
Get rid of manage
2011-06-24 16:55:40 -07:00
Sebastian
d9f23b5e2a
fixed #1018 - aspects width on /aspects/manage
2011-05-31 18:29:24 +02:00
MrZYX
05aa73e93c
made everything in the sidebar translatable
2011-05-30 18:06:05 +02:00
danielgrippi
8e3149ca01
better page explaining cubbi.es and why we're promoting it on diaspora
2011-05-23 01:14:33 -07:00
MrZYX
07395fb2c9
added maxlength attribute to aspect name input, fixed #675
2011-05-22 13:50:44 +02:00
danielgrippi
0391795f80
better right pane sections
2011-05-21 14:52:59 -07:00
Raphael Sofaer
286f1b876d
Allow anyone to generate a token, restrict tokens to ActivityStreams::PhotosController#create, don't let tokens create sessions.
2011-05-20 15:14:23 -07:00
danielgrippi
16351227f7
use aspect dropdowns everywhere; updated rake to 0.9.0
2011-05-20 11:50:41 -07:00
Raphael Sofaer
93be5497a7
Small controller for generating an auth token, if you are an authable user
2011-05-19 18:29:53 -07:00
MrZYX
c47c9ef069
fix untranslated string; fix two translations; don't mess routes.rb again
2011-05-18 00:53:48 +02:00
danielgrippi
7eaca0346c
Merge branch 'master' into follow
...
Conflicts:
config/assets.yml
public/stylesheets/sass/_mixins.scss
spec/models/user/posting_spec.rb
2011-05-16 14:56:28 -07:00
Ilya Zhitomirskiy
709ac44da3
fixed the incrementing aspect ids on the contacts#sharing modal window, showing 'Add to Aspect' button only on the tags and profile pages
2011-05-16 02:16:46 -07:00
danielgrippi
b89dd900cc
misc visual cleanup on mobile
2011-05-13 23:33:16 -07:00
danielgrippi
402e84708b
ms iz; everything is green, the sharewith is translated in js, fixed the clicking on the checkbox bug
2011-05-13 16:05:37 -07:00
danielgrippi
c200c386fb
pulled new aspect into modal window
2011-05-13 11:58:18 -07:00
danielgrippi
a9a1280e17
one cuke failing. wip
2011-05-12 20:41:56 -07:00
danielgrippi
9f3044838d
Views for contactscontroller#sharing almost done, cuke for editing aspect memberships started
2011-05-11 14:53:43 -07:00
zhitomirskiyi
469d5b99a2
WIP added a share view, tests are red
2011-05-09 16:55:22 -07:00
danielgrippi
0db8541f6e
added a pane for people sharing with you on all aspect page
2011-05-04 17:57:42 -07:00
danielgrippi
e854bd0a32
split 'mutual' flag into 'sharing' and 'receiving' on Contact
2011-05-04 17:09:48 -07:00
danielgrippi
648a10e6d3
Merge branch 'master' into follow
...
Conflicts:
app/controllers/requests_controller.rb
app/controllers/tags_controller.rb
app/helpers/aspects_helper.rb
app/views/notifications/index.html.haml
config/routes.rb
public/javascripts/aspect-edit.js
public/javascripts/contact-list.js
spec/integration/receiving_spec.rb
spec/models/user/connecting_spec.rb
spec/models/user/posting_spec.rb
2011-05-04 11:35:35 -07:00
Raphael Sofaer
efe79eb351
Fix stream on pages other than 1, rename raw_visible_posts to visible_posts
2011-04-13 14:35:20 -07:00
danielgrippi
106ae983d5
Merge branch 'master' into follow. all specs green.
...
Conflicts:
app/controllers/application_controller.rb
app/controllers/people_controller.rb
app/models/person.rb
config/assets.yml
db/schema.rb
public/javascripts/aspect-edit.js
spec/controllers/aspects_controller_spec.rb
spec/models/user/querying_spec.rb
spec/spec_helper.rb
2011-04-11 17:48:37 -07:00
danielgrippi
1c9ca738ae
green everywhere.
2011-04-08 17:10:43 -07:00
Raphael Sofaer
a05b141366
Add tagged posts to db seed, make people#show and tags#show infinite scroll
2011-04-07 16:36:14 -07:00
Raphael Sofaer
d12ec38736
Fix mobile infinite scroll
2011-04-07 15:00:57 -07:00
danielgrippi
4f972a23f6
drop requests table wip
2011-04-06 19:01:41 -07:00
Raphael Sofaer
bbf1bf00cb
Render less stuff, set fewer things, make AspectsController#index more horrifying. Maybe Vanna could help with this? Mustache definitely would.
2011-04-06 12:11:49 -07:00
Raphael Sofaer
9454c3a1b9
Working on fixing infinite scroll, in particular for aspects with the number 2 in their id.
2011-04-05 19:28:40 -07:00
Raphael Sofaer
59334dfaf5
Remove extra js, fix mobile view
2011-04-05 16:18:04 -07:00
danielgrippi
68375fdb02
added mutual flag, removed pending from contact, specs are green. wip
2011-04-05 16:12:53 -07:00
Raphael Sofaer
746a0c38b3
Take another shot at fixing pagination
2011-04-05 13:59:15 -07:00
Raphael Sofaer
4037ce48c5
Delete unused show templates
2011-04-05 13:59:15 -07:00
danielgrippi
590e1fd93f
All green except invite connecting +2 misc.
2011-04-04 15:16:19 -07:00
MrZYX
b776bb52db
made string on mobile page translatable
2011-04-03 13:17:09 +02:00
maxwell
4bd0cbfdc8
publisher now can handle services, and is on seperate page
2011-04-01 01:18:01 -07:00
MrZYX
764e0c4aee
fixed #985
2011-03-31 18:59:00 +02:00
danielgrippi
b22b13d73f
Revert "popstate now in aspect-filters. back button now actually works on aspect/index."
...
This reverts commit 326155af54
2011-03-31 01:30:02 -07:00
danielgrippi
326155af54
popstate now in aspect-filters. back button now actually works on aspect/index.
2011-03-30 17:39:08 -07:00
Raphael Sofaer
c9d58d9308
Revert "Don't instantiate all contacts on aspects index, temporary querying in views for aspect listings"
...
This reverts commit 3b7063d44a
2011-03-30 14:47:40 -07:00
Raphael Sofaer
3b7063d44a
Don't instantiate all contacts on aspects index, temporary querying in views for aspect listings
2011-03-30 14:28:58 -07:00
MrZYX
53bdb2cade
clean up stray hidden input tags by passing the data directly into the js where possible and placing them under an existing form tag elsewhere
2011-03-30 17:17:36 +02:00
zhitomirskiyi
2e25d1d745
added the bookmarklet into a box
2011-03-29 15:03:09 -07:00
MrZYX
aa478ddd5c
string concatenation with translations is bad, especially if you leave on part of it untranslated :P
2011-03-29 15:39:57 +02:00
maxwell
ccbba9b52e
fix translations
2011-03-28 20:09:09 -07:00
maxwell
8b7dc0a2cc
translated bookmarklet, added post to main page
2011-03-28 19:57:06 -07:00
MrZYX
b689d4695b
refactor of routes.rb done so far; further refactor needs design decisions
2011-03-27 00:05:35 +01:00
MrZYX
985d79acb5
some more refactoring to routes.rb
2011-03-26 17:38:49 +01:00
danielgrippi
fb5bc2805d
fix cucumber
2011-03-23 12:42:07 -07:00
danielgrippi
b9b9d7e07d
renamed home to all aspects in header, made clicking aspect names on right trigger filtering
2011-03-23 10:29:34 -07:00
zhitomirskiyi
058b74846a
removed the bring your friends message from the stream
2011-03-21 15:23:34 -07:00
MrZYX
a2715ca963
fixed migration naming, fixed translation
2011-03-20 23:00:56 +01:00
danielgrippi
55ac4c8054
show tags under names in people partials
2011-03-16 17:46:09 -07:00
danielgrippi
a85b5bb70f
add a people count on tag page
2011-03-16 17:27:27 -07:00
zhitomirskiyi
abbf949fe1
publishing from a person profile page wip
...
mentioning a person from their profile page, added js & jasmine, still need to add the mention style, and prevent deselecting the last one
a tiny sass add
publishing from the profile works, need js translation
added the translation
made the hover state consistant
need to fix the cucumber spec
specs are green need to add a button
added the buttion to mention people
moved the publisher to the facebox
fixed the cucumbers for the modal window
2011-03-16 16:35:30 -07:00
danielgrippi
c608c70ca7
tagging profiles complete
2011-03-15 13:21:36 -07:00
MrZYX
ed8d4db3a8
some reformatting/refactor of en.yml. This might break some translations but I think I've catched the most ones, at least the most important ones
2011-03-12 03:27:28 +01:00
MrZYX
dc7a672d9f
fixed some translations
2011-03-09 22:46:58 +01:00
danielgrippi
ee6932a3f7
added title to padlock on aspect edit pane
2011-03-09 12:15:23 -08:00
danielgrippi
d0569fb881
simplified functionality on aspect edit faceboxes
2011-03-09 12:00:49 -08:00
Raphael Sofaer
770091e82b
Don't retrieve all the user's contacts again unnecessarily
2011-03-02 12:11:25 -08:00
MrZYX
ab706f4127
fixed sort by css for languages different from english
2011-02-20 19:00:13 +01:00
MrZYX
77cac72ed5
fixed #306
2011-02-20 13:34:22 +01:00
MrZYX
aa6ac41d68
remeber sort order
2011-02-19 17:06:26 +01:00
MrZYX
124ac738ea
'sort by:'translatable
2011-02-19 11:39:28 +01:00
zhitomirskiyi
61dd5a835a
default scope on contact
2011-02-18 17:38:02 -08:00
maxwell
43f17b3ed8
made toggle for post time on aspects#index
2011-02-18 16:47:44 -08:00
maxwell
3c8a87783f
stream order can take created at to be sorted by origin post time
2011-02-18 16:07:22 -08:00
maxwell
c6eb5d0340
IZ MS; refactored aspect_membership_controller, moved and updated views accordingly
2011-02-17 18:05:21 -08:00
danielvincent
fc9d9a4c55
make the invite friends dialog more obvious
2011-02-17 15:58:37 -05:00
Raphael Sofaer
056bebd4f4
Autocompletion contacts now change with changing aspect selection
2011-02-09 16:07:25 -08:00
Raphael Jedidiah Sofaer
150f676332
Do a bunch of work on publisher autocompletion JS
2011-02-09 16:07:23 -08:00
zhitomirskiyi
df4ebb286d
accept invitation feature passing
...
wip, added a form to add aspect to the contact list
added files
typo
render the partial
remote friend
specifying the provider for the route
refactored local person person friend finder functionality to use the partial
typo
trying to use the stream
2011-02-08 16:40:28 -08:00
maxwell
1ed737c3b9
make aspects a link, and remove a big db query from the view
2011-02-03 16:15:51 -08:00
Dan Hansen
cdb5cf37e7
show publisher if it was closed when you select another aspect
2011-02-01 00:40:11 -06:00
