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

4302 commits

Author SHA1 Message Date
Maxwell Salzberg
757c9169fc updated gemfile 2011-07-21 14:32:10 -07:00
Maxwell Salzberg
eee2225f04 rspec is green 2011-07-21 14:32:10 -07:00
Maxwell Salzberg
df62f58156 fixed the safe_buffer issues 2011-07-21 14:32:09 -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
Raphael Sofaer
4de2ca9958 Get websocket pushing posts 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
b01ffb4489 We don't use perform_delegate anymore 2011-07-19 10:55:23 -07: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
Raphael Sofaer
9789d1d6cb Fix issue #1579, like.target, not like.post 2011-07-17 21:18:21 -04:00
Raphael Sofaer
d30228abb8 Merge remote branch 'untitaker/1589-remove-unicode-smileys' 2011-07-17 21:12:20 -04: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
Markus Unterwaditzer
d4257f4a68 Removed unicode smileys, #1589 2011-07-17 10:45:06 +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
5d64611f2b Include profile in contactsController index for the publisher 2011-07-15 14:49:35 -07:00
Raphael Sofaer
f60a748c21 Ajax in the contacts for mentioning after page load 2011-07-15 14:23:44 -04:00
Raphael Sofaer
37e939d476 Use activerecord-import in ReceiveLocalBatch. The default behavior of it is to do an On Duplicate Key Update updated_at = Time.now, but we have a test for that case anyway. 2011-07-14 21:27:16 -07: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
Raphael Sofaer
55009a8381 Use activerecord-import to re-save ServiceUser objects. We should do the same in ReceiveLocalBatch. 2011-07-13 10:59:41 -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
874654b461 Reenable sessionscontroller after_filter 2011-07-12 17:01:40 -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
14759b2c80 Use person_link in notifications_helper, move hovercard css out to a file 2011-07-12 16:21:03 -07:00
danielgrippi
6f807f263a fix the specs; pull back guid in post_visibilities_controller 2011-07-12 15:18:28 -07:00
Raphael Sofaer
e30b82dd45 Fix resend links in inviter 2011-07-12 15:08:03 -07:00
MrZYX
9304db68f1 fix peoples#aspect_membership_dropdown 2011-07-12 20:04:55 +02:00
danielgrippi
dba8a6598c don't constrain photos to squares on photo index 2011-07-12 00:21:44 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
f6bf17897d actually displaying the facebook results(first time connection), updating attributes instead of discarding the changes 2011-07-11 16:52:30 -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
67882c775e Addded Diaspora::Likeable module. Corrected the unique index for likes to include author_id; extracted before_save callback needed for tags into Diaspora::Taggable. 2011-07-11 15:06:35 -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
e59f49aace Fix specs after merge 2011-07-11 14:38:51 -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
71dbfce23f Doc new_comment_form 2011-07-10 21:44:34 -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
Raphael Sofaer
c83276a9d9 OK, now I get what was going on. 2011-07-07 22:17:42 -07: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
968100860a Don't show commented tags in the tag stream for now, until we optimize that 2011-07-07 15:39:28 -07:00
Raphael Sofaer
e98cc4b960 Sort on and index taggings, ftw 2011-07-07 15:14:29 -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
9d506231b1 querying correctly in tagscontroller to include posts with comments containing hashtag 2011-07-07 12:27:48 -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
b8d70393f4 include authors and profiles on tags show page 2011-07-07 11:14:10 -07:00
Raphael Sofaer
8cf0fa8446 Don't get tags in the publisher 2011-07-07 10:48:07 -07:00
Raphael Sofaer
254d83b278 Simplify SocketsHelper in light of adding current_user helper to SocketsController 2011-07-07 09:06:24 -07:00
danielgrippi
e994c90559 don't show hovercard for current_user in likes field + fixed hovercard styling in likes field 2011-07-06 21:33:59 -07:00
danielgrippi
fdaa44ca9c add hovercards to links in likes 2011-07-06 21:09:24 -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
danielgrippi
f3d185fe41 hovercard on comments 2011-07-06 17:13:11 -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
76382b074c fix jammit warnings; specs 2011-07-06 14:32:40 -07:00
Raphael Sofaer
9765bdc391 Don't get posts for a hovercard request 2011-07-06 14:11:07 -07:00
danielgrippi
fd015129c4 final touchups to hovercard 2011-07-06 13:51:19 -07:00
danielgrippi
d51e9431a6 fixed some styling/positioning. don't display a hovercard for the current user's person links 2011-07-06 12:45:16 -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
Daniel Grippi
0cd3878bb8 Merge pull request #670 from galaxor/1137-bad_rsa_keys 
1137 bad rsa keys
 2011-07-06 10:00:44 -07:00
