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
