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

2951 commits

Author SHA1 Message Date
Maxwell Salzberg
621075d4e1 fix mentioning from profile page spec, add some tests for the ajax_stream? method 2011-09-30 10:54:13 -07:00
Maxwell Salzberg
6ac0a46120 green jasmine by stubbing ajax_stream? in aspects controller 2011-09-29 18:04:21 -07:00
Maxwell Salzberg
aa5d5b560d fix incorrect status_message#new view 2011-09-29 15:17:25 -07:00
Maxwell Salzberg
b27a8dd330 fix up info sidebar" 2011-09-29 12:51:00 -07:00
danielgrippi
70b175479c format all on including stylesheet for WP7 2011-09-29 00:39:12 -07:00
danielgrippi
e3bf03636b pass in mobile as provider_display_name on posts if posting from mobile 2011-09-28 22:15:32 -07:00
Gonzalo Rodriguez
74d00d7db4 Merge branch 'master' into aspect_nav_rework 2011-09-28 19:52:15 -03:00
Maxwell Salzberg
5ae9edc72e fix comment bug 2011-09-28 13:44:58 -07:00
danielgrippi
38624afd9c fix reshare cubbies bug on mobile 2011-09-28 11:29:36 -07:00
danielgrippi
d2d205ee08 make autoexpand work 2011-09-28 11:21:14 -07:00
danielgrippi
42fcf3e394 reshares up top 2011-09-27 21:32:11 -07:00
danielgrippi
7d662fcc92 move share button to top right corner 2011-09-27 21:09:28 -07:00
danielgrippi
f34f0ce5fb expand/collapse comments with animation; added collapse link on bottom 2011-09-27 21:09:27 -07:00
danielgrippi
2b2443b6b9 aspect dropdown takes public and all aspects option 2011-09-27 21:09:27 -07:00
danielgrippi
9b057bdf16 added placeholder; force autofill off on comment fields; touched up mobile reshare view 2011-09-27 21:09:27 -07:00
danielgrippi
744ab579bd adding comments work for one of two comment add buttons; added info on 
posts; post show page.
 2011-09-27 21:09:27 -07:00
danielgrippi
3b08fc8406 wip 2011-09-27 21:09:27 -07:00
danielgrippi
ea357a96ef expand&collapse comments; added comment form (wip) 2011-09-27 21:09:27 -07:00
danielgrippi
9d72247e9e mobile tags page 2011-09-27 21:09:27 -07:00
danielgrippi
d972802142 comment ajax on mobile. 2011-09-27 21:09:26 -07:00
danielgrippi
91c9fffb81 touched up login page wip 2011-09-27 21:09:26 -07:00
danielgrippi
f2f14c2894 fixed ajax for likes 2011-09-27 21:09:26 -07:00
danielgrippi
6deb924c32 fixed header; compose message on top right 2011-09-27 21:09:26 -07:00
danielgrippi
645af37358 more touchup; added placeholder for reaction tabs on post show; added more mobile boilerplate / compatability; apple splash page asset 2011-09-27 21:09:26 -07:00
danielgrippi
9e3ff7338e ditch unused css rules; move js to body bottom 2011-09-27 21:09:26 -07:00
danielgrippi
00e561dd01 comments -> reactions 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
Ilya Zhitomirskiy
f9172c8733 added aspect dropdown to the getting started page, renamed the button to be add contact 2011-09-26 17:32:37 -07:00
Ilya Zhitomirskiy
675908a57d added an expanation of what connecting services does(getting started), also indicate services whick are connected connected services 2011-09-26 16:04:25 -07:00
Ilya Zhitomirskiy
afd1913de4 added a link to resque-web from admin page 2011-09-26 10:25:29 -07:00
danielgrippi
131166841a added logged out page referencing mobile 2011-09-25 11:58:44 -07:00
Ilya Zhitomirskiy
461cb22109 in the getting started featured tags are now followable 2011-09-23 17:06:21 -07:00
Ilya Zhitomirskiy
494ab8b13b added community welcome and a non-mandatory wording 2011-09-23 14:56:33 -07:00
Ilya Zhitomirskiy
f8c05851f6 added an email link to the right section 2011-09-21 14:40:59 -07:00
Ilya Zhitomirskiy
4fb62afa2d getting stated links open in new tabs, translated a string 2011-09-21 14:12:37 -07:00
Ilya Zhitomirskiy
c98f2d1664 added a weekly user stat for admin 2011-09-21 13:23:09 -07:00
Maxwell Salzberg
8187fb9ddb clean up and move help widget up the page 2011-09-20 10:05:39 -07:00
Ilya Zhitomirskiy
2cebfa54cc fixed couple of specs, removed the federation fallback, and fixed the public hashtag pages (not displaying the publisher) 2011-09-19 15:52:25 -07:00
Ilya Zhitomirskiy
352be4d0c0 added the have support section and reworded the donation section to be clearer 2011-09-19 15:29:19 -07:00
Ilya Zhitomirskiy
41abb5790e changed the to proc syntax to explicit block syntax 2011-09-19 14:16:26 -07:00
Ilya Zhitomirskiy
ed4b91249d added a publisher to the tag page 2011-09-19 11:38:55 -07:00
Maxwell Salzberg
bc1aef4999 MS IZ start to implement followed tags in the stream 2011-09-16 18:19:34 -07:00
Maxwell Salzberg
e865dfc269 fix a bug with emailing in posts going to tumblr 2011-09-16 13:57:38 -07:00
danielgrippi
36f5e45c25 change Base64.encode64 to Base64.encode64s (encode without newlines) 2011-09-16 08:53:13 -07:00
Gonzalo Rodriguez
2bb2c6e3e8 Add links to person profile for post hidden text 2011-09-15 23:16:13 -03:00
alda519
b2c141a221 fixed links to featured user's tags on getting_started page 2011-09-15 17:03:17 +02:00
danielgrippi
91e649977c MS DG update copyright 2011-09-14 11:23:12 -07:00
alda519
2d47658b08 removes underline in tag search form on getting started page 2011-09-13 08:14:20 +02:00
Lennart Prelle
5a3445150c move _donate.html.erb to _donate.html.haml and make it translateable 2011-09-12 18:29:07 +02: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
Lennart Prelle
8041fea96c added mobile version to the change 2011-09-11 17:29:23 +02:00
Lennart Prelle
40ac7b7620 make string in authorizations translateable 2011-09-11 17:20:54 +02:00
Jonne Hass
a614985d83 made single process mode configuration more consistent 
* SINGLE_PROCESS_MODE environment variable takes precedence over
  application.yml setting
* SINGLE_PROCESS environment variable takes precedence over
  SINGLE_PROCESS_MODE environment variable to be backward compatible
 2011-09-11 13:54:14 +02:00
Jonne Hass
523d565dd5 Merge pull request #1939 from everplays/css-rtl 
fixed html markup which broke applied direction
 2011-09-10 13:27:19 -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
behrooz shabani (everplays)
22bb6177d4 <p> can't be inside another one - breaks direction detection 
we are applying direction of content on <p> & markdownify always
generates a <p> so we have something like <p
class="ltr"><p>...</p></p> but paragraph can't be inside another
paragraph & browsers sees something like <p
class="rtl"></p><p>...</p></p> so applied direction will be ignored
 2011-09-10 16:14:30 +04:30
Maxwell Salzberg
1fa01a811e DG MS; updated text to reflect the fact that hiding posts now 
mutes notifications as well
 2011-09-09 10:52:19 -07:00
Manuel Schölling
0b28376216 Fixed some texts in "Getting Started" that were not translatable 2011-09-09 01:15:54 +02:00
Gonzalo Rodriguez
04786bc43e Improvements on aspect navigation rework 2011-09-08 02:13:15 -03:00
danielgrippi
1844226077 paginate facebook friends. 2011-09-07 13:00:21 -07: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
danielgrippi
341d105e75 updated buttons, mixin declarations 2011-09-04 22:48:37 -07:00
danielgrippi
66836e53d2 Aspect dropdowns read 'All Aspects' if all aspects are selected 2011-09-03 18:38:12 -07:00
Maxwell Salzberg
eb6263084e MS DH fix liking of posts and comment js; instansiate streamElement widgets when they are socketed 2011-09-03 12:09:34 -07:00
vcuculo
8919d0c0ce fixed bookmarklet 2011-09-02 10:28:32 +02:00
danielgrippi
af569204b8 Revert "Merge pull request #1874 from vcuculo/1785-fix-bookmarklet" 
This reverts commit e278b39421, reversing
changes made to d0f21cb444.
 2011-09-01 16:31:49 -07:00
