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

1256 commits

Author SHA1 Message Date
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
danielgrippi
d34774f4e5 png favicon 2011-05-09 16:24:24 -07:00
danielgrippi
29c3f7f1d4 make cursor a question mark on welcome page info text 2011-05-09 15:55:24 -07:00
danielgrippi
645d685c58 Merge branch 'welcome-page' 2011-05-09 15:45:05 -07:00
danielgrippi
cfa9e6cf29 some polish on the welcome page 2011-05-09 15:39:44 -07:00
danielgrippi
68601e392e halfway to a better welcome/getting started page. wip. 2011-05-08 22:15:26 -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
Dan Hansen
535954dcc2 make incrementing the notification count optional 2011-05-07 07:28:52 -05:00
Maxwell Salzberg
7a2f6dae10 fixed js error on new comments on statusmessage show page 2011-05-06 15:29:39 -07:00
Maxwell Salzberg
d0381b913d remove the hidden rule for the status message show page submit button. thx dangoldenberg for debugging 2011-05-06 13:30:43 -07:00
MrZYX
3d1c208fc2 added a bit space to checkbox labels, thanks 21echoes 2011-05-05 21:38:43 +02: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
MrZYX
f6e4be35a1 white-space: nowrap; for buttons 2011-05-04 17:53:22 +02:00
MrZYX
1dcb0e4863 fixed #1038 2011-05-04 16:22:24 +02:00
Raphael Sofaer
abde3244b5 InfiniteScroll#options doesn't need to be a function 2011-05-03 14:54:49 -07:00
danielgrippi
77372b2f08 update robots.txt to only exclude /people/ 2011-05-03 10:32:50 -07:00
Raphael Sofaer
94bc18e467 Make websocket closed message less disruptive 2011-05-02 17:12:18 -07:00
Raphael Sofaer
83a3655bfe Don't infinitescroll undefined 2011-05-02 15:28:42 -07:00
Raphael Sofaer
2abb592833 Destroy old infinite scrollers to keep event bindings from piling up 2011-05-02 14:08:41 -07:00
Raphael Sofaer
bc8b6097bc Update infinite scroll plugin for $.fn.infinitescroll.destroy 2011-05-02 14:08:41 -07:00
Raphael Sofaer
38e44b13aa Test and fix pagination on profile, tag and aspect streams 2011-04-30 10:26:16 -07:00
Sarah Mei
09ac4c789e Remove debugging statements 2011-04-29 21:00:39 -07:00
MrZYX
6623dbb1f1 fixed #1039 2011-04-29 23:38:10 +02:00
Dan Hansen
c1366e0e04 Make photos display inline on StatusMessage#show 2011-04-27 17:06:26 -05:00
Dan Hansen
d28a2cdb1e Show the user that the websocket connection has been closed and posts will no longer socket in 2011-04-27 16:50:23 -05:00
Dan Hansen
78585f5a65 Add license to specs and notifications.js 2011-04-27 16:34:30 -05:00
Dan Hansen
6a9df590d0 add show more functionality to notifications. don't scroll to the top of the page when clicked 2011-04-27 16:29:08 -05:00
Dan Hansen
4a101f25d9 Notifications.js refactor, add specs 2011-04-27 16:22:56 -05:00
Dan Hansen
49183f8f3d Have the context of infinitescroll.initialize be infinitescroll 2011-04-26 21:39:13 -05:00
Dan Hansen
e8a1ca70e3 WidgetCollection#subscribe now accepts a parameter that will be the context of the callback 2011-04-26 21:37:19 -05:00
Raphael Sofaer
948725b946 Fix infinite scroll after changing aspects 2011-04-26 18:26:12 -07:00
Raphael Sofaer
2517653d34 Red feature for infinite scroll after changing aspects 2011-04-26 17:28:42 -07:00
Raphael Sofaer
24ea518b6f Fix some JS bugs, delegate doesn't work if you remove the element 2011-04-25 16:15:33 -07:00
Raphael Sofaer
9940f19962 Test and fix embedder after changing aspects 2011-04-25 12:24:38 -07:00
MrZYX
a09150e4e0 fixed #1023; display close icon on diaspora alert faceboxes 2011-04-24 15:40:30 +02:00
Dan Hansen
3d11b402e0 Infinite scroll is now a widget, remove InfiniteScroll#postScroll, use DiasporaJS pub/sub instead, remove timeago.js hacks 2011-04-22 20:33:21 -05:00
Dan Hansen
d28e7e70b8 use typeof operand instead of object#hasOwnProperty 2011-04-22 20:02:54 -05:00
Raphael Sofaer
830cbf0876 I'm blaming that one on the vicodin 2011-04-21 15:13:17 -07:00
Raphael Sofaer
bad0d9f4ea Merge branch 'master' of github.com:diaspora/diaspora 
Conflicts:
	public/javascripts/keycodes.js
 2011-04-21 12:49:49 -07:00