MrZYX
8c1c546bdf fixed #884 2011-07-06 15:38:54 +02: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
Raphael Sofaer
2a9fc776e6 Downcase tag name in tagscontroller 2011-07-05 18:03:46 -07:00
Raphael Sofaer
efd6275e68 Don't instantiate objects in tag_string 2011-07-05 17:56:38 -07:00
Raphael Sofaer
0ac28cd9ea Pending spec for 500 on capital letters 2011-07-05 17:31:49 -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
0ab961e096 tags controller fixed 2011-07-05 15:03:26 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
2d8b5bd54c refactored the controller, moved flash message into translations 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
d15673c3de changed the variable name 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
f5e3c4c0d7 fixed the specs. 2011-07-05 11:29:45 -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
Ryan Hughes
00589c10c6 If one user has a bad rsa key, don't abort all sends. 2011-07-04 18:00:55 -07:00
danielgrippi
d75a682199 compress png 2011-07-04 17:26:34 -07:00
danielgrippi
9debec4410 fix the build. 2011-07-04 16:53:43 -07:00
danielgrippi
00448f615e dont try to preload photos as they are only for StatusMessages. ugh. 2011-07-04 16:38:28 -07:00
danielgrippi
85d6eb70e7 fix cubbies info page (removed reference to token, changed infographic) 2011-07-04 16:14:05 -07:00
danielgrippi
9eac29d15e preload people and their profiles in comments on aspects/index 2011-07-04 16:14:04 -07:00
Maxwell Salzberg
b645a77be9 translate a string in services#index view 2011-07-04 13:59:44 -07:00
Maxwell Salzberg
408690f0fa remove stray puts 2011-07-04 13:57:23 -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
Michael Sofaer
d2b7168195 Use an explicit per_page param instead of switching on format 2011-07-03 21:16:58 -07:00
danielgrippi
511a651377 don't query for mentioned people if mention syntax isn't present in message text. 2011-07-03 20:36:46 -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
04e53fa1fc remove unused aspect helper methods 2011-07-03 19:20:50 -07:00
Maxwell Salzberg
73172f9c22 remove completely unused method #yay 2011-07-03 18:04:00 -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
a104f4e309 if a user is logged in, redirect them to the proper authenticated view, not the public route 2011-07-03 09:13:39 -07:00
Maxwell Salzberg
4b0157f5b0 fix notification mark all as read ui bug 2011-07-03 08:20:24 -07:00
Maxwell Salzberg
6f72a0cb38 order facebook friends 2011-07-02 19:01:58 -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
Dan Hansen
eb0fbe519c remove read/unread state, always mark notifications as read, only return 5 notifications for json requests 2011-07-02 16:39: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
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
Raphael Sofaer
86c06c4d15 Try taking out some contact loading again 2011-07-02 14:43:15 -07:00
Raphael Sofaer
6b46d69b65 Revert "Take off the including of contacts in aspectscontroller. Cross your fingers for a performance boost." 
This reverts commit 7baeaebe57.
 2011-07-02 14:38:17 -07:00
Raphael Sofaer
7baeaebe57 Take off the including of contacts in aspectscontroller. Cross your fingers for a performance boost. 2011-07-02 12:39:25 -07:00
Maxwell Salzberg
2d9d9bd1a1 Revert "Revert "remove perform delegate: use a gem that unobtrusivly does the same"" 
This reverts commit 696779d589.
 2011-07-02 12:05:26 -07:00
Maxwell Salzberg
696779d589 Revert "remove perform delegate: use a gem that unobtrusivly does the same" 
the connection adapter messes with single process mode...
This reverts commit dd752d7dd9.
 2011-07-02 12:01:31 -07:00