vcuculo
6518a89302 fixed bookmarlet 2011-09-02 00:44:56 +02:00
Maxwell Salzberg
b8ca4bfcab added Link to profile page in webfinger profile to make federation a bit easier 2011-08-31 19:57:46 -07:00
danielgrippi
7e72a29401 fixed aspect edit pane (removed diaspora ids) 2011-08-31 14:55:23 -07:00
Maxwell Salzberg
272ab55482 Merge branch '1844-mentions-in-markdown' of https://github.com/brianwisti/diaspora into brianwisti-1844-mentions-in-markdown 2011-08-30 22:15:52 -07:00
Dan Hansen
f788de17fd allow the user to see who has liked a specific comment. 2011-08-30 21:13:12 -05:00
Dan Hansen
dc947e449b fix issues with comment stream, fix likes, merge comment stream and comment toggler widgets. 
make timeago widget a simple wrapper for $.fn.timeago (we don't really need this.)
 2011-08-30 21:07:40 -05:00
Brian Wisti
8aafc61071 merged with blank markdownify check 2011-08-30 12:55:52 -07:00
Zach Prezkuta
dfe9e15107 Issue #1811: Share button missing in mobile version 2011-08-29 21:22:07 -06:00
danielgrippi
1198670383 Added Foreman gem. Run Diaspora using foreman start (will start everything except mySQL. Passing in a -p flag will let you specifiy the port. Also: I took single_process_mode out of app config and made it an environment variable. If you want to boot a lightweight server, run SINGLE_PROCESS=true rails s. 2011-08-29 14:38:07 -07:00
Maxwell Salzberg
f479a9a144 Merge branch 'brianwisti-1305-full-markdown' 2011-08-29 10:56:48 -07: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
Gonzalo Rodriguez
b9dbe0ecdd Closes #1827. Minor text fix on Getting Started page 2011-08-27 21:32:58 -03:00
Maxwell Salzberg
c66b7d584d Merge branch '1305-full-markdown' of https://github.com/brianwisti/diaspora into brianwisti-1305-full-markdown 
Conflicts:
	Gemfile.lock
 2011-08-27 14:13:15 -07:00
Dan Hansen
d084c708b6 use @like.target instead of @target, build should be green 2011-08-26 16:08:39 -05:00
Dan Hansen
27d4fd8176 fix retractions, fix likes, backfill likes widget tests, remove typo from jasmine.yml, remove unneeded js files 
require confirmation for comments in js, get rid of rails helper
 2011-08-26 15:24:07 -05:00
Andrej Kacian
5d2d883dd3 Require confirmation when deleting a comment 2011-08-26 20:24:04 +02:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
a40543e15c a user now has the option to disable reshare email notifications 2011-08-25 17:16:09 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
8c9a585337 reshares now have notifications, slight refactor of the notification helper 2011-08-25 17:16:09 -07:00
Maxwell Salzberg
8dfb278509 Merge pull request #1795 from lksnyder0/admin_nav 
Admin nav
 2011-08-25 16:35:09 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
2708b0b695 added back the tooltip explaining username constatrains on the accept invite flow 2011-08-24 17:35:27 -07:00
Raphael Sofaer
dec10e3de9 Finish setting up sesssions#new prefill when logged out by authorizationsControlelr 2011-08-23 16:37:51 -07:00
Raphael Sofaer
89edfb7ed6 WIP prefilling username on logout of user is almost there 2011-08-23 16:37:50 -07:00
Maxwell Salzberg
eb99b6ba5d MS IZ removed the puts 2011-08-23 14:41:16 -07:00
Maxwell Salzberg
2a5155fd4d IZ MS fixed facebook inviter for people you are already friends with to use the normal aspect membership dropdown, and created some nuiaces in the seed script between bob, alice and eve and their fb status" 2011-08-23 13:50:03 -07:00
Maxwell Salzberg
0dc5807ee0 go to the facebook friend finding page on getting started untill we work out the facebox problems 2011-08-23 09:15:51 -07:00
Gonzalo Rodriguez
43d6acd868 Support green login page flash message for password change success 2011-08-23 00:51:00 -03:00
Dan Hansen
6b040c7b4a clean up websocket receiver, add specs to content updater 2011-08-22 20:03:38 -05:00
MrZYX
87cd09a936 fix string concat 2011-08-22 23:09:51 +02:00
Dan Hansen
c0f45acfe8 Merge branch 'js-refactor-merged' 2011-08-21 21:40:01 -05:00
Sarah Mei
db6acebb6c Need to define mailer_name in the mailer wrapper class, or devise can't find the email templates. 
Also, for some reason, had to move the include of NotifierHelper to the view itself. That requires more investigation.
 2011-08-21 19:11:46 -07:00
Dan Hansen
4a64a172d1 Merge branch 'master' of github.com:diaspora/diaspora into js-refactor-merged 
Conflicts:
	spec/javascripts/stream-spec.js
 2011-08-21 20:57:01 -05:00
Dan Hansen
545611fffa green? 2011-08-21 20:45:51 -05:00
Andrej Kacian
cad14bcdfc Show tags on user profile pages for everyone if we're logged in. 2011-08-22 01:59:03 +02:00
Andrej Kacian
50f32ce5ac Show ajax loader and hide the hide icon when hiding a post. 2011-08-22 00:38:34 +02:00
Luke Snyder
f9fc55823b finished styling 2011-08-21 13:07:04 -04:00
Luke Snyder
96bfaf7550 changes to bar 2011-08-21 12:24:31 -04:00
Dan Hansen
3ed50cab94 Merge branch 'master' of github.com:diaspora/diaspora into js-refactor-merged 
Conflicts:
	app/views/status_messages/bookmarklet.html.haml
	config/assets.yml
	db/schema.rb
	public/javascripts/contact-edit.js
	public/javascripts/publisher.js
	public/javascripts/view.js
 2011-08-20 14:40:56 -05:00
Gonzalo Rodriguez
f1cf81772b Closes #1386. On conversations, disable Reply button once pressed 2011-08-20 15:51:39 -03:00
Raphael Sofaer
a74080e27d Fix ServicesController spec 2011-08-19 16:52:26 -07:00
Maxwell Salzberg
735a37ffe0 really basic preventivie mesures for facebook friending. we need to GO ALL THE WAY and proxy facebook users to be in many aspects 2011-08-19 15:57:10 -07:00
Maxwell Salzberg
e4062bf5fd now functionally correct 2011-08-19 15:56:32 -07:00
Maxwell Salzberg
70fe2cf10f wip 2011-08-19 15:56:31 -07:00
Maxwell Salzberg
e100032244 add all in the query, to be more pedantic 2011-08-19 13:59:41 -07:00
Maxwell Salzberg
3cee589397 show only invites from a user 2011-08-19 13:58:22 -07:00
Maxwell Salzberg
fe78a69161 combine invitation emails 2011-08-19 12:15:11 -07:00
Maxwell Salzberg
6f20e11a67 better invite emails wip 2011-08-19 12:15:11 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
ecf38305b4 added a visible style for missing translations in development and production modes 2011-08-19 11:05:48 -07: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
Ilyaaaaaaaaaaaaa Zhitomirskiy
064ae972b3 the cucumber is now passing & renamed the partial to conform with convention 2011-08-18 15:38:27 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
b1e95def4a Merge branch 'master' into issue1586-aspectdropdown-when-posting 2011-08-18 12:59:00 -07:00
danielgrippi
eb8c540ac1 MS DG IZ major invite refactor. all tests are green minus weird stuff on dans computer, need to checkout this out on pivots 2011-08-17 16:28:21 -07:00
Brian Wisti
b87c7bb489 Improve code block support 2011-08-16 21:48:48 -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
32ae21a213 removed user invite counter, as it was already depricated 2011-08-15 15:15:43 -07:00
Luke Snyder
b62801bd64 Initial styling and links 2011-08-14 22:10:56 -04:00
Raphael Sofaer
a2f7fed8f4 Fix syntax error in WSR, move tipsy from views into stream.js, fix stream element delete tipsy. 2011-08-14 17:45:50 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
3f1e8f0b6e added the check for open invitations 2011-08-14 16:06:25 -07:00
Andrej Kacian
8dc1b70621 Use tipsy for post scope tooltip 2011-08-15 00:54:27 +02:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
ba11bb6d89 you are now able to invite friends from the mobile site 2011-08-14 15:40:07 -07:00
Andrej Kacian
657a9f96ef Fix error when accessing a tag page without being signed in. 2011-08-14 23:51:53 +02:00
Andrej Kacian
4fe61892e1 Added list of followed tags also to tags view, as suggested in issue #1632 2011-08-14 21:34:56 +02:00
Raphael Sofaer
f60ce932b1 Localize string 2011-08-13 09:44:40 -07:00
Raphael Sofaer
f0583de36c Some optimizations to ServicesController#finder. Apparently setting an association on an unsaved record to an empty array hits the database. 2011-08-13 09:40:31 -07:00
Andrej Kacian
b85df7303b After opening a conversation, remove its unread message count from inbox 2011-08-13 05:27:54 +02:00
danielgrippi
75f3accd37 moved facebook friend inviter/finder into contacts layout & re-added search 2011-08-12 17:05:01 -07:00
danielgrippi
a8d37fb3fc Move Facebook inviter view into the contacts layout, rather than a facebox 2011-08-12 17:05:01 -07:00
danielgrippi
7b85dcec9c dg rs; seed bob with facebook friends & fixed invitation view 2011-08-12 17:05:00 -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
danielgrippi
7e901d0220 remove shapado 2011-08-12 11:12:30 -07:00
danielgrippi
7df883eaf0 added summary text per user on stats 2011-08-11 18:52:31 -07:00
danielgrippi
673397508f added segments to stats 2011-08-11 18:34:26 -07:00
Raphael Sofaer
56fc409a39 Most of the way towards getting posts feature working 2011-08-11 18:15:18 -07:00
danielgrippi
76b34ec75d remove 500 2011-08-11 18:01:39 -07:00
danielgrippi
5c6441f6db add basic graph to stats view 2011-08-11 17:58:57 -07:00
danielgrippi
2d9b9270cb go off of yesterday's stats (full day comparison) 2011-08-11 17:27:20 -07:00
danielgrippi
190332308b started on the real stats page 2011-08-11 17:15:33 -07:00
Raphael Sofaer
e2b16ab16f Correct my own spelling mistake 2011-08-11 17:10:49 -07:00
Raphael Sofaer
9a77d3518f Mobile authorizations index view 2011-08-11 16:39:39 -07:00
Raphael Sofaer
c5726bb379 Don't show a hide post button to non-logged in users 2011-08-11 15:50:09 -07:00
danielgrippi
08f12ee348 fixed the 'a post' bug in notification emails 2011-08-11 14:40:45 -07:00
Andrej Kacian
55daaf2b6c Make tag unfollow icon slightly larger and add a helpful tooltip to it 2011-08-11 23:33:59 +02: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
Dan Hansen
2e9040e227 merged with master, 7 cukes failing. jasmine is green. need to remove rails.js helpers so things suck less 2011-08-10 23:57:33 -07:00
danielgrippi
db645e8da8 merged publics/show and posts/show 2011-08-10 18:07:38 -07:00
Raphael Sofaer
091cdd6f94 Basic contacts index page on the mobile site 2011-08-10 16:23:33 -07:00
danielgrippi
1e7a2f327b use post_message in all mailer html views 2011-08-10 15:31:39 -07:00
Raphael Sofaer
e1dd1e2876 Make the devise password views work for mobile users, they're terrible but they display 2011-08-10 12:29:25 -07:00
danielgrippi
118d3720c4 added view for activitystreams public post 2011-08-10 11:24:51 -07:00
Raphael Sofaer
938b633c67 Don't check for what aspects you sent somebody else's posts to 2011-08-10 11:23:11 -07:00
Raphael Sofaer
cd0fca8462 Don't call aspects_with_post more than once, we can find a prettier place to cache it later 2011-08-10 10:38:11 -07:00
Manuel Schölling
ccecf32f9b Show aspect title if message is posted only to one aspect 2011-08-10 10:38:10 -07:00
Manuel Schölling
cc3702d733 Added the number of aspects a message is posted to next to the 'limited' text 2011-08-10 10:38:10 -07:00
Maxwell Salzberg
2d6a69cdc8 fix for 500s in liked emails for reshares and activity streams photos 2011-08-10 10:25:43 -07:00
Maxwell Salzberg
d22e5e7598 make some getting started text slightly cleaner 2011-08-10 09:38:54 -07:00
Sarah Mei
0b02653f44 Merge pull request #1694 from ticho/tag-list-has-unfollow-icon 
Add a "unfollow" icon to each tag in followed tags listing
 2011-08-09 21:44:21 -07:00
Raphael Sofaer
902edb6745 Make the tag autocomplete on the getting started page less broken 2011-08-09 18:55:34 -07:00
Maxwell Salzberg
1afc3f36f5 refix services in getting started 2011-08-09 18:04:44 -07:00
Maxwell Salzberg
7b1ff4cd7b more mobile site compatability. edit profile now is a switch hitter, adding flash to the signup form 2011-08-09 18:02:50 -07:00
Maxwell Salzberg
da51259f32 update dates on some views, give the accept invite form some padding 2011-08-09 18:02:50 -07:00
Raphael Sofaer
3c4f6527ec Don't render the back-to-top link on the landing page 2011-08-09 16:55:22 -07:00
Maxwell Salzberg
86e374b8ce add hovercards back to mentions, reorganized some helpers, made getting started view mobile accessible 2011-08-09 16:54:24 -07:00
Raphael Sofaer
09ac50aaac Let html photo view render for phones, get rid of duplicate host-meta view 2011-08-09 15:36:59 -07:00
Maxwell Salzberg
5a966c93b4 make inviter emails format agnostic 2011-08-09 14:49:17 -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
Maxwell Salzberg
72b734e3e8 scroll to top like a boss 2011-08-09 01:04:54 -07:00
Maxwell Salzberg
43bd8b6860 typo in the settings 2011-08-08 19:07:38 -07:00
Raphael Sofaer
97660e8f49 Fix some typos in the batch invitation email 2011-08-08 19:02:07 -07:00
Maxwell Salzberg
ee08d3cd5c fix inviter a touch 2011-08-08 18:50:59 -07:00
Raphael Sofaer
f02b1dd3a2 Adjust and tweak batch invitation email. It might need a few more tables 2011-08-08 17:56:20 -07:00
Maxwell Salzberg
77cb93be24 fix up the inviter sidebar 2011-08-08 17:53:04 -07:00
Maxwell Salzberg
5bd9e7c53d update email copy 2011-08-08 16:35:34 -07:00
Sarah Mei
ccf843b486 Merge pull request #1745 from ticho/unread-message-count-css-fix 
Correctly space unread and total message counts in conversations list
 2011-08-07 20:40:53 -07:00
Manuel Schölling
8b99ae9cb6 Changed translation and fixed misspelled function call 2011-08-07 22:00:23 +02:00
Manuel Schölling
79d0dfc7bb added missing hang=>left and people's AspectMembershipDropdown is not a partial anymore 2011-08-07 12:53:22 +02:00
Raphael Sofaer
08ae8d23cc aspect_membership_dropdown, not aspectmembership 2011-08-07 12:53:22 +02:00
Manuel Schölling
fead6032f7 Issue 1586: added a aspect drop down next to the submit button in the publisher 2011-08-07 12:51:32 +02:00
Andrej Kacian
6b64d7f55a Correctly space unread and total message counts in conversations list 2011-08-07 04:06:26 +02:00
Andrej Kacian
077d8fd2fe Fixes #1587 by changing globe icon tooltip when switching between public and limited post in publisher. 2011-08-06 23:37:21 +02:00
Sarah Mei
66bb686f4b Handle the case where the pod doesn't have the diasporahq user. 2011-08-06 12:48:23 -07:00
Raphael Sofaer
e3d0cfedd7 Use 'Welcome' from i18n 2011-08-05 23:09:00 -07:00
Raphael Sofaer
de3f27f8b1 We don't need to check defined? on an instance variable 2011-08-05 23:04:30 -07:00
Raphael Sofaer
dde4b30180 Fix rspec specs 2011-08-05 22:29:27 -07:00
Maxwell Salzberg
c5d2dbfa95 add copy 2011-08-05 18:54:49 -07:00
Maxwell Salzberg
b4d4499299 adding invite email 2011-08-05 18:32:25 -07:00
Maxwell Salzberg
a3104741c5 cleanup inviter for more offical email 2011-08-05 17:55:56 -07:00
Raphael Sofaer
a35356cfc3 DG Fix 500 in person page when incoming_request is undefined 2011-08-05 17:33:10 -07:00
danielgrippi
5e1d1428d0 fix styles 2011-08-05 17:29:57 -07:00
danielgrippi
eb6d4c0228 remove dropdown from h4 2011-08-05 17:24:54 -07:00
danielgrippi
cd62064846 touched up aspect/edit and friend finder popups 2011-08-05 17:14:07 -07:00
danielgrippi
0cceb4fdd3 fixed people/contacts layout; pulled person sub-header into its own partial 2011-08-05 15:51:18 -07:00
Raphael Sofaer
5eadc7d41c Fix the last broken jasmine spec by restoring the #no_posts div 2011-08-05 15:09:16 -07:00
danielgrippi
75c3107035 made signing up and accepting an invitation look a little nicer 2011-08-05 12:36:53 -07:00
Raphael Sofaer
c38c744156 Fix contact search in the facebook friend finder. 
It was looking for #contact_list_search instead of .contact_list_search.
 2011-08-05 12:34:48 -07:00
Raphael Sofaer
9e007f2b11 Actually add the facebook inviter partial 2011-08-05 11:55:00 -07:00
Raphael Sofaer
6d3da0d0d1 Memoize the facebook invitation form on the facebook finder page 2011-08-05 11:31:45 -07:00
Daniel Grippi
f63ba2c557 Merge pull request #1707 from TheLambdaCalculus/b1696-publisher-should-automatically-collapse-if-last-photo-removed-and-otherwise-blank 
Issue #1696 - When the last photo is deleted from the publisher, we now collapse the publisher if no status text had been entered.
 2011-08-05 10:57:33 -07:00
Daniel Grippi
a0cdf6869c Merge pull request #1732 from ticho/no-posts-message-outside-of-stream 
Move no_posts_message rendering above the stream
 2011-08-05 10:28:00 -07:00
Maxwell Salzberg
ab74c6fd6b attempt #2. sorry to the mailing list, we will get this fixed soon 2011-08-05 10:07:08 -07:00
Maxwell Salzberg
5d41c14e74 attempt to fix build 2011-08-05 09:44:35 -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
6a56e3298c only show connect to services if all services not already connected 2011-08-03 19:02:54 -07:00
Maxwell Salzberg
001d4ceaff fix friend finder styling 2011-08-03 18:55:26 -07:00
danielgrippi
b11c1a899f add invitations partial back, removed set_invites (yay) 2011-08-03 18:47:06 -07:00
danielgrippi
134e8a1b20 limit RSS rel link in layout to person pages 2011-08-03 18:30:25 -07:00
danielgrippi
9b24af717f fix styling on featured users on getting started; added hovercards 2011-08-03 18:22:52 -07:00
Maxwell Salzberg
520b0dcf33 only show resend link 2011-08-03 18:18:00 -07:00
Maxwell Salzberg
275be550f8 aspects is not an li 2011-08-03 18:14:49 -07:00
danielgrippi
99ac976594 fix redirects around getting_started and aspect/index 2011-08-03 18:07:43 -07:00
danielgrippi
987d334764 fixed tests, translations, initalizer 2011-08-03 18:02:58 -07:00
danielgrippi
23c2eaf1c5 added a real profile description on the welcome tab 2011-08-03 18:02:58 -07:00
danielgrippi
7d01deb99d don't show connect to cubbies in right bar if user is already connected 2011-08-03 18:02:58 -07:00
danielgrippi
e23439d193 fix cucumber; temporarily remove fetch featured users initilizer 2011-08-03 18:02:57 -07:00
danielgrippi
e589dd88b2 added has_connected_cubbies? 2011-08-03 18:02:57 -07:00
danielgrippi
120cf9835b added more translations; welcome text switch 2011-08-03 18:02:57 -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
danielgrippi
6369eefdbe added translations to getting started 2011-08-03 18:02:56 -07:00
danielgrippi
c9eeeb6150 ms dg; profile (step 1) finished 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
Maxwell Salzberg
1ae7b80c56 some tweaks for friend finder styling 2011-08-03 18:00:38 -07:00
Raphael Sofaer
f1040a237f Put the new_aspect class on the notification page aspect dropdown, so that the focus js is triggered 2011-08-03 17:47:52 -07:00
Maxwell Salzberg
099d882814 fix aspect dropdown when friend on diaspora 2011-08-03 17:38:30 -07:00
Maxwell Salzberg
7e8f17cc31 refactoring this stuff 2011-08-03 16:58:55 -07:00
Raphael Sofaer
67123a277c Fix and simplify likes_container 2011-08-03 11:20:06 -07:00
danielgrippi
25e4f5d0ae dg ms; made no posts text on person show more explicit 2011-08-02 12:53:36 -07:00
Raphael Sofaer
a542bb7a6d Take comments out of the photo show page, they were broken anyway. 2011-08-02 11:10:42 -07:00
Raphael Sofaer
be5453f0b4 Fix photo show pages with likes 2011-08-02 10:17:49 -07:00
Raphael Sofaer
406ab7a073 Delete a stray file, some cleanup 2011-08-02 09:47:17 -07:00
Raphael Sofaer
d7ac6c4713 Link the no_tags text to a tag page, we should make tags#index something meaningful one day. 2011-08-01 17:59:19 -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
Maxwell Salzberg
773f207b17 fix the viewport for real this time. sorry about all of the emails 2011-07-31 21:57:26 -07:00
Maxwell Salzberg
2fb2cd0a80 fix mobile viewport for mobile site 2011-07-31 21:33:43 -07:00
Gaelan D'costa
ba98043412 Issue #1126 - When the last photo is deleted from the publisher, we now collapse the publisher if no status text had been entered. 2011-07-31 19:29:01 -04:00
Andrej Kacian
78c3d91abd Show correct contact count in right bar when changing target aspect. 2011-07-31 12:29:56 +02:00
Gonzalo Rodriguez
3eb6d13f95 Issue #1431: Suggest when the first letter typed, not the third 2011-07-30 15:56:28 -03:00
danielgrippi
7504f66416 thumb small on comments 2011-07-29 19:34:50 -07:00
danielgrippi
91461ab2ad fix tag duplication; photo sizes 2011-07-29 19:31:06 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
3a6f0583c7 added featured users dg iz 2011-07-29 19:00:15 -07: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
danielgrippi
e345f2dcbc fix contacts index page 2011-07-29 14:15:28 -07:00
Raphael Sofaer
6946d28243 Fix the build for socketing of comments.haml 2011-07-29 11:50:50 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
e17fe1848f removed unused file 2011-07-29 11:39:41 -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
Raphael Sofaer
cac6d048f8 Fix mobile views of reshares 2011-07-29 11:21:13 -07:00
Maxwell Salzberg
7a43a812bf show comment form for post show pages 2011-07-29 10:10:22 -07:00
Maxwell Salzberg
b2bce9e1b2 update jquery mobile to beta1 2011-07-28 23:32:41 -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
danielgrippi
dfa5824dc1 remove repeated link, fixed cucumber 2011-07-28 14:52:09 -07:00
Raphael Sofaer
87d0f9d6fd Merge branch 'master' of github.com:diaspora/diaspora 2011-07-28 14:42:02 -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
danielgrippi
6e25a6a0f1 touched up reshare view 2011-07-28 13:46:16 -07:00
Raphael Sofaer
37bb641227 Merge branch 'master' of github.com:diaspora/diaspora 2011-07-28 13:03:06 -07:00
Dennis Schubert
bbf28f9072 That fixes the mobile-interface for now 2011-07-28 21:45:42 +02:00
Raphael Sofaer
4fa5731d5e Merge remote branch 'jancborchardt/1410-messages-conversation' 
Conflicts:
	app/views/conversations/new.haml
 2011-07-28 12:45:40 -07:00
Raphael Sofaer
192ae3a52b Merge remote branch 'ticho/followed-tag-listing-separate-file' 2011-07-28 12:33:14 -07:00
Raphael Sofaer
d043c74528 Merge remote branch 'ticho/highlight-unread-conversations' 2011-07-28 12:17:39 -07:00
Ryan Hughes
2a187ae770 Likes don't return 500 errors. 2011-07-27 23:26:54 -07:00
Raphael Sofaer
4a1bd27728 Merge pull request #1677 from ticho/conversations-send-button-action-string-fix 
Use "Sending..." instead of "Posting..." for new conversation.
 2011-07-27 17:54:35 -07:00
Raphael Sofaer
6406de89ee Merge remote branch 'gandaro/1602-delete-profile-photo' 2011-07-27 17:19:47 -07:00
Andrej Kacian
e4a81fbc8a Use "Sending..." instead of "Posting..." for new conversation. 2011-07-27 23:09:05 +02:00
Andrej Kacian
cc3ba8b076 Display unread post count for conversations in inbox, if appropriate. 2011-07-27 22:33:13 +02: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
77a654ef47 Updated copyright year in new file 2011-07-26 19:11:02 +02: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
Jonne Hass
384a71bdc4 Merge pull request #1614 from ticho/1603-likes-i18n-fix 
Fix for issue #1603 - use different i18n string for comment likes count
 2011-07-25 07:20:24 -07:00
Raphael Sofaer
56cdb7a3ad Fix translation reference 2011-07-22 18:10:34 -07:00
Raphael Sofaer
241999f72a MS RS translated reshares 2011-07-22 17:58:52 -07:00
Raphael Sofaer
00885be738 Provide feedback when a user tries to double-reshare 2011-07-22 17:43:05 -07:00
Raphael Sofaer
99aafb18cd Reshares show up on sharing, prevent multi-resharing, still need to make that ui nice 2011-07-22 17:13:31 -07:00
Raphael Sofaer
78bced56bb Reshares and reshare retractions are green. 2011-07-22 16:00:19 -07:00
Andrej Kacian
c1e5a83f15 Fix for issue #1603 - use different i18n string for comment likes count 2011-07-22 19:57:18 +02:00
Raphael Sofaer
e19fb6d0f8 Use authority instead of host in order to get the port as well. 2011-07-21 18:23:33 -07:00
danielgrippi
2d6f51f68c repost wip 2011-07-21 18:22:18 -07:00
danielgrippi
bdc4b9f746 marsharing reshares now grabs the post from the original poster, also fetcheer that person if they don't exist locally still need to ping for xml and give the right xml back 2011-07-21 18:22:18 -07:00
danielgrippi
7b3180e5da user can retract a reshared post 2011-07-21 18:22:17 -07:00
danielgrippi
f3a515eef1 DG IZ reshare retractions is WIP 2011-07-21 18:22:17 -07:00
danielgrippi
d1bbbdbc4c fixed all specs; rebased. 2011-07-21 18:22:17 -07:00
Ilya Zhitomirskiy
ce94779766 not showing the reshare button to the users on things they can't reshare 2011-07-21 18:22:17 -07:00
Maxwell Salzberg
fa9269541f wip removed some generated specs 2011-07-21 18:22:17 -07:00
Maxwell Salzberg
06f886ad77 WIP reshare 2011-07-21 18:22:17 -07:00
Raphael Sofaer
caf26a5c64 Upgrade rails.js, add CSRF token manually in the photo uploader. 2011-07-21 17:49:33 -07:00
Maxwell Salzberg
757c9169fc updated gemfile 2011-07-21 14:32:10 -07:00
Raphael Sofaer
8eea37cbdb Fix people socketing 2011-07-21 13:41:46 -07:00
Raphael Sofaer
a5fd01cc09 Fix comment socketing 2011-07-21 13:21:48 -07:00
Jakob Kramer
cb0124f48e fixing #1602 2011-07-21 15:52:34 +02:00
Jan-Christoph Borchardt
5d998a8e93 Fix issue #1410, remove cancel button in messages conversation 2011-07-20 11:20:18 +02:00
Raphael Sofaer
9797e04957 Merge remote branch 'yolk/348-change-email-with-confirmation' into merge_email_change 
Conflicts:
	app/controllers/users_controller.rb
	config/locales/diaspora/en.yml
	db/schema.rb
	spec/controllers/users_controller_spec.rb
	spec/mailers/notifier_spec.rb
 2011-07-19 10:44:00 -07:00
Dan Hansen
6a11784a2e Rewrote ContactsController#index, thoughts? 2011-07-17 15:44:07 -07:00
Andrej Kacian
713f4dcc9d Fix for issue #1600: Missing string for translation ("Recent notifications") 2011-07-17 17:04:51 +02:00
danielgrippi
22fdf7f895 fix 500 on posts show on mobile 2011-07-15 22:37:21 -07:00
danielgrippi
39da9302a1 Revert "deleted unused file". sorry!! :( 
This reverts commit a6f2f82c5e.
 2011-07-15 22:33:55 -07:00
danielgrippi
a6f2f82c5e deleted unused file 2011-07-15 21:44:12 -07:00
danielgrippi
c4b715f3ff fixed emails to show avatars, have subject lines that allow threading in email clients, and relevant content previews 2011-07-15 21:22:29 -07:00
Raphael Sofaer
f60a748c21 Ajax in the contacts for mentioning after page load 2011-07-15 14:23:44 -04:00
Sarah Mei
bcb4fac465 Vanna doesn't include helpers so we have to include them in views separately to use them. The absence of this line was producing a deprecation warning for error_messages_for, because our helper redefines that method (it was removed from rails). 2011-07-14 18:24:33 -07:00
Arzumy MD
03e79da171 fixed missing i18n key for no_services 2011-07-13 12:17:47 +08:00
Raphael Sofaer
0fae31dacf Prevent people pagination links on tag pages from breaking lines 2011-07-12 17:21:02 -07:00
Raphael Sofaer
df5177a50d Fix mobile AS photo page 2011-07-12 17:05:37 -07:00
Raphael Sofaer
c3ecc59bee Bring back the js people pagination on tag show, we need a js file for that page 2011-07-12 16:45:29 -07:00
Raphael Sofaer
e30b82dd45 Fix resend links in inviter 2011-07-12 15:08:03 -07:00
danielgrippi
dba8a6598c don't constrain photos to squares on photo index 2011-07-12 00:21:44 -07:00
Raphael Sofaer
58e844eb1f fade in like action for comments 2011-07-11 16:53:14 -07:00
Raphael Sofaer
8f50c622fa Fix contentUpdater spec, adjust migration and fix a couple of the js viwes 2011-07-11 16:17:11 -07:00
danielgrippi
d364f158b8 cache counters in for likes. pending Diaspora::Likeable module... 2011-07-11 15:05:55 -07:00
danielgrippi
e0bbde4ce2 comment likes wip. need to backfill some tests, make views nicer 2011-07-11 15:03:28 -07:00
danielgrippi
797a6f5ca9 like comments js response wip 2011-07-11 15:02:46 -07:00
danielgrippi
2e15b6a61e Likes in comments, cache counter disabled for now. 2011-07-11 15:00:48 -07:00
Raphael Sofaer
eafe6a7c85 Merge branch 'ajaxy-comments' 2011-07-11 14:05:45 -07:00
Raphael Sofaer
39ff51a9d7 Make comments index ajaxy 2011-07-11 14:03:59 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
594c9b02b1 A admin is now able to allow open invitations 2011-07-11 13:32:02 -07:00
Raphael Sofaer
3f555eefc4 Server side of ajaxy comments done, need to modify comments/_comments and make it work. 2011-07-11 09:11:16 -07:00
Maxwell Salzberg
0444613e38 fix for profile photto uploader preview 2011-07-10 23:01:11 -07:00
Raphael Sofaer
2fb0fce1a8 Nest likes and comments routes in the post route 2011-07-10 21:44:34 -07:00
danielgrippi
875eaffd42 added missing class to cubbies photos in the stream for the lightbox 2011-07-10 21:42:37 -07:00
danielgrippi
d69f89f689 forgot an attr on cubbies photos 2011-07-10 21:29:32 -07:00
danielgrippi
776368d45e added left/right arrow events to the lightbox; lightbox only on stream element images for now 2011-07-10 21:09:00 -07:00
danielgrippi
e09ddef361 DH DG; lightboxin wip 2011-07-10 21:08:34 -07:00
Raphael Sofaer
97ca10ddda Huge commit I know, but move show and destroy routes into PostsController and PostsController#show into PublicsController 2011-07-10 20:06:31 -07:00
danielgrippi
6a165c0e3d made show pages wider for status messages. made names blue in comments for easier reading 2011-07-10 18:54:38 -07:00
danielgrippi
7b7f3fc086 fix up aspects/edit popup a little 2011-07-10 18:34:47 -07:00
danielgrippi
e84635dae2 constrain in the image uploader, don't crop 2011-07-10 17:03:38 -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
029e9c55c2 don't display public posting option if not posting to all aspects 2011-07-07 15:50:33 -07:00
Raphael Sofaer
d0ce257107 Revert "Revert "Merge branch 'hashtags-in-comments'"" 
This reverts commit d2e26f6937.
 2011-07-07 15:10:04 -07:00
danielgrippi
d2e26f6937 Revert "Merge branch 'hashtags-in-comments'" 
This reverts commit f85d5ad6d4, reversing
changes made to b8d70393f4.
 2011-07-07 13:39:15 -07:00
danielgrippi
310b9969f3 hashtags module now in comments. not sure how to pull back relevant posts on tags/show from here... 2011-07-07 12:21:57 -07:00
danielgrippi
f0fa79bb09 Revert "ordered hash stuff" 
This reverts commit 2d98b939d1.
 2011-07-06 19:13:34 -07:00
danielgrippi
2d98b939d1 ordered hash stuff 2011-07-06 19:11:53 -07:00
danielgrippi
b1fc87ea30 add basic overview page to admin controller 2011-07-06 19:08:09 -07:00
Raphael Sofaer
03df3e3e59 Fix manages_aspects feature 2011-07-06 19:00:28 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
738487b381 moved the are you sure dialog into a translation 2011-07-06 16:34:51 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
8d94115bbc added the start conversation button back with a message if you try to add more than 16 people 2011-07-06 16:05:12 -07:00
danielgrippi
fd015129c4 final touchups to hovercard 2011-07-06 13:51:19 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
1c79c2c6f0 made aspect_dropdown ajax in (created route), in the process of removing aspect_membership js responses 2011-07-06 12:45:16 -07:00
danielgrippi
675d9d7485 wip. Person#as_json is breaking right now 2011-07-06 12:45:16 -07:00
Dan Hansen
e852940382 HOVERCARD 2011-07-06 12:45:16 -07:00
danielgrippi
d74942877f touch up message inbox view 2011-07-06 00:38:25 -07:00
Raphael Sofaer
4a9900dff6 Fix some ui bugs on the post show page 2011-07-05 18:52:00 -07:00
danielgrippi
41be7a37b0 hide aspect dropdowns on tag show temporarily 2011-07-05 16:42:32 -07:00
danielgrippi
ecaf7974e3 removed fixed sidebar for tag following 2011-07-05 16:27:41 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
c3e477f2c5 Color the follow tag button 2011-07-05 15:03:26 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
edac7601f5 checkedout the create.js from master 2011-07-05 15:03:26 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
f0d9d318e8 a user can now follow and unfollow a tag 2011-07-05 15:03:26 -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
Ilyaaaaaaaaaaaaa Zhitomirskiy
77d28b4117 wip following tags 2011-07-05 15:03:26 -07:00
danielgrippi
47aab723bd fix message focus bug 2011-07-05 12:17:23 -07:00
danielgrippi
ecd79766ce remove aspect badges 2011-07-04 22:36:21 -07:00
Raphael Sofaer
162f035c62 Merge branch 'ajaxy-likes' 2011-07-04 22:12:12 -07:00
Raphael Sofaer
4f056dca8e Ajax in likes in stream 2011-07-04 22:10:30 -07:00
danielgrippi
1aed8e7e16 testing fixing left nav on aspect/index 2011-07-04 21:55:04 -07:00
danielgrippi
d75a682199 compress png 2011-07-04 17:26:34 -07:00
danielgrippi
85d6eb70e7 fix cubbies info page (removed reference to token, changed infographic) 2011-07-04 16:14:05 -07:00
Maxwell Salzberg
b645a77be9 translate a string in services#index view 2011-07-04 13:59:44 -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
danielgrippi
403d18bac4 fixed content expander in comments; comments have a smaller limit than posts 2011-07-03 22:06:58 -07:00
danielgrippi
829c86823d remove dislikes; didn't change the db structure, just removed the traces in the code since we're not using them 2011-07-03 20:08:11 -07:00
danielgrippi
45834f1edf remove 'start a conversation button' until we have a limit, or a warning message if a person is sending a message to more than ~20 people 2011-07-03 14:50:37 -07:00
Maxwell Salzberg
4b0157f5b0 fix notification mark all as read ui bug 2011-07-03 08:20:24 -07:00
danielgrippi
8a8f8db9ad Merge branch 'notifications' 2011-07-02 17:53:55 -07:00
danielgrippi
9ec905560c visual touchups, show loading gif right away 2011-07-02 17:53:07 -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
danielgrippi
24d84d7756 fixed stupid 500 caused by publisher 2011-07-02 16:02:14 -07:00
danielgrippi
689bde2e5f take out useless 'reshare' 2011-07-02 15:41:50 -07:00
mb-log
64898c522e Don't need edit button on public profiles 2011-07-02 16:56:09 +02:00
Dan Hansen & Daniel Grippi
b48b182c73 STYLIN' 2011-07-02 00:04:14 -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
Dan Hansen
05688c2f43 notifications wip 2011-07-01 22:46:54 -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
e0816ccc39 author info in stream element should be incased in a div. WHOOPS. 2011-07-01 22:12:43 -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
cd9be3904b publisher rework 2011-07-01 10:51:45 -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
Raphael Sofaer
d68c8a3a03 Merge pull request #657 from ndee/1050-cancel-message 
Issue #1050: Changed cancel-link of a new message to back
 2011-07-01 10:46:27 -07:00
Sarah Mei
948a7c5d55 DH SM MS Fix showing image in the publisher when it gets uploaded 2011-06-30 20:36:15 -07:00
danielgrippi
4e48db23f0 aspect dropdown shows name of aspect if contact is only in one; green 2011-06-30 12:18:41 -07:00
danielgrippi
53c87562f4 switch aspect listings and info stuffs on aspect/index 2011-06-28 23:40:57 -07:00
danielgrippi
b8ea8e9e75 start a conversation with an aspect from contact index page 2011-06-28 23:09:11 -07:00
Raphael Sofaer
1af945de11 Merge branch 'master' into oauth 
Conflicts:
	Gemfile
	Gemfile.lock
	app/models/app_config.rb
	app/models/post.rb
	db/schema.rb
	public/stylesheets/sass/application.sass
	spec/lib/webfinger_spec.rb
 2011-06-28 17:13:38 -07:00
Dennis Collinson & Michael Sofaer
f9e8e7a041 notifications tests pass 2011-06-27 19:51:35 -07:00
Dan Hansen & Michael Sofaer
46c83a7c7d reset the notifications helper to master's version and monkey patch header 2011-06-27 19:51:35 -07:00
Dan Hansen & Michael Sofaer
bc874e92cd close link for notifications ajax 2011-06-27 19:51:35 -07:00
Michael Sofaer
2c4a75f6a6 Handle multiple notification objects correctly 2011-06-27 19:51:35 -07:00
Michael Sofaer
d6ba3c970c proof of concept for notifications overlay 2011-06-27 19:51:35 -07:00
Michael Sofaer
ef7580a698 Notifications page works with Vanna 2011-06-27 19:51:35 -07:00
danielgrippi
a6cb04aadb wider! 2011-06-27 19:38:14 -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
danielgrippi
00ffade884 sub menu for people only sharing with you on contacts page 2011-06-27 17:22:36 -07:00
Raphael Sofaer
240eb78b08 Change homepage_url to application_base_url 2011-06-27 16:44:18 -07:00
danielgrippi
44b77c58a3 just have a remove from aspect icon when viewing an aspect in contacts index 2011-06-27 16:26:54 -07:00
danielgrippi
f9a23b8120 added inf scroll to contacts index page 2011-06-27 15:54:03 -07:00
danielgrippi
9e92230cf7 make contact listings more compact on contact index (we don't need to know their tags here) 2011-06-27 15:32:39 -07:00
danielgrippi
f839714646 added aspect filtering to contact index. fixed rspec 2011-06-27 15:03:39 -07:00
danielgrippi
1fe4c3c3de don't group by 2011-06-27 14:06:03 -07:00
danielgrippi
85da6d340f sort contacts by last name on contacts page 2011-06-27 14:00:15 -07:00
danielgrippi
a2609f7dac simple filter on contacts index page (my/all contacts) 2011-06-27 12:12:50 -07:00
Raphael Sofaer
b2f7ff5dd4 Fix notifications. 2011-06-26 21:59:04 -07:00
Raphael Sofaer
a1a53b34e9 Link to post in text email for comment_on_post. Fix 1144 2011-06-26 20:09:21 -07:00
Raphael Sofaer
5884a900a2 Get rid of manage 2011-06-24 16:55:40 -07:00
danielgrippi
15571ecff0 render ASPhoto show page just like status message show for now 2011-06-23 15:47:59 -07:00
danielgrippi
c91cf6f38c properly display app icon on authorizations index 2011-06-23 13:59:03 -07:00
danielgrippi
a9b7cd1254 nicer auth prompt. wip. 2011-06-23 12:40:47 -07:00
Raphael Sofaer
40560680fe Title on sessions#new 2011-06-22 18:57:02 -07:00
Raphael Sofaer
02739259b6 Don't hide the forgot password link 2011-06-22 13:19:54 -07:00
Andreas Henrich
7b3711a788 Issue #1050: Changed cancel-link of a new message to back 2011-06-21 18:48:34 -04:00
Maxwell Salzberg
41e8a32b28 tests for data methods 2011-06-16 15:47:16 -07:00
Maxwell Salzberg
86f4f983f6 move all aspects to be a method, and cleaned up some sockets helper uglyness ms iz 2011-06-16 11:17:14 -07:00
Ilya Zhitomirskiy
2a4932ea34 WIP verifying sig in the pre-registration endpoint 2011-06-13 22:57:56 -07:00
Raphael Sofaer
7fd86924ee Fix pagination in AppsController 2011-06-09 16:23:15 -07:00
Raphael Sofaer
0790c3397e Delete some useless JS 2011-06-09 16:23:15 -07:00
Ilya Zhitomirskiy
a03423309d fixed the getting started step 3, ignore the CA certs in developement is now in initializer, changed the 'login' -> 'connect' [to facebook] png 2011-06-09 15:12:35 -07:00
Raphael Sofaer
775dbda2b2 Chubbies now uses diaspora-client 2011-06-09 12:40:30 -07:00
Raphael Sofaer
d9d66a5c31 WIP auth form and more oauth stuff 2011-06-08 11:55:11 -07:00
danielgrippi
96fc104218 paginate looks for stream elements 2011-06-06 23:12:14 -07:00
danielgrippi
b8a6bf9f51 trying something different on app show page. worth a shot. 2011-06-06 22:59:31 -07:00
Raphael Sofaer
753be12a1f Don't force a query on like count 2011-06-05 00:32:10 -07:00
Maxwell Salzberg
4b13c83de7 Chubbies now uses sqlite to have tables of pods and users 2011-06-03 16:24:12 -07:00
danielgrippi
01edfeee03 Chubbies now sends manifest data to create a client 2011-06-03 16:24:12 -07:00
Raphael Sofaer
381b85189d Add Chubbies, the oauth sample app, and a cucumber feature for part of an oauth flow 2011-06-03 16:22:38 -07:00
Maxwell Salzberg
149c086d5e make the tumblr posting smarter 2011-06-02 17:02:29 -07:00
Dan Hansen
bc465848c9 MS DH fixed like sizes, everywhere 2011-06-02 17:45:45 -05:00
Dan Hansen
864233eb63 fix status message show page and break out Post to it's own javascript widget 2011-06-02 17:45:45 -05:00
MrZYX
82ca293825 fix services index with incomplete oauth_keys.yml 2011-06-02 13:20:22 +02:00
Maxwell Salzberg
5cbbdf2949 initial post to tumblr support 2011-06-01 22:30:22 -07:00
Maxwell Salzberg
1ef9d43262 added pagination for people on tag pages 2011-06-01 18:59:15 -07:00
Sebastian
ea85daadc4 Added UsersController#confirm_email with route and some specs 2011-06-01 16:26:54 +02:00
Sebastian
37ccbce153 Added confirmation email + specs + User#mail_confirm_email + call User#mail_confirm_email in UsersController#update 2011-06-01 16:26:53 +02:00
Sebastian
602382e24e Extended UsersController#update method for changing password with minimal specs, added form to view and locales (en). 2011-06-01 16:26:53 +02:00
Jonne Hass
1be2845687 Merge pull request #650 from yolk/1104-wrong-profile-picture-size 
fixed #1104 wrong profile picture size
 2011-05-31 10:33:26 -07:00
Sebastian
d4d0eacf49 fixed #1104 wrong profile picture size 2011-05-31 19:06:35 +02: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
MrZYX
42f5f7fc32 fixed find person by handle 2011-05-29 21:27:20 +02:00
MrZYX
54f1effdf8 Merge branch '1092-no-pic-select' of https://github.com/gandaro/diaspora 2011-05-27 19:35:39 +02:00
Jakob Kramer
0efaa77c46 fixes bug #1092 2011-05-27 18:59:02 +02:00
MrZYX
e201340bb2 Photo association on GUID 2/2: replace status_message_id with status_message_guid 2011-05-27 18:56:24 +02:00
Maxwell Salzberg
52487e87de added a very basic page for the stream of all public activity stream photos 2011-05-25 12:57:29 -07:00
Maxwell Salzberg
56644c9d1e use notification people link for likes.... it should now get refactored, but it works nicely now, even with I18n 2011-05-24 21:45:12 -07:00
MrZYX
db22be43a8 really no string concatenation and proper pluralization in notifications helper AKA THE REASON I DIDN'T WANTED TO TOUCH THIS STUFF 2011-05-24 17:03:48 +02:00
danielgrippi
3f66458386 remove text from token page explaining there is no FF cubbies extension 2011-05-24 07:42:37 -07:00
Maxwell Salzberg
20cc3f0c7d change the smiley for a heart.... the smiley looked sad at that size.. 2011-05-23 23:53:18 -07:00
danielgrippi
8e3149ca01 better page explaining cubbi.es and why we're promoting it on diaspora 2011-05-23 01:14:33 -07:00
Maxwell Salzberg
90d62f3c8a small ui tweak for mobile login page 2011-05-22 15:43:39 -07:00
Maxwell Salzberg
a4017ba16f small linebreak for cubbies view for mobile 2011-05-22 15:25:37 -07:00
MrZYX
07395fb2c9 added maxlength attribute to aspect name input, fixed #675 2011-05-22 13:50:44 +02:00
danielgrippi
6a108104e8 add spacing 2011-05-21 14:56:11 -07:00
danielgrippi
0391795f80 better right pane sections 2011-05-21 14:52:59 -07:00
danielgrippi
7c949f4377 show diaspora handle on token page 2011-05-20 21:48:45 -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
danielgrippi
f2259e5e25 put link in via link translation, add via link to mobile site 2011-05-19 16:06:29 -07:00
danielgrippi
83756c5713 actually add the views. fix object_path 2011-05-19 15:34:39 -07:00
danielgrippi
d7899d10e3 Fix various links in to cubbi.es objects 2011-05-19 15:17:42 -07:00
Maxwell Salzberg
69e83bb065 remove whitespace on your own profile 2011-05-19 15:08:17 -07:00
Maxwell Salzberg
8796c5b722 fixed build, added debugging info for notification 500s 2011-05-19 14:48:09 -07:00
Maxwell Salzberg
3c4c62abd5 moved auth token to admins page, and added a link in the dropdown 2011-05-19 14:23:04 -07:00
danielgrippi
177061d1c5 added via links 2011-05-19 13:13:08 -07:00
danielgrippi
6c31867345 check for AS object in partial hack 2011-05-19 12:40:05 -07:00
danielgrippi
e7095ba788 Tests now pass, stream_element needs de-hacking 2011-05-19 12:19:27 -07:00
danielgrippi
c8e31825c5 Bookmark -> ActivitiyStreams::Photo 2011-05-19 11:57:06 -07:00
danielgrippi
41e1d0dd86 show photos from cubbies in the streams 2011-05-19 11:57:06 -07:00
Ilya Zhitomirskiy
6cda0bf9ea Revert "added a podwide email preference" 
This reverts commit 60c0a9839b.
 2011-05-18 10:38:45 -07:00
MrZYX
b0e9f5388b fixed a translation; added that missing </li> for you, fixed #1078 2011-05-18 13:22:05 +02:00
Ilya Zhitomirskiy
60c0a9839b added a podwide email preference 2011-05-17 18:19:47 -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
0c62277961 add add to aspect dropdown on notifications page 2011-05-17 14:41:15 -07:00
Raphael Sofaer
d7980978fa Render collection in services finder 2011-05-17 14:04:42 -07:00
danielgrippi
26ac8b8285 fix 500 on people index 2011-05-17 12:24:07 -07:00
danielgrippi
57a2a8fa71 remove button to add yourself to an asepct on your profile page: 2011-05-17 12:14:05 -07:00
danielgrippi
775e7b6b2b Merge branch 'master' into follow 
Conflicts:
	features/step_definitions/user_steps.rb
 2011-05-17 11:33:35 -07:00
MrZYX
1746f610b6 if we disable websocket in single process mode, there's no need for the JS 2011-05-17 19:26:37 +02:00
danielgrippi
d70f10b609 made dropdown selectors sexi 2011-05-16 16:29:13 -07: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
MrZYX
e338886910 fixes to login page: removed not needed login.sass; removed fixed string length assumption; fixed login button not showing up in Chrome when the form is pre-filled 2011-05-16 15:16:01 +02: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
01be909e38 well, that was dumb. (fix cucumber) 2011-05-14 00:58:39 -07:00
danielgrippi
b89dd900cc misc visual cleanup on mobile 2011-05-13 23:33:16 -07:00
danielgrippi
666fb76bfc login as its own js file. accounted for the autofil state 2011-05-13 22:27:08 -07:00
danielgrippi
0e72a91d1b update login page 2011-05-13 22:05:35 -07:00
Raphael Sofaer
a46ff394b1 update devise_invitable and devise 2011-05-13 16:32:07 -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
60a60733df Merge branch 'master' into follow 
Conflicts:
	app/controllers/aspects_controller.rb
	app/controllers/contacts_controller.rb
	app/controllers/people_controller.rb
	app/controllers/photos_controller.rb
	app/controllers/tags_controller.rb
	app/helpers/notifications_helper.rb
	app/models/notifications/new_request.rb
	app/models/user_preference.rb
	public/javascripts/view.js
	spec/controllers/aspects_controller_spec.rb
	spec/controllers/contacts_controller_spec.rb
	spec/controllers/home_controller_spec.rb
	spec/controllers/post_visibilities_controller_spec.rb
	spec/controllers/requests_controller_spec.rb
	spec/mailers/notifier_spec.rb
	spec/models/user_spec.rb
 2011-05-12 15:49:51 -07:00
danielgrippi
3c82af49bf fixed cucumber with an exception of one step. added dropdowns to tag pages 2011-05-12 14:11:52 -07:00
danielgrippi
4280417e41 broke out dropdown into its own partial. aspect dropdown on person show. user menu fixed 2011-05-11 18:33:17 -07:00
danielgrippi
7893129435 prevent user from hitting aspectmemberships controller before response on dropdowns 2011-05-11 17:07:58 -07:00
Raphael Sofaer
cb49d1f4ea fixed the formatting on emails 2011-05-11 17:02:05 -07:00
danielgrippi
c67d143719 dropdown in ContactsController#sharing now works 2011-05-11 15:47:13 -07:00
Raphael Sofaer
6fa433ced8 added the header back 2011-05-11 15:33:39 -07:00
danielgrippi
9f3044838d Views for contactscontroller#sharing almost done, cuke for editing aspect memberships started 2011-05-11 14:53:43 -07:00
Raphael Sofaer
b8d9610877 added translation to the likes popup, made the notification models a little clearer 2011-05-11 13:50:26 -07:00
danielgrippi
ebb17ff70c few cucumber steps failing. wip. 2011-05-11 11:08:30 -07:00
danielgrippi
dfeb4f3a13 use .js response convention for remote likeke behavior 2011-05-11 11:08:30 -07:00
danielgrippi
eadede966f unliking works right now minus on-page feedback 2011-05-11 11:08:30 -07:00
danielgrippi
8b081a48b4 likes controller now has destroy method. commented out dislikes from views. unlike links not functional. 2011-05-11 11:08:29 -07:00
MrZYX
73c96ea8f0 Revert "Clean up WSR, add comment processing to ContentUpdater, add comment fixture, update post processing spec" 
This reverts commit bd74ab4acc.

This reproducable breaks functionallity (comments). Please do not push WIP/not working stuff to master. To continue work just revert this revert. Thanks
 2011-05-11 11:51:51 +02:00
Dan Hansen
bd74ab4acc Clean up WSR, add comment processing to ContentUpdater, add comment fixture, update post processing spec 2011-05-10 23:19:36 -05:00
Raphael Sofaer
ab1f29c339 Working on styling the ContactsController#sharing 2011-05-10 14:17:43 -07:00
=
2a11bb208e Add message inbox link to mobile menu 2011-05-10 12:08:05 -05:00
zhitomirskiyi
469d5b99a2 WIP added a share view, tests are red 2011-05-09 16:55:22 -07:00
danielgrippi
d34774f4e5 png favicon 2011-05-09 16:24:24 -07:00
danielgrippi
68601e392e halfway to a better welcome/getting started page. wip. 2011-05-08 22:15:26 -07:00
Raphael Sofaer
160e01f7bd Fix broken sorting by activity 2011-05-07 00:50:26 -04:00
Maxwell Salzberg
7a2f6dae10 fixed js error on new comments on statusmessage show page 2011-05-06 15:29:39 -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
f89b6ae5be Fix all contacts link 2011-05-03 11:02:08 -07:00
Raphael Sofaer
c7358c8664 Fix rendering into json for names with quotes 2011-05-03 10:50:13 -07:00
Raphael Sofaer
567b440f3d Use correct pagination in mobile person show 2011-04-30 10:26:16 -07:00
Raphael Sofaer
38e44b13aa Test and fix pagination on profile, tag and aspect streams 2011-04-30 10:26:16 -07:00
MrZYX
b23f9b39eb fixed adding contact feedback on people search result page 2011-04-30 17:00:52 +02:00
Raphael Sofaer
a5f297d7f7 Don't include every helper everywhere, re-organize helpers 2011-04-28 10:38:33 -07:00
Raphael Sofaer
b4e36878fe Fix pages after 1 on tag page 2011-04-28 09:28:59 -07:00
Dan Hansen
c1366e0e04 Make photos display inline on StatusMessage#show 2011-04-27 17:06:26 -05:00
Dan Hansen
4a101f25d9 Notifications.js refactor, add specs 2011-04-27 16:22:56 -05:00
Raphael Sofaer
5dcfff104a Merge remote branch 'ritchewilson/prev_next' 
Conflicts:
	public/stylesheets/sass/mobile.sass
 2011-04-19 17:05:12 -07:00
maxwell
9850a3f124 change text on manage services popup 2011-04-18 18:38:03 -07:00
maxwell
62c164e1a4 fixed displays of the days based on locale 2011-04-18 18:29:55 -07:00
maxwell
d70ef86337 make the days the right size in notification page 2011-04-18 17:55:17 -07:00
MrZYX
c06b885aa7 fixed #1027 2011-04-19 00:27:31 +02:00
maxwell
1fc01c3980 basically fixed 2011-04-18 15:10:47 -07:00
maxwell
2223c562c0 first fix of notification page 2011-04-18 15:10:47 -07:00
maxwell
5050307179 Revert "Revert "touched up notifications page" because it completly breaks the page (in matter of style and localization [dates!])" 
This reverts commit 981d39d220.
 2011-04-18 15:10:46 -07:00
MrZYX
981d39d220 Revert "touched up notifications page" because it completly breaks the page (in matter of style and localization [dates!]) 
This reverts commit a16e83df9e.
 2011-04-16 14:03:24 +02:00
danielgrippi
a16e83df9e touched up notifications page 2011-04-15 10:42:21 -07:00
Raphael Sofaer
4870ffb944 Fix db seed, refactor aspect-filters a bunch, fix stream_element a little 2011-04-13 18:13:26 -07:00
Raphael Sofaer
f13304073b The specs are green on my dev machine, let's see if CI is still red 2011-04-13 15:19:17 -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
Raphael Sofaer
5afe5f667e Move js out of notifications index, fix reference to notifications badge 2011-04-12 17:15:02 -07:00
Raphael Sofaer
363ef2c276 Fix some translations (thanks MrZYX) 2011-04-12 12:24:29 -07:00
Raphael Sofaer
d5ecce7ca6 Merge branch 'limit_similar_contacts' 
Conflicts:
	app/controllers/people_controller.rb
 2011-04-12 11:48:41 -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
352d1c6abf fixed disconnecting logic. specs&cucumber green 2011-04-11 15:10:51 -07:00
MrZYX
93be252b59 Merge branch 'css-rtl' 
Conflicts:
	public/javascripts/application.js
	public/javascripts/inbox.js
 2011-04-11 21:52:01 +02:00
MrZYX
440fd26c14 hopefully finally fix #946 2011-04-11 19:15:14 +02:00
MrZYX
ffbe94f75c revert moved add aspect button to the left for rtl languages, this is already done by CSS 2011-04-11 18:04:50 +02:00
MrZYX
2413b3c4bd Merge branch 'css-rtl' of https://github.com/everplays/diaspora into css-rtl 2011-04-11 18:01:09 +02:00
MrZYX
cf61bb756d added dir attribute to html element; made tipsy gravity dependant on that 2011-04-11 18:00:28 +02:00
danielgrippi
1c9ca738ae green everywhere. 2011-04-08 17:10:43 -07:00
danielgrippi
c128cae4ec specs green after moving ContactController#new to AspectsMembership#new 2011-04-08 11:44:09 -07:00
Raphael Sofaer
927ba96fcc Take out broken 'start sharing' link from mobile site 2011-04-08 11:09:56 -07:00
Raphael Sofaer
f8359bd77d Fix PeopleController#show mobile 2011-04-08 10:37:08 -07:00
Raphael Sofaer
761411e153 Mostly fix PeopleController#show for mobile 2011-04-08 10:37:08 -07:00
danielgrippi
aeda5a4e39 dispatching / receiving logic complete. following wip. 2011-04-07 18:29:24 -07:00
maxwell
d7c4e15835 let admin give a user 10 ma user 10 more invites 2011-04-07 17:54:22 -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
157b117469 Just style links directly 2011-04-07 15:13:37 -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
danielgrippi
2e5b5e1efe request notification emails -> started sharing notification emails 2011-04-06 13:21:15 -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
MrZYX
21b5f7932f fixed #997 by turning cancel link into a reset button 2011-04-06 13:31:56 +02: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
danielgrippi
847f4fd260 edited subscribers to include all contacts on public posts. added the ability to drop an aspect regardless of contacts contained. wip. 2011-04-05 18:53:10 -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
MrZYX
e7d48a16ee moved + to the left for rtl languages 2011-04-05 19:33:51 +02:00
danielgrippi
cbdbe1b29b follow wip. 2 failures. 2011-04-04 19:22:19 -07:00
danielgrippi
590e1fd93f All green except invite connecting +2 misc. 2011-04-04 15:16:19 -07:00
maxwell
94d8fb9f3a Revert "fpossible fix for mobile site 500 on user login" 
This reverts commit fe52acb931.
 2011-04-04 11:11:11 -07:00
maxwell
fe52acb931 fpossible fix for mobile site 500 on user login 2011-04-04 10:58:50 -07:00
maxwell
95c1edbab8 disable duplicate sending of a private message 2011-04-04 10:09:53 -07:00