Raphael Sofaer
804b6cc490 Clean up some JS 2011-04-21 12:48:31 -07:00
MrZYX
45d621a9e6 fixed embedder the hacky way (?) and added cucumber feature for youtube feature so you'll notice if you breakt it again the next time 2011-04-21 15:42:28 +02:00
MrZYX
89c3e30663 apply suggested fix in/for #1026 2011-04-21 13:31:30 +02: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
14bfdbd4a9 hack to fix the timeago for other languages. ohaibbq can you find why this broke in the first place? 2011-04-18 18:11:03 -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
9df8f83276 fixed specs for me and serveral others (thanks @jrichardlai); fixed cucumber 2011-04-17 21:28:09 +02: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
Dan Hansen
7216c8d5cb DRY up timeago.js, add license to i18n.js & timeago.js 2011-04-15 23:37:17 -05:00
Dan Hansen
7ed21930b4 make infscroll, publisher, stream use pub/sub to listen for the stream being reloaded, random cleanups and fix aspect-filters.js spec 2011-04-15 18:49:31 -05:00
Dan Hansen
296824c92b add basic pub/sub functionality to WidgetCollection 2011-04-15 18:29:48 -05:00
Dan Hansen
c0cd8fafff make a widget's start method optional 2011-04-15 18:14:38 -05:00
Dan Hansen
0b85600e0a diaspora.js cleanup; don't pollute global namespace in spec 2011-04-15 17:31:19 -05:00
danielgrippi
a16e83df9e touched up notifications page 2011-04-15 10:42:21 -07:00
MrZYX
b25e634be1 fixed #1011 2011-04-15 16:18:59 +02: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
9969dbd109 Start refactoring aspect-filters.js 2011-04-13 15:55:10 -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
d5ecce7ca6 Merge branch 'limit_similar_contacts' 
Conflicts:
	app/controllers/people_controller.rb
 2011-04-12 11:48:41 -07:00
Dan Hansen
425fee0653 fix #839 2011-04-12 12:00:33 -05: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
MrZYX
93be252b59 Merge branch 'css-rtl' 
Conflicts:
	public/javascripts/application.js
	public/javascripts/inbox.js
 2011-04-11 21:52:01 +02:00
