nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
13500 commits 4 branches 0 tags 121 MiB
Commit graph

444 commits

Author SHA1 Message Date
danielgrippi
95aac2f352 remove sort order option from the stream (commented at is too crazy and way to slow on large data sets) 2011-10-30 21:46:23 -07:00
danielgrippi
0512ade65a made name smaller and clickable on aspects/index [ci skip] 2011-10-24 21:43:32 -07:00
danielgrippi
0874a632f4 make gs dismissal icon translucent 2011-10-24 16:11:26 -07:00
danielgrippi
90d9852e08 updated welcoming text re: peter's suggestions 2011-10-24 16:06:56 -07:00
Ilya Zhitomirskiy
c447415d9f allowing users to dismiss new user toolips 2011-10-24 15:57:25 -07:00
danielgrippi
e63e8299b9 fixed up stream/publisher logic; fixed cukes 2011-10-24 14:41:15 -07:00
danielgrippi
59e4955727 added translation keys; some css cleanup 2011-10-24 14:11:36 -07:00
danielgrippi
1bc637d83f new getting started works, needs more love 2011-10-24 14:11:35 -07:00
danielgrippi
794247d07b MS DG; rename soup to stream; fix a bunch of translations 2011-10-21 14:44:02 -07:00
danielgrippi
79ec50a16c DG MS; added setting for displaying spotlight members in soup stream 2011-10-21 14:44:02 -07:00
danielgrippi
1256b6f3fc DG MS; changed coloring of indicators; changed indicator precidence; added soup link 2011-10-21 14:44:01 -07:00
danielgrippi
44b58d707f featured users => community spotlight 2011-10-20 11:50:58 -07:00
Gonzalo Rodriguez
66f79b13ed Minor aspect_listings cleanup 2011-10-19 00:02:37 -02:00
Gonzalo Rodriguez
f655b12e98 Refactor display setup for De/select_all aspects link 2011-10-12 00:06:25 -02:00
Gonzalo Rodriguez
583dd20249 Refactor selected aspects ui setup 2011-10-08 23:14:04 -02:00
Your Name
619f5fd56e move featured users to the other side and make a little sidebar widget for it 2011-10-06 12:27:02 -07:00
Maxwell Salzberg
cdce54bbda MS SM featured users stream. because we do what we want 2011-10-05 21:12:02 -07:00
Gonzalo Rodriguez
30a13674e8 Edit aspect pencil was messed up with the title on the home page 2011-10-05 22:44:57 -02:00
Ilya Zhitomirskiy
3e2b30ec61 passing the server time to help intiate the infinite scrolling 2011-10-05 15:12:30 -07:00
Maxwell Salzberg
81e04a11fe fix tag stream, no comments for now, but coming soon 2011-10-03 17:30:22 -07:00
Maxwell Salzberg
ad9dcd8542 holy guacamole. mentions page and tag following pages, plus a huge stream refactor 2011-10-03 15:23:10 -07:00
Maxwell Salzberg
412fe1b027 rebased and consolidated logic" 2011-10-03 15:22:14 -07:00
Maxwell Salzberg
429ac42502 added tag follow feature, mention page feature. is now pretty easy to add new types of streams, but some more refactoring could make it even nicer 2011-10-03 15:22:14 -07:00
Maxwell Salzberg
b5c3f2c615 wip 2011-10-03 15:22:14 -07:00
Gonzalo Rodriguez
0b97a3525a Merge branch 'aspect_nav_rework' 2011-10-02 21:08:12 -02:00
danielgrippi
f9d88e122f limit contacts to 15 on aspects pages for faster network times 2011-10-02 13:11:30 -07:00
danielgrippi
b881d7b3de default sort order to created_at instead of commented_on on desktop site 2011-10-01 16:24:28 -07:00
Gonzalo Rodriguez
d3a5bc1fb8 Merge branch 'master' into aspect_nav_rework 2011-10-01 03:58:50 -03:00
Maxwell Salzberg
6ac0a46120 green jasmine by stubbing ajax_stream? in aspects controller 2011-09-29 18:04:21 -07:00
Gonzalo Rodriguez
74d00d7db4 Merge branch 'master' into aspect_nav_rework 2011-09-28 19:52:15 -03:00
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 2777f16f4f, reversing
changes made to 8b278adff6.
 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