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

668 commits

Author SHA1 Message Date
Raphael Sofaer
5884a900a2 Get rid of manage 2011-06-24 16:55:40 -07:00
Raphael Sofaer
02739259b6 Don't hide the forgot password link 2011-06-22 13:19:54 -07:00
Maxwell Salzberg
de55a1cbb3 remove remember aspects feature 2011-06-03 17:35:27 -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
Dan Hansen
0f0c033c26 MS DH; add context to timeago events 2011-06-02 16:32:41 -05:00
Dan Hansen
7363bf3499 MS DH; update timeago if a timeago element on the page exists. 2011-06-02 12:09:06 -05:00
Raphael Sofaer
0770d6e8fd Most of the stream.js stuff needs to be live, unfortunately. 2011-05-31 16:00:57 -07:00
Raphael Sofaer
62977e1d15 Don't initialize the stream if there is no stream. 2011-05-31 15:18:59 -07:00
Raphael Sofaer
203e05bf3a Remove console.logs 2011-05-31 14:32:07 -07:00
Dan Hansen
0edc160007 Clean up stream.js, make the comments step selector more sane 2011-05-31 15:52:17 -05:00
Raphael Sofaer
cfd077a90d Fix the thing that I broke in the build, fix syntax error in the build that disabled stream-spec 2011-05-28 20:37:12 -07:00
Raphael Sofaer
503de3efe1 Fix facebox close button and loading gif 2011-05-28 18:18:22 -07:00
MrZYX
406622eeed prevent timing issue when autosuggest is too slow 2011-05-25 13:32:11 +02:00
Maxwell Salzberg
4c535f3eb4 hackity hack to fix notifciation page decrementing 2011-05-24 20:41:28 -07:00
MrZYX
d6e9e9cca5 fixed comment count update on comment posting 2011-05-24 21:03:24 +02:00
Maxwell Salzberg
ff1168a6ba comment out the websocket notice. it was my idea to put it there, and it was a bad idea 2011-05-23 11:55:44 -07:00
MrZYX
331aa1ff60 you know the facepalm smiley? Here it is: m( 2011-05-19 20:10:35 +02:00
MrZYX
a3c287ca9a fixed #1023 (again) 2011-05-18 14:26:08 +02:00
MrZYX
66380fd33f fixed some translations 2011-05-18 13:55:50 +02:00
Raphael Sofaer
c942f76d29 Turn off user collapse and turn up status messages to over 9000 2011-05-17 18:14:35 -07:00
Raphael Sofaer
f409ace067 Merge remote branch 'evant/354-long-post' into evant_log_post_merge 
Conflicts:
	config/assets.yml
 2011-05-17 18:02:36 -07:00
Raphael Sofaer
2953cc8497 Move infinite scroll out of vendor, because it has been edited 2011-05-17 15:06:21 -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
8d7b0b2c4c take out animations in inf scroll. 2011-05-16 16:55:24 -07: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
666fb76bfc login as its own js file. accounted for the autofil state 2011-05-13 22:27:08 -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
a9a1280e17 one cuke failing. wip 2011-05-12 20:41:56 -07:00
Evan Tatarka
5f406b18d5 Updated code to work with lastest master. Tests should now pass. 2011-05-12 20:38:05 -04: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
47cf614996 sneaky fixed header 2011-05-11 18:53:59 -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
danielgrippi
c67d143719 dropdown in ContactsController#sharing now works 2011-05-11 15:47:13 -07:00
danielgrippi
9f3044838d Views for contactscontroller#sharing almost done, cuke for editing aspect memberships started 2011-05-11 14:53:43 -07:00
danielgrippi
dfeb4f3a13 use .js response convention for remote likeke behavior 2011-05-11 11:08:30 -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
Raphael Sofaer
9d2849d851 Move publisher ajax stuff into publisher.js 2011-05-08 20:40:35 -07:00
Raphael Sofaer
ffd96d989c Update publisher callback to use ContentUpdater 2011-05-08 20:31:13 -07:00
Sarah Mei
a904204f46 Content updater refactor complete for posts 2011-05-08 14:22:40 -07:00
Dan Hansen
50e67524c1 content update wip 2011-05-08 15:18:02 -05:00
Dan Hansen
fc25c9bedb Flash message handling is now a widget 2011-05-08 10:53:09 -05:00