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

1203 commits

Author SHA1 Message Date
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