Maxwell Salzberg
dd752d7dd9 remove perform delegate: use a gem that unobtrusivly does the same 
thing. use built in resque inline method for single process mode
 2011-07-02 11:57:10 -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
MrZYX
05907246e9 use an array of arrays instead of a hash to ensure order, thanks REE! 2011-06-30 23:40:41 +02:00
danielgrippi
4e48db23f0 aspect dropdown shows name of aspect if contact is only in one; green 2011-06-30 12:18:41 -07:00
Robin Wellner
91dd4f847a Adds support for converting <-> to ↔ in markdownify 2011-06-30 14:27:39 +02:00
danielgrippi
3a5f0c9678 proper uniqueness validation in auth model 2011-06-29 17:32:55 -07:00
danielgrippi
38ddb4b744 correctly scoping the uniqueness validation dg iz 2011-06-29 17:24:05 -07:00
danielgrippi
55efe132c5 corrected authorizations_controller_spec to assert on response codes 2011-06-29 17:10:43 -07:00
danielgrippi
144ac82577 only allow https and www.cubbi.es in authorizations controller for now 2011-06-29 16:40:43 -07:00
Raphael Sofaer
d1a149f9f6 Some stuff to not need an application.yml in CI 2011-06-29 11:52:13 -07:00
Raphael Sofaer
5243a3203f Fix AS::Photo show page 2011-06-29 11:33:32 -07:00
Raphael Sofaer
f2e3102562 Make the aspect_dropdown_list_item easier to read 2011-06-29 11:21:44 -07:00
Raphael Sofaer
1ced4c502d Put as_json back in person 2011-06-29 08:48:34 -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
Michael Sofaer & Raphael Sofaer
d355e230b1 all aspects helper 2011-06-27 19:51:35 -07:00
Dennis Collinson & Michael Sofaer
839756573d set post correctly 2011-06-27 19:51:35 -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
8f5358e68f Move some DB logic from helper to controller 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
89ca5cf337 DG DH; fix the build 2011-06-27 19:26:03 -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
b14271342a Give more information in error message 2011-06-27 17:09:05 -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
Raphael Sofaer
17917528f6 IZ, RS, Move AS::Photo controller spec into integration so that rack middleware is run. Make auth failure return 401 rather than 302. 2011-06-27 12:31:47 -07:00
danielgrippi
a2609f7dac simple filter on contacts index page (my/all contacts) 2011-06-27 12:12:50 -07:00
Raphael Sofaer
c7b4e2b4f4 Merge remote branch 'drummondj/1049-unconfimed-tags' 2011-06-26 23:24:03 -07:00
Raphael Sofaer
b2f7ff5dd4 Fix notifications. 2011-06-26 21:59:04 -07:00
Raphael Sofaer
e468075ffd Doc AS::Photo 2011-06-26 20:59:02 -07:00
Raphael Sofaer
d002c14aab Initial implementation of allowing cross-origin requests in the webfinger flow, so that the unhosted guys can use Diaspora. May not work with caches-page on host-meta. We'll have to use X-Accel-Redirect or something. 2011-06-26 20:29:39 -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
b9c2d3758b What is this? 2011-06-26 20:09:21 -07:00
John Drummond
cc6f82fbc1 Added test for new plantext tag without a # symbol and fixed broken code. 2011-06-25 23:37:51 -07:00
John Drummond
f7abaab276 Issue 1049 fixed by pre-processing params[:profile][:tags_string] and adding # when required 2011-06-25 23:19:30 -07:00
Raphael Sofaer
4fef3b7172 Docs because I forgot what StatusMessagesController#new is 2011-06-25 16:17:38 -07:00
Raphael Sofaer
b3556870d3 Merge remote branch 'yithian/1049-allow-plaintext-tags' 2011-06-25 11:23:55 -07:00
danielgrippi
54ef22b83e lol, just needed to remove 'http://' in the specs to get the controllers passing again 2011-06-24 18:38:30 -07:00
Raphael Sofaer
5884a900a2 Get rid of manage 2011-06-24 16:55:40 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
f9b09d32f8 cucumber is passing rspec is red 2011-06-24 12:02:15 -07:00
danielgrippi
0b5de2aa7a WIP getting rid of app_url in params 2011-06-24 11:22:44 -07:00
Raphael Sofaer
c01641b619 Avoid words in person_image_tag 2011-06-24 11:09:10 -07:00
Raphael Sofaer
2857de5f1b doc a user method 2011-06-24 10:38:06 -07:00
Raphael Sofaer
18138e1507 Doc 2011-06-24 10:38:06 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
d186246db0 added temporary special casing on app_url in authorizations controller 2011-06-23 19:13:26 -07:00
danielgrippi
15571ecff0 render ASPhoto show page just like status message show for now 2011-06-23 15:47:59 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
d46f3a8d1f fixed every spec but the activity stream photos controller spec 2011-06-23 15:22:36 -07:00
danielgrippi
74a7c3ab00 collapsed oauth2 migrations; made app factory 2011-06-23 14:49:19 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
052adc3213 Fix authorizations controller and app_config specs, require 2048 bit keys. We're now using config/application.yml.example in the test env. 2011-06-23 14:20:53 -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
Alex Chvatal
7a56322b60 Adds ability to parse plain-text tags 
Tags that haven't been autocompleted and clicked on will be
added as tags as well. There should only be one tag like this
at a time, since adding a space between tags turns it into
a list item.
 2011-06-23 12:23:16 -04:00