behrooz shabani (everplays)
69eb27cbe9 moved comments textarea to left so it wont disappear avatar in RTL UI 2011-04-12 00:12:39 +04:30
behrooz shabani (everplays)
60371c8981 swapped horizontal margins on links of #conversation_controls in RTL UI 2011-04-12 00:03:56 +04:30
behrooz shabani (everplays)
426c1b28b6 minor fixes on conversations list & sign up stuff 2011-04-11 23:58:33 +04:30
behrooz shabani (everplays)
22b0fca124 small fixes on settings & notifications pages in RTL UI 2011-04-11 23:13:38 +04:30
behrooz shabani (everplays)
e076f89ccd fixed comment box in RTL UI 2011-04-11 22:56:22 +04:30
behrooz shabani (everplays)
ad34a7f6f7 implemented RTL UI for settings/conversations/notifications 2011-04-11 22:44:55 +04:30
MrZYX
440fd26c14 hopefully finally fix #946 2011-04-11 19:15:14 +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
behrooz shabani (everplays)
cddeafee74 rtl UI for aspects implemented 2011-04-11 00:21:14 +04:30
danielgrippi
1c9ca738ae green everywhere. 2011-04-08 17:10:43 -07:00
Raphael Sofaer
fa59be2353 Another bit of JS cleanup 2011-04-08 16:11:13 -07:00
Raphael Sofaer
0b9575af5d JS cleanup 2011-04-08 16:11:13 -07:00
MrZYX
f194166841 moar garbage for you aka fixed #1005 2011-04-08 17:46:45 +02:00
MrZYX
75629018db you want the id in aspect_memberships#destroy to be garbage? There you go… (btw. fixed #1006) 2011-04-08 17:40:59 +02:00
Raphael Sofaer
c7dc6ce817 Fix jasmine specs 2011-04-07 18:30:29 -07:00
Raphael Sofaer
d23ac3468b rename widgetCollection#ready to widgetCollection#initialized 2011-04-07 18:23:24 -07:00
Raphael Sofaer
ea932c8706 Fix infieldLabels in infiniteScrolled comment forms. We were initing every widget twice? 2011-04-07 18:21:28 -07:00
Raphael Sofaer
75d514c448 Fix infieldLabels on new aspect box 2011-04-07 17:53:07 -07:00
Raphael Sofaer
d8ac8d1329 Fix infinite scroll javascript in jammed js 2011-04-07 15:22:03 -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
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
95de299e6e fixed #953 2011-04-06 14:18:33 +02: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
Raphael Sofaer
59334dfaf5 Remove extra js, fix mobile view 2011-04-05 16:18:04 -07:00
Raphael Sofaer
746a0c38b3 Take another shot at fixing pagination 2011-04-05 13:59:15 -07:00
danielgrippi
590e1fd93f All green except invite connecting +2 misc. 2011-04-04 15:16:19 -07:00
MrZYX
100d705c2f fixed #992 2011-04-03 14:57:30 +02:00
MrZYX
92bf8444a7 added spec; rtl? -> direction_for 2011-04-03 04:20:08 +02:00
MrZYX
a7a8da2f75 added detection of rtl languages on every user based input 2011-04-03 02:14:35 +02:00
MrZYX
e4db8c7a36 fixed #589, no CSS! 2011-04-03 02:10:41 +02:00
maxwell
f3a62bf76b update jquery to latest 2011-04-02 15:03:41 -07:00
MrZYX
2ba1198b90 fixed embedder (again) 2011-04-02 17:19:56 +02:00
danielgrippi
bdff036cda remove spacing from stream elements 2011-04-01 11:26:04 -07:00
danielgrippi
8b8ea03582 high res logo on mobile site 2011-04-01 11:12:41 -07:00
maxwell
4bd0cbfdc8 publisher now can handle services, and is on seperate page 2011-04-01 01:18:01 -07:00
maxwell
569fb66e9e bunch of small mobile ui fixes 2011-03-31 23:38:38 -07:00
maxwell
bb59df46f9 updating jquery mobile, fix the menu page a bit 2011-03-31 18:19:51 -07:00
zhitomirskiyi
f99b724e0b ms iz, can now undo hiding a post, fixed a bunch of jamine specs 2011-03-31 17:23:54 -07:00
danielgrippi
ed202b61d3 scroll to top before content loads for smoother feedback 2011-03-31 01:56:06 -07:00
danielgrippi
b22b13d73f Revert "popstate now in aspect-filters. back button now actually works on aspect/index." 
This reverts commit 326155af54.
 2011-03-31 01:30:02 -07:00
danielgrippi
d1c3326867 Revert "fix wacky aspect filtering bug (tabs being selected seemingly at random" 
This reverts commit 14f14d005b.
 2011-03-31 01:29:48 -07:00
