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

3821 commits

Author SHA1 Message Date
Raphael Sofaer
cc84051541 Fall back to author if the diaspora_handle isn't set, that column just needs to be removed 2011-05-23 14:54:27 -07:00
Raphael Sofaer
d22878f3f0 Fix AS::Photo federation, hopefully 2011-05-23 13:56:42 -07:00
MrZYX
c732940b58 match trailing slash for vimeo links 2011-05-23 14:32:16 +02:00
danielgrippi
8e3149ca01 better page explaining cubbi.es and why we're promoting it on diaspora 2011-05-23 01:14:33 -07:00
Maxwell Salzberg
d776105558 grammer nazi cleanup of notification_people_link and refactor + tests 2011-05-22 17:18:44 -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
Maxwell Salzberg
59ae829254 there is a dumb bug where likes are targeting themselves 2011-05-22 15:02:01 -07:00
Maxwell Salzberg
77fc40d404 add application helper to notification helper spec, made the link an object_link rather than status_message_link 2011-05-22 14:59:04 -07:00
Maxwell Salzberg
2f6d079635 added failure test for deleted likes 2011-05-22 14:45:16 -07:00
Maxwell Salzberg
66c28c4caf notification page now has links for likes 2011-05-22 14:35:35 -07:00
Maxwell Salzberg
d4d3b1e44c MSSM like notification are concatinated, and backfilled some like tests 2011-05-22 13:59:33 -07:00
MrZYX
a68031179b prevent inviting yourself, #515 2011-05-22 14:48:07 +02:00
MrZYX
07395fb2c9 added maxlength attribute to aspect name input, fixed #675 2011-05-22 13:50:44 +02:00
danielgrippi
3fb81d37d0 missing closing tag in aspect_dropdown helper 2011-05-21 15:08:19 -07: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
Maxwell Salzberg
1e3971da3d i think we want to not prevent non admins... 2011-05-19 22:22:03 -07:00
Arzumy MD
a060acffeb add spec for admins_controller#add_invites 2011-05-20 10:51:04 +08:00
Arzumy MD
0ee41b3be5 removed user variable from admins_controller#user_search 2011-05-20 09:37:32 +08: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
Raphael Sofaer
ed61c53e09 Wrap UsersController to not 500 when no params are submitted 2011-05-19 17:01:42 -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
925292a7b2 hey, federation works. 2011-05-19 13:20:58 -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
dd31f37fd0 only generate new token if admin 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
danielgrippi
9b941e6520 Bookmark now consumes cubbi.es JSON, cubbi.es things can be saved to Diaspora, but are not displayed. 2011-05-19 11:57:06 -07:00
danielgrippi
be662a65c6 added token authenticatable to user model 2011-05-19 11:57:06 -07:00
MrZYX
331aa1ff60 you know the facepalm smiley? Here it is: m( 2011-05-19 20:10:35 +02:00
Ilya Zhitomirskiy
6cda0bf9ea Revert "added a podwide email preference" 
This reverts commit 60c0a9839b.
 2011-05-18 10:38:45 -07:00
MrZYX
66380fd33f fixed some translations 2011-05-18 13:55:50 +02: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
Raphael Sofaer
0bb349ff08 Merge branch 'evant_log_post_merge' 2011-05-17 18:17:14 -07:00
Raphael Sofaer
c942f76d29 Turn off user collapse and turn up status messages to over 9000 2011-05-17 18:14:35 -07:00
MrZYX
c47c9ef069 fix untranslated string; fix two translations; don't mess routes.rb again 2011-05-18 00:53:48 +02:00
Maxwell Salzberg
e95288e074 notifications by created at date so they stop jumping when you make them read 2011-05-17 14:44:42 -07: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
Raphael Sofaer
5218bd89c6 Revert FakeServiceUser work, needs more testing to make sure extra models aren't instantiated. 
This reverts commit 0a8ce3b9f2.
This reverts commit f9ef9a4b47.
This reverts commit 164226a3d7.
 2011-05-17 10:33:33 -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
Raphael Sofaer
0a8ce3b9f2 Unscope assoc calls from FakeServiceUser, we can delete this once the last default scope has been removed in the follow merge 2011-05-17 10:24:28 -07:00
Raphael Sofaer
f9ef9a4b47 Make FakeServiceUser assoc methods tolerant of nil 2011-05-17 10:14:39 -07:00
Raphael Sofaer
164226a3d7 Replace ServiceUser with fakes in ServicesController 2011-05-16 18:48:03 -07:00
danielgrippi
d70f10b609 made dropdown selectors sexi 2011-05-16 16:29:13 -07:00
Raphael Sofaer
495dd89dd2 Fix password reset, add cucumber feature 2011-05-16 15:54:18 -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
956f0044a9 set @contacts_of_contact_count in photos#index, thanks LPrelle 2011-05-16 16:21:13 +02: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
Sarah Mei
43ab8cfcfa Tell devise that :mobile is a navigational format. 2011-05-14 15:46:56 -07:00
Sarah Mei
fbf486dae6 Users can log in on their phones again. 
Something in devise broke for the :mobile format. More investigation needed; we're having this same issue on log out and incorrect password on mobile (though those pages are at least still usable).
 2011-05-14 14:58:52 -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
danielgrippi
a02b9c01c8 eager loading aspect memberships 2011-05-13 18:22:42 -07:00
danielgrippi
30796de400 switching the order around to utilize eagerloading 2011-05-13 16:58:24 -07:00
danielgrippi
ee49fb3547 no more n-query in the view problem 2011-05-13 16:49:37 -07:00
Raphael Sofaer
a4f81c6410 Finish fixing password changing and keeping emails downcased 2011-05-13 16:32:07 -07:00
Raphael Sofaer
f8b7307441 Downcase emails upon inviting 2011-05-13 16:32:07 -07:00
Raphael Sofaer
5f531f14f1 Don't use rails case_sensitive false, it is very slow. 2011-05-13 16:32:07 -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
Raphael Sofaer
71e77d59b3 Revert to including all helpers everywhere, because the rest of the team prefers it that way 2011-05-12 13:54:55 -07:00
Arzumy MD
efd5c4f500 slimming down application_helper, moved markdown and aspect related methods to individual helpers 2011-05-13 00:51:45 +08:00
MrZYX
8abe28d992 fix 500 on tags#show 2011-05-12 12:32:31 +02:00
MrZYX
9f070593ff check if we can all cleaned_is_rtl? before doing it in direction_for helper 2011-05-12 11:05:32 +02: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
Raphael Sofaer
970190fb7a OMG SO MANY EMAILS, fixed 2011-05-11 16:07:24 -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