Dis McCarthy
d56cac1639 List diaspora id on profile pics, courtesy diasporg 2011-06-23 09:08:07 -04:00
Raphael Sofaer
40560680fe Title on sessions#new 2011-06-22 18:57:02 -07:00
danielgrippi
13810336d3 load monkeypatched models in authorizations controller 2011-06-22 18:32:24 -07:00
danielgrippi
5917f0d695 added JWT verification support to diaspora 2011-06-22 16:15:03 -07:00
Raphael Sofaer
a987b198fd Fix search in PG 2011-06-22 15:09:00 -07:00
Raphael Sofaer
e8552fc417 Fix direct query execution issues in PG by using select_values/select_rows instead of execute. 2011-06-22 14:47:59 -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
Ilya Zhitomirskiy
c09fb776fb added a couple of validations on the Oauth models, added an index on a user's authorizations 2011-06-20 18:30:18 -07:00
danielgrippi
890dc7efd5 put some dependent destroys on models for better sqlite compatability 2011-06-19 23:39:57 +02:00
Raphael Sofaer
2d3eeb9c46 Get another couple specs green on pg 2011-06-19 16:16:31 +02:00
Raphael Sofaer
f0cb2159c7 Make contacts appear at the beginning of search results in postgreSQL 2011-06-19 16:16:30 +02:00
Maxwell Salzberg
1f11e51a9b add object_aspect_ids to status_message controller 2011-06-16 15:59:03 -07: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
75a1012c1c moved the monkey patching to a model, need to do a couple of validations 2011-06-15 18:30:05 -07:00
Ilya Zhitomirskiy
b3cee70ead if the request is bad give it as a response 2011-06-15 17:51:29 -07:00
Ilya Zhitomirskiy
78253b6885 resetting the token instead if the app already exists, should move the lookup to be homepage url 2011-06-15 16:36:35 -07:00
Ilya Zhitomirskiy
ec9932e491 green on all the cucumbers WOOT 2011-06-14 18:30:43 -07:00
Raphael Sofaer
cba63030c9 Use rescue_from in CommentsController 2011-06-14 18:06:13 -07:00
Ilya Zhitomirskiy
dca2eca67c cucumber specs are green 2011-06-14 15:36:05 -07:00
Raphael Sofaer
800e701f89 Document User#accept_invitation 2011-06-14 10:27:29 -07:00
Raphael Sofaer
305c107ba1 Take loop out of remove_mentions 2011-06-14 10:17:22 -07:00
Raphael Sofaer
10f5d658b2 Document liked? and like_for 2011-06-14 10:15:32 -07:00
Ilya Zhitomirskiy
2a4932ea34 WIP verifying sig in the pre-registration endpoint 2011-06-13 22:57:56 -07:00
danielgrippi
b446404348 Revert "Without loaded? I was confused by the liked? and like_for methods." 
This reverts commit 2103d54fe4.
 2011-06-13 22:56:36 -07:00
Raphael Sofaer
2103d54fe4 Without loaded? I was confused by the liked? and like_for methods. 2011-06-13 17:14:00 -07:00