zhitomirskiyi
bb4c2ee85d added a character count to the publisher 2011-03-30 19:11:24 -07:00
danielgrippi
14f14d005b fix wacky aspect filtering bug (tabs being selected seemingly at random 2011-03-30 18:26:56 -07:00
danielgrippi
326155af54 popstate now in aspect-filters. back button now actually works on aspect/index. 2011-03-30 17:39:08 -07:00
zhitomirskiyi
5a9ec82597 can now hide posts 2011-03-30 16:43:28 -07:00
danielgrippi
5fa2a7a6f3 use popState in message inbox 2011-03-30 16:22:25 -07:00
danielgrippi
0c15e74420 remove extra right padding on stream elements 2011-03-30 14:53:33 -07:00
Raphael Sofaer
4b795cc719 Stop bad call to users/update 2011-03-30 13:16:26 -07:00
zhitomirskiyi
cd7cced9c0 renamed the js to indicate custom 2011-03-29 17:25:35 -07:00
zhitomirskiyi
0aaaefeba2 fix tag plugin 2011-03-29 16:53:48 -07:00
zhitomirskiyi
ba15ea940b autosuggest on tags now works, bumped up the version of the autocomplete plugin 2011-03-29 15:03:09 -07:00
MrZYX
68b2e47b87 go away robots, we don't want you\! 2011-03-29 20:34:20 +02:00
maxwell
8b7dc0a2cc translated bookmarklet, added post to main page 2011-03-28 19:57:06 -07:00
Ritchie Wilson
a1b07d84e1 Next and Previous arrows for mobile photos 2011-03-28 16:04:29 -04:00
MrZYX
315fdabd76 let the user upload an image without touching the textarea, improved check in Photo#process to not yield no method on nil error in some cases 2011-03-27 21:08:30 +02:00
MrZYX
55417cf9e3 AspectsController#move_contact -> AspectMembershipsController#update 2011-03-27 13:29:36 +02:00
MrZYX
b689d4695b refactor of routes.rb done so far; further refactor needs design decisions 2011-03-27 00:05:35 +01:00
Raphael Sofaer
aed190dc6d cucumber for comment retractions, modified views 2011-03-25 16:26:03 -07:00
maxwell
310f529914 dumb api console 2011-03-25 15:06:22 -07:00
MrZYX
56a6f0e43b cleaned up craziness in users and likes routing, fixed #961 2011-03-24 03:02:14 +01:00
danielgrippi
33c013633f fix cucumber, comments 2011-03-23 18:22:43 -07:00
danielgrippi
2a1914a8f2 fixed comment socket bug on posts where there are no new comment areas 2011-03-23 17:55:18 -07:00
danielgrippi
b6d5165f2d scroll to post on page if you can see it (via notification popup) 2011-03-23 17:16:30 -07:00
Raphael Sofaer
555a774668 Initial contacts_of_contact page 2011-03-23 16:42:53 -07:00
danielgrippi
363c5f4dae fix gradient direction on add/remove buttons 2011-03-23 12:42:07 -07:00
danielgrippi
e4e8d7ada4 fixed aspect selector bug in header 2011-03-23 11:59:09 -07:00
danielgrippi
2b8b824230 fixed private mention popup in firefox 2011-03-22 17:25:32 -07:00
danielgrippi
a44ca157e6 added text to private message notification; user picture in popup 2011-03-22 17:14:37 -07:00
Sarah Mei
631163ec02 "Add contact" buttons on tag page are smaller and don't appear on top of names. 
Moved some logic from view into user model.
 2011-03-22 13:16:58 -07:00
danielgrippi
cc01beb3d0 cross-browser opacity mixin 2011-03-22 12:40:44 -07:00
danielgrippi
48598a9942 added linear-gradient mixin. 2011-03-22 12:35:03 -07:00
danielgrippi
557b5393c2 fix sass error 2011-03-22 12:14:50 -07:00
danielgrippi
cb533c8675 added box-shadow and border-radius mixins. changed _mixins.sass to _mixins.scss 2011-03-22 12:02:54 -07:00
maxwell
5570182e69 use autoresize extraSpace to kill the bug where the comment box is not big engough for the comment, still could use some love 2011-03-22 11:59:10 -07:00
maxwell
35bc86f6a6 dont auto embedd images, untill we think of something better to do 2011-03-22 10:55:41 -07:00