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

1324 commits

Author SHA1 Message Date
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
MrZYX
440fd26c14 hopefully finally fix #946 2011-04-11 19:15:14 +02:00
MrZYX
cf61bb756d added dir attribute to html element; made tipsy gravity dependant on that 2011-04-11 18:00:28 +02:00
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
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
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
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
maxwell
4bd0cbfdc8 publisher now can handle services, and is on seperate page 2011-04-01 01:18:01 -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
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
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
danielgrippi
e4e8d7ada4 fixed aspect selector bug in header 2011-03-23 11:59:09 -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
zhitomirskiyi
aa5bef0c3f calls the job on login does a sync call if the cache friends was not called before, fixed the views 2011-03-21 14:56:50 -07:00
maxwell
970e9bee04 Revert "make image width max out at 100%" 
This reverts commit 32efbeb903.
 2011-03-21 11:40:52 -07:00
Maxwell Salzberg
32efbeb903 make image width max out at 100% 2011-03-21 10:10:03 -07:00
MrZYX
1b1a23aa8f likes/dislikes WIP TODO: better icons, better styling, integration on photo show page 2011-03-20 18:10:58 +01:00
MrZYX
25aadebf46 fixed #946 with a solution that doesn't break the links 2011-03-19 21:50:40 +01:00
MrZYX
6fe4b5bc56 fixed 946 2011-03-19 14:21:06 +01:00
maxwell
2bd15bf3e6 embed images, and make sure they are activated on a new message is posted 2011-03-17 22:03:47 -07:00
maxwell
275098a309 embed images, and make sure they are activated on a new message is posted 2011-03-17 21:48:11 -07:00
zhitomirskiyi
6cc085d64e addded slideToggle 2011-03-17 14:32:07 -07:00
zhitomirskiyi
2b6165d8ea wip 2011-03-17 14:32:07 -07:00
zhitomirskiyi
abbf949fe1 publishing from a person profile page wip 
mentioning a person from their profile page, added js & jasmine, still need to add the mention style, and prevent deselecting the last one

a tiny sass add

publishing from the profile works, need js translation

added the translation

made the hover state consistant

need to fix the cucumber spec

specs are green need to add a button

added the buttion to mention people

moved the publisher to the facebox

fixed the cucumbers for the modal window
 2011-03-16 16:35:30 -07:00
MrZYX
73f852c6c2 fixed video embedding in comments 2011-03-15 17:48:28 +01:00
MrZYX
21d0fcf47a fixed some 500 on mobile site 2011-03-15 17:02:04 +01:00
maxwell
a419ddac11 make sure audio player does not delete sm text 2011-03-14 18:20:03 -07:00
Raphael Sofaer
4b4654a408 Changing message to text, partway done, deleted data conversion 2011-03-14 11:39:31 -07:00
maxwell
d91fda656c Revert "js hack to see bigger version of photo thumbnails in the stream without being abnoxious" 
This reverts commit ab997e2d21.
 2011-03-14 09:51:06 -07:00
MrZYX
e8bb4c2d66 added preload='none' to the audio tag (#928) 2011-03-14 13:07:27 +01:00
maxwell
ab997e2d21 js hack to see bigger version of photo thumbnails in the stream without being abnoxious 2011-03-11 17:16:43 -08:00
Maxwell Salzberg
14033e7b5f ajk ms or is a single pipe 2011-03-11 00:16:17 -08:00
Maxwell Salzberg
e2903a1251 get rid of the period, it might be screwing stuff up 2011-03-11 00:12:48 -08:00
Maxwell Salzberg
189b7fb5ac ajk ms only grab stream links 2011-03-11 00:01:01 -08:00
Maxwell Salzberg
2b38fe820f ajk ms escape period in ogg... also replace the parent so it is not inside an a tag 2011-03-10 23:52:22 -08:00
Maxwell Salzberg
cdab6a1a84 ajk ms add ogg to the audio tag linker 2011-03-10 23:33:20 -08:00
maxwell
5748639c08 sm ms audio tag 2011-03-10 21:33:42 -08:00
Michael Nutt
c7362707b3 fix js error; stream ajax success handler should expect json 2011-03-11 00:31:43 -05:00
Michael Nutt
ead1f80b08 websocket js handler should know about different notification types 2011-03-11 00:31:43 -05:00
Dan Hansen
d448436376 this refers to the dom element, not Embedder 2011-03-10 23:11:06 -06:00
Dan Hansen
d7c7775b6c fallback gracefully, break build if videos can't embed 2011-03-10 18:26:55 -06:00
Raphael Sofaer
0416fa14b2 Just use /users/me to update open aspects 2011-03-10 13:03:45 -08:00
Raphael Sofaer
f2cc51dd0d Take current user id out of avatar 2011-03-09 17:50:46 -08:00
danielgrippi
ee6932a3f7 added title to padlock on aspect edit pane 2011-03-09 12:15:23 -08:00
danielgrippi
d0569fb881 simplified functionality on aspect edit faceboxes 2011-03-09 12:00:49 -08:00
danielgrippi
1f5edb1d92 Merge branch 'private_messages' 
Conflicts:
	app/controllers/status_messages_controller.rb
	app/models/data_point.rb
	app/models/status_message.rb
	db/schema.rb
	lib/fake.rb
	public/stylesheets/sass/application.sass
	spec/models/mention_spec.rb
 2011-03-08 21:23:41 -08:00
danielgrippi
78e30ff459 update unread count in conversation visibility when hitting conversationscontroller#show 2011-03-08 11:43:58 -08:00
danielgrippi
fb5e5cc341 cleaned up new message facebox 2011-03-07 20:14:22 -08:00
danielgrippi
97aff09140 added autocomplete on message 'to' field, minor css tweaks to inbox 2011-03-07 11:22:59 -08:00
Raphael Sofaer
6e7bdf7cad don't change photos while commenting 2011-03-07 10:32:31 -08:00
danielgrippi
5f55dfa1bc private message inbox wip 2011-03-03 17:32:26 -08:00
Michael Nutt
ac2c50b33f denote that fileuploader has been modified 2011-02-28 20:37:41 -05:00
Michael Nutt
208a47162c add onAllComplete event to fileupload.js; hide mention helper during upload 2011-02-27 12:44:56 -05:00
Michael Nutt
b6dc32959c place thumbnails inside status message form and add spacing 2011-02-27 02:04:43 -05:00
Michael Nutt
43e10307a6 fix broken jquery autoresize plugin 2011-02-27 02:03:55 -05:00
zhitomirskiyi
ec93faa2c4 added the post to services icon on every page added a manage icon and moved the RSS link to the public explain 2011-02-24 17:31:54 -08:00
zhitomirskiyi
adfcc59631 can now select individual services to be added 2011-02-24 17:31:54 -08:00
maxwell
e446dcaeb5 make sm_controller show the error in the js 2011-02-22 22:21:48 -08:00
Dan Hansen
801382714a remove jquery 1.4.2, we never use it 2011-02-22 13:59:10 -06:00
MrZYX
166f75d883 I think I fixed #882 2011-02-20 22:10:27 +01:00
zhitomirskiyi
1e6bf9c80e MS IZ the cucumber now passes 2011-02-17 18:05:21 -08:00
maxwell
7ace73b84b iz ms wip fixing contactController destroy 2011-02-17 18:05:21 -08:00
maxwell
8c2e6dd8cb aspect membership refactor complete 2011-02-17 18:05:21 -08:00
maxwell
c6eb5d0340 IZ MS; refactored aspect_membership_controller, moved and updated views accordingly 2011-02-17 18:05:21 -08:00
MrZYX
ba439b9413 Merge branch '559-posting-empty-messages' of https://github.com/grzuy/diaspora into sharebutton 2011-02-15 13:08:59 +01:00
Gonzalo Rodriguez
2b3926c629 Disable share button when whitespaces on status message input. 2011-02-15 09:50:39 -02:00
Dan Hansen
42fd9a19da now sarahmei can watch revolution OS too! will write tests soon 2011-02-14 23:59:03 -06:00
danielvincent
164fe1c1b5 adjust column width, leading, serifs, etc. in stream for better readability. 2011-02-13 15:27:14 -08:00
zhitomirskiyi
9f239789b9 can remote the person from the last aspect from edit contact pane 2011-02-11 12:58:01 -08:00
Raphael Sofaer
c1844c9be2 Merge remote branch 'lfortin/js-formatting' 
Conflicts:
	public/javascripts/web-socket-receiver.js
 2011-02-11 11:31:30 -08:00
Raphael Sofaer
7a6d1d3378 add shadow/transparency to autocompletion. removed a hide()/show() from publisher hide and show functions. 2011-02-10 11:09:14 -08:00
Raphael Sofaer
a307519e94 Put avatar on cmment form all the time, fix socketed comment form 2011-02-10 11:05:12 -08:00
Raphael Sofaer
f1c63939f9 Revert "added sliding animation to stream elements, shadow on autocomplete box." 
This reverts commit dc760f9583.
 2011-02-10 10:36:30 -08:00
danielvincent
dc760f9583 added sliding animation to stream elements, shadow on autocomplete box. 2011-02-09 20:07:25 -08:00
zhitomirskiyi
1da965616b added an option to remove a contact from the last aspect, after a prompt 2011-02-09 17:47:27 -08:00
Raphael Sofaer
bd38d1436e Today we learned about the order of operations 2011-02-09 16:07:25 -08:00
Raphael Sofaer
c11ffe93c0 Actually close the publisher on and with Publisher.close() 2011-02-09 16:07:25 -08:00
Raphael Sofaer
99f84de368 Javascript for mentions is functional 2011-02-09 16:07:24 -08:00
Raphael Sofaer
70c61270dc Fix up and down arrows 2011-02-09 16:07:24 -08:00
Raphael Sofaer
0ec2d918bb adding keycodes file, moving keyup stuff to keydown 2011-02-09 16:07:24 -08:00
danielvincent
2b25823253 autocomplete wip. separated keyup and keydown. wip. 2011-02-09 16:07:24 -08:00
danielvincent
6eafd73d2c publisher does inline mentions and sets the cursor to the end of the newly inserted result 2011-02-09 16:07:24 -08:00
danielvincent
3efc31c68f mention js working minus tracking keypresses with the hidden message field. 2011-02-09 16:07:24 -08:00
danielvincent
7d21f7bfdd publisher autocomplete correctly adds name into status_message_fake textarea 2011-02-09 16:07:24 -08:00
danielvincent
77403596aa mentions in publisher autocomplete within context 2011-02-09 16:07:24 -08:00
Raphael Jedidiah Sofaer
150f676332 Do a bunch of work on publisher autocompletion JS 2011-02-09 16:07:23 -08:00
zhitomirskiyi
df4ebb286d accept invitation feature passing 
wip, added a form to add aspect to the contact list

added files

typo

render the partial

remote friend

specifying the provider for the route

refactored local person person friend finder functionality to use the partial

typo

trying to use the stream
 2011-02-08 16:40:28 -08:00
zhitomirskiyi
7241177421 translating the warning about removing the person from the last aspect 2011-02-08 15:44:12 -08:00
danielvincent
bf20e5a9e8 remove some js assets from mobile 2011-02-06 23:09:04 -08:00
danielvincent
42993de739 added back to comments; avatar. 2011-02-06 09:26:24 -08:00
zhitomirskiyi
59f0dca7c7 Revert "publisher is now a hot widget" 
This reverts commit 8039ab312a.
 2011-02-05 15:24:20 -08:00
Dan Hansen
8039ab312a publisher is now a hot widget 2011-02-05 16:47:43 -06:00
Dan Hansen
d533f46cd7 update widget regardless of scroll count 2011-02-04 15:21:42 -06:00
maxwell
ce010c24ec update jquery mobile to a3 2011-02-03 20:41:38 -08:00
maxwell
35bc4e3aad attempt to rebind infield labels on comment form 2011-02-03 18:43:56 -08:00
Dan Hansen
22c1743886 only use more button have inf scroll happens 3 times 2011-02-03 20:38:49 -06:00
danielvincent
8269e4b300 touched up photo show and status message show pages 2011-02-03 13:05:25 -08:00
Raphael
cd8d9989cf Refactor publisher JS, use hidden field for submitting 2011-02-02 14:27:14 -08:00
Raphael
3fb6b0e072 Fix saved state cucumber feature 2011-02-02 11:52:56 -08:00
maxwell
d040380e57 fix data conversion spec, ILYA 2011-02-01 22:27:07 -08:00
maxwell
d4f99ca080 move search init to search.js, because mobile does not have search to init 2011-02-01 22:13:52 -08:00
zhitomirskiyi
21e3c2ae73 Merge branch 'open-aspects' 
Conflicts:
	app/controllers/aspects_controller.rb
	app/controllers/home_controller.rb
	app/helpers/application_helper.rb
	db/migrate/20110201013408_add_open_aspects_to_user.rb
	spec/controllers/aspects_controller_spec.rb
	spec/controllers/home_controller_spec.rb
 2011-02-01 17:32:08 -08:00
zhitomirskiyi
7f026e8271 now updating the open aspects in js 2011-02-01 16:58:33 -08:00
Raphael
06a6cf7fac Adjust autocomplete options and css 2011-02-01 15:07:03 -08:00
Raphael
bbe47fbb55 Correct limit on search autocomplete 2011-02-01 14:35:14 -08:00
MrZYX
15329af94d made "Search for" translatable 2011-02-01 21:55:28 +01:00
Raphael
7d18e2bcd8 Finish autocomplete 2011-02-01 11:56:56 -08:00
Raphael
7be232e33e autocomplete wip 2011-02-01 11:56:56 -08:00
Raphael
9080649180 Starting work on an autocomplete feature 2011-02-01 11:56:56 -08:00
MrZYX
d8f5607509 updated locales 2011-02-01 16:56:29 +01:00
Dan Hansen
cdb5cf37e7 show publisher if it was closed when you select another aspect 2011-02-01 00:40:11 -06:00
Dan Hansen
2e03c7f9f6 forgot to remove these files from my previous commit 2011-01-31 15:23:04 -06:00
Dan Hansen
3746d296b0 fix dom traversing for embedder 2011-01-31 15:15:30 -06:00
Dan Hansen
0c94660806 Merge branch 'master' of github.com:diaspora/diaspora 2011-01-30 11:43:31 -06:00
Dan Hansen
313f87ebb9 make the ajax loader appear in a box 2011-01-30 11:43:17 -06:00
maxwell
6dffdd8152 don't remove these methods 2011-01-29 18:58:34 -08:00
maxwell
348ae0b61d small hack to add some feedback when links are tapped on the mobile site. 2011-01-29 18:42:50 -08:00
Dan Hansen
7417dc5923 remove debugging statement, fix youtube phrasing 2011-01-29 16:41:28 -06:00
Dan Hansen
099e0a6e24 i18n is the first widget to be loaded, add video locales, embedder uses i18n, only render mustache template with i18n if the views are passed 2011-01-29 16:40:10 -06:00
Dan Hansen
4b1b7591a6 load diaspora.js and widgets right after vendor/*, return empty string if the value is not found 2011-01-29 16:07:12 -06:00
Dan Hansen
5040a37a31 whoops, missed a semicolon 2011-01-29 15:59:39 -06:00
Dan Hansen
4484bf33fa fix javascript i18n specs 2011-01-29 13:31:45 -08:00
Dan Hansen
b89a59ca55 update timeago usages 2011-01-29 13:30:32 -08:00
Dan Hansen
ee218ecd44 get rid of the hacky callbacks 2011-01-29 13:28:43 -08:00
Dan Hansen
3078156dbb javascript i18n wip 2011-01-29 13:28:43 -08:00
Dan Hansen
7089782ba1 things having to do with publisher belong in publisher.js not stream.js 2011-01-29 14:42:59 -06:00
Dan Hansen
d03119f7e9 Embedder is now a widget, show videos before comments 2011-01-29 13:22:34 -06:00
Raphael
91bfdf0e75 Roll back infinite scroll plugin 2011-01-26 10:33:08 -08:00
maxwell
4e60d2b92e update inf. scroll; fix pagniation showing/not showing in all the wrong places 2011-01-25 17:38:29 -08:00
maxwell
bc82dac61c make the more button work in the mobile site, also, i finally fixed the timeago stuff in the scroll 2011-01-24 19:09:37 -08:00
maxwell
8b3beba93f adding login page to mobile, and adding timeago WIP 2011-01-24 17:36:47 -08:00
Dan Hansen
161759b99a fix 789 2011-01-24 02:40:24 -06:00
Dan Hansen
8293016348 make the footer not so useless 2011-01-23 23:53:17 -06:00
Dan Hansen
ace9e8c3d8 whoops, add license to embedder.js and it's spec 2011-01-22 23:43:48 -06:00
Dan Hansen
bdf559bb2b remove video embedding from stream.js, use embedder.js 2011-01-22 23:40:08 -06:00
danielvincent
77042f9d47 publisher always shows textarea. outline publisher textarea in blue 2011-01-22 18:49:50 -08:00
Dan Hansen
45444316cb Merge branch 'master' of github.com:diaspora/diaspora 2011-01-22 12:40:36 -06:00
Dan Hansen
b209fd0c2c our spec would complain about the data of the ajax request not being there, move it into the callback instead 2011-01-22 12:40:20 -06:00
MrZYX
cadcc3e7c3 some browers (Firefox for example) have no pushState, so disable it for those for now 2011-01-22 16:43:34 +01:00
Dan Hansen
8619a2035c green for the night 2011-01-22 01:16:52 -06:00
Dan Hansen
a3bc8932d4 fixes for the alert widget, widgets.init didn't execute correctly because of the context 2011-01-21 20:09:34 -06:00
Dan Hansen
c23811e1ab flash the user whether or not that person was moved to a different aspect 2011-01-21 20:02:42 -06:00
zhitomirskiyi
01a4327c2b use google API instead of highcharts due to licensing 2011-01-21 13:00:08 -08:00
zhitomirskiyi
41993fe5da use highcharts.js for stats 2011-01-21 12:19:05 -08:00
danielvincent
c5bf7b523f use history.pushstate to preserve filters on page refresh 2011-01-21 11:11:00 -08:00
danielvincent
8af2fc7bcc fix in calculating selected states on aspect filters 2011-01-21 01:16:34 -08:00
danielvincent
22d4083c8c use history.pushstate to preserve filters on page refresh 2011-01-21 01:10:29 -08:00
zhitomirskiyi
a00fbb1717 Merge branch 'master' of github.com:diaspora/diaspora 2011-01-14 16:11:37 -08:00
maxwell
bc8821fdc5 Revert "some fixes for the alert widget" 
This reverts commit 4e40c19342.
 2011-01-14 14:28:03 -08:00
Dan Hansen
4e40c19342 some fixes for the alert widget 2011-01-14 15:13:09 -06:00
Dan Hansen
8103e66ea3 didn't mean to commit some changes in aspect-edit.js 2011-01-14 14:57:26 -06:00
Dan Hansen
d4f30ded1b Diaspora.js 2.0, added an official widget, don't use native alerts anymore 2011-01-14 14:54:44 -06:00
zhitomirskiyi
aba03ed5b0 added the locales for timeago 2011-01-14 11:46:38 -08:00
Dan Hansen
4ccf51b3d3 fix real time aspect name changing 2011-01-14 13:29:55 -06:00
maxwell
f97a9fa017 added timeago jquery plugin. we now need to figure out a js translation scheme 2011-01-13 16:29:13 -08:00
maxwell
b4fae58f12 just say no to 404 facebox errors 2011-01-13 14:48:30 -08:00
maxwell
c002692657 Merge branch 'master' of github.com:diaspora/diaspora 2011-01-13 09:45:56 -08:00
Dan Hansen
f807bc25d1 whitelist certain keyCodes, e.g. tab, fixes #795 2011-01-13 01:24:05 -06:00
Dan Hansen
ce4fe1938c remove references to fancybox, we use facebox 2011-01-13 00:24:10 -06:00
Dan Hansen
61512ef7b0 youtube videos shove above comments and under the status -- i'm back\! 2011-01-12 23:05:20 -06:00
maxwell
c29ebdabba pending photos now stick to the publisher when adding or removing aspects... the home page however is a full reload, and some weird things happen when you switch from home 2011-01-12 15:47:14 -08:00
maxwell
f8d524c983 fix infield labels not rebinding on stream filter, and changed padding to margin for the user badge so the bottom boder does not go over the new request message 2011-01-12 13:50:55 -08:00
danielvincent
f2f3059d72 fixed aspects/manage css/js bug. aspect listings on aspects/index show at max 2 lines of ppl 2011-01-08 17:17:37 -08:00
danielvincent
6cc5d6e3ab fixed all rspec/cucumber 2011-01-08 16:53:16 -08:00
danielvincent
6ca0b0014b fade in aspect badges on stream 2011-01-08 15:24:03 -08:00
danielvincent
55fa1646c7 swapped out delete text for 'x' on stream_elements. controls fade in on hover 2011-01-08 15:06:25 -08:00
danielvincent
9cf1f5a023 fixed reshare with filters 2011-01-08 13:11:55 -08:00
danielvincent
98bcad5c59 visual fixes on people/show. contact count on aspect filters. contact list searches again. 2011-01-08 13:11:54 -08:00
danielvincent
71ca93720b contact lists functional on aspects/index. edit panes facebox in from header 2011-01-08 13:11:53 -08:00
danielvincent
c9307305b3 collapsed aspect_listing and contact_listing on aspects/index 2011-01-08 13:11:53 -08:00
danielvincent
f44b3cbe3d contacts now ajax in on aspect filtering on aspect/index. fixed missing partial error on aspect_badge. 2011-01-08 13:11:53 -08:00
danielvincent
422f17a648 switched out fancybox for facebox (THANK GOD). added aspect edit panes to aspects/index. removed some partials. 2011-01-08 13:11:53 -08:00
danielvincent
8c82a5974a aspect badge links work across all pages, ajax stream on index. aspect info lightbox placeholder 2011-01-08 13:11:53 -08:00
danielvincent
14ca5e1cc1 stricter url fix in aspect-filters 2011-01-08 13:11:53 -08:00
danielvincent
0a07dd16b5 posts are properly socketed on filtered streams 2011-01-08 13:11:52 -08:00
danielvincent
44d3c4bacd fixed inf scroll on filters issue. one spec failing in AspectsController. 2011-01-08 13:11:52 -08:00
danielvincent
d0b25814b1 publisher retains text when filtering stream 2011-01-08 13:11:52 -08:00
danielvincent
e6ae5e13e2 publisher works through ajax filters 2011-01-08 13:11:52 -08:00
danielvincent
f02c13ee73 filters are now working in ajax. inf. scroll and publisher pending ajax. 2011-01-08 13:11:52 -08:00
danielvincent
c64865d32e header touchup 2011-01-08 13:11:51 -08:00
danielvincent
a9195d7730 aspect filters now functional on aspects/index 2011-01-08 13:11:51 -08:00
danielvincent
6342dff96d fixed enter js bug on comments. removed enter hotkey on publisher completely. 2011-01-07 15:53:39 -08:00
Raphael
429087ef83 Merge remote branch 'tomk/729-retain-input-on-failure' 2011-01-04 16:39:07 -08:00
lfortin
62585aa445 more JS formatting 2011-01-02 19:41:20 -05:00
lfortin
efb711963f in JS, avoid global variables as much as possible 2011-01-02 19:24:38 -05:00
danielvincent
055fbe3e00 stream is now a div. generalized some partial extentions for mobile site. 2011-01-01 23:09:18 -05:00
Sarah Mei
a1b92f5224 Merge javascript formatting changes. 2010-12-28 20:31:49 -08:00
Thomas R. Koll
06d80d0e57 Issue #729: Failed posts and comments don't retain text 
The forms were cleared on a submit event instead of a ajax:success
 2010-12-28 23:46:34 +01:00
Nick van der Burgt
13b33ee864 Added ie.js file 2010-12-27 17:29:10 +01:00
danielvincent
0fb102a2ec right/left arrow keys functional on photo#show 2010-12-25 19:14:24 -05:00
danielvincent
30dd11b9fa mark notifications as read and update badge 2010-12-25 16:27:09 -05:00
danielvincent
4ff9622bfc notifications now properly socket (not a hack through comments like before). notification badge updates on new messages. 2010-12-25 16:07:31 -05:00
Sarah Mei
de502bf67c Convert aspect-edit-spec.js to use actual DOM fixtures generated by AspectsControllerSpec. 2010-12-24 18:39:20 -08:00
Sarah Mei
9c50f900ed Merry Christmas! I got you someting green. 
Remove callback to decrementRequestCounter in aspect-edit.js, since we don't have a request counter on that page anymore. The callback was failing, so the ajax request was never officially completing. Cucumber hates that.
I am going to add jasmine fixture generation in the controller specs, so that next time, a jasmine test will fail in this situation.
Also: clean up manages_aspects.feature.
 2010-12-24 14:14:24 -08:00
zhitomirskiyi
7796776135 vimeo works, does not yet fetch the title 2010-12-23 15:36:29 -08:00
danielvincent
7cb9760a1e show comments toggle like fb 2010-12-21 16:56:32 -08:00
maxwell
533ff2fc39 improve selector for inf. scroll 2010-12-19 19:30:33 -08:00
maxwell
d5819e3c9e fix the ajax-loader for scroll on non root page 2010-12-19 19:15:16 -08:00
danielvincent
bb0375d2f8 uploaded photos show in the publisher textarea instead of outside and above. fixed comment textarea on show pages. 2010-12-18 22:40:42 -08:00
lfortin
0393ac5a6f more JS formatting 2010-12-19 00:15:00 -05:00
danielvincent
01e557ba7a put ajax:success for publisher where it belongs 2010-12-18 20:31:02 -08:00
danielvincent
d5916c9287 removed comment button from sight 2010-12-18 20:26:27 -08:00
danielvincent
7b4da22617 shift+enter for a newline, enter for submission. inversion of current implementation. 2010-12-18 18:49:10 -08:00
danielvincent
78a50756c6 publisher collapsed by default on all pages. removed button styling from add photos button. publisher only collapses on ajax success. comment buttons use show() instead of fadeIn(). 2010-12-18 18:28:00 -08:00
maxwell
bcca61af6b infinate scroll 2010-12-18 01:33:33 -08:00
maxwell
84c041ba6a aspects streams now ajax 2010-12-17 19:41:42 -08:00
lfortin
77c102cce6 more JS formatting 2010-12-16 23:46:28 -05:00
danielvincent
f821f49db1 added similar contacts to contact pages 2010-12-16 11:49:08 -08:00
Raphael
3b727dc887 Add share_with fancybox on search page, fix a couple of queries 2010-12-15 17:45:12 -08:00
Laurent
4515ba631f some JS refactoring 2010-12-15 19:25:35 -05:00
zhitomirskiyi
1212b34706 fadeOut on delete 2010-12-15 11:58:38 -08:00
Raphael
02d76441e4 Merge branch 'aspect-list-on-profile' 2010-12-13 16:12:29 -08:00
Raphael
baa04ceac7 Add aspect list to contact page 2010-12-13 15:58:08 -08:00
Mark Schmale
9a873aa760 added fix for Bug #695 to email-validation 2010-12-13 15:54:35 +01:00
Mark Schmale
d163875577 added email validation. The border of the input field becomes red if the input seems to be invalid. 2010-12-13 15:46:19 +01:00
Mark Schmale
f5038cdc3c replaced charCode by keyCode. On every browser, keyCode is filled 
with the Unicode Character Code when used in keypress.
charCode is only supported in some browsers.
 2010-12-13 11:55:54 +01:00
Dan Hansen
02bb2fa19f hide reshare menu if you click somewhere it's not 2010-12-12 01:38:28 -05:00
Dan Hansen
55b16b00f4 Firefox sends charCode 0 when backspace is pressed 2010-12-12 01:09:47 -05:00
danielvincent
52a3996ad0 textareas auto expand 2010-12-11 22:18:03 -08:00
Raphael
3a4caca397 Fix photo uploading in profile photos, style photo upload button better 2010-12-09 13:06:31 -08:00
danielvincent
fa9caf00ca added tooltip text to public icon 2010-12-08 19:07:08 -08:00
maxwell
5f1f28923f fixed a comment counting bug, and the show_all_comments message when the comment count was three 2010-12-08 13:44:57 -08:00
maxwell
efee7682e2 aspect rename now works 2010-12-08 13:11:13 -08:00
danielvincent
b94e6ae4a0 shift+enter submits new messages/comments 2010-12-07 21:30:29 -08:00
OhaiBBQ
4bbbbf6bb1 tipsy on sidebar avatars 2010-12-05 09:44:10 +03:00
Sarah Mei
9da69a4b01 Mobile log in form is usable. Also, added mixins for sass. 2010-12-04 20:45:52 -08:00
OhaiBBQ
1b7749f282 typo on last commit 2010-12-05 06:21:06 +03:00
OhaiBBQ
05f54e0ebd Merge branch 'master' of github.com:diaspora/diaspora 2010-12-05 06:18:30 +03:00
OhaiBBQ
78ac693dcd only tipsy on avatars in left_pane and manage_aspect_zone 2010-12-05 06:17:14 +03:00
sentientwaffle
b303cf6830 fixed issue with post deletion confirmation for the latest verison of jquery 2010-12-04 18:55:15 -08:00
maxwell
23eb192524 double the time that notifications are seen on the page 2010-12-04 17:45:52 -08:00
danielvincent
105c788bf8 fixed comment js. fadeToggle is only supported in jquery >= 1.4.4 2010-12-04 17:37:57 -08:00
danielvincent
948707ea23 rolling back jquery. <= 1.4.3 has compatability issues with rails js helpers 2010-12-04 17:22:22 -08:00
danielvincent
4251a3a093 prompt to 'get the conversation started' on new aspect page fades out when first message in aspect is posted 2010-12-04 17:02:29 -08:00
OhaiBBQ
c55a867f61 fix build, .remove is the callback, don't call it immediately 2010-12-05 00:26:10 +03:00
OhaiBBQ
ba23bd7a0a Many JS improvements, moved a few things in view.js to stream.js, moved the clearForm plugin from view.js to rails.js (where we actually use it), refactored view.js and wrote specs 2010-12-04 11:54:59 +03:00
danielvincent
7fdbc9015b swapped new invitation lightbox for a proper page. 2010-12-03 00:57:53 -08:00
danielvincent
6c05d01177 enabling dragging and dropping between aspects on aspect manage. removed ability to remove a contact from aspects#manage after removing from a single aspect. fixed notification popup z-index. 2010-12-02 17:36:46 -08:00
Sarah Mei
c7b1fcc806 Merge branch 'master' of https://github.com/OhaiBBQ/diaspora into OhaiBBQ-master 2010-12-01 22:53:58 -08:00
maxwell
e18b918676 MS DG only show three comments by default 2010-12-01 18:09:41 -08:00
root
5d31a24e9e fixed spec, jquery event binding doesnt call the function itself, but a 'clone' of the function 2010-12-02 02:54:38 +03:00
root
5cd0a60073 Moved to it's own file, added specs 2010-12-02 02:22:05 +03:00
Dan Hansen & Sarah Mei
b2f4e064fc stream.js now semi-split into functions (still needs work); specs for toggling comments 2010-11-30 16:24:11 -08:00
root
bfcb7b48b3 4realz4realz 2010-11-30 16:24:11 -08:00
root
faf5baf4c5 Remove expand comments from the window namespace 2010-11-30 16:24:11 -08:00
danielvincent
601284a171 make profile photo action uses :remote=>true rails ajax helpers. added photos#make_profile_photo. 2010-11-30 15:58:26 -08:00
Raphael
57485e7093 Move aspect contacts pane js to public 2010-11-30 13:55:37 -08:00
root
06464cbfe8 Youtube videos now show themselves after the rest of the messages 2010-11-29 23:25:34 +03:00
danielvincent
2c22941e2f fixed listener for delete action on aspect-edit. scope through a manage_aspect_zones div to avoid confusion on aspects#show. 2010-11-28 20:16:57 -05:00
danielvincent
05174436c0 comments should only be dispatched out to remote people from owner. for local people on the same pod, the comment has already been verified by the comment's authority (post owner). 2010-11-28 18:51:27 -05:00
danielvincent
d7c5e12d64 move photo-show js to assets. remove EM::next_tick from controller#create actions. make photo show pages render again. 2010-11-28 02:30:25 -05:00
danielvincent
3ada121d0b contact-js as its own file 2010-11-28 00:29:22 -05:00
Raphael
8f67f90307 wtf weird chars in the JS 2010-11-27 22:32:20 -05:00
Sarah Mei
f8229d07e8 Adding copyright to js files 2010-11-26 12:16:10 -08:00
Dan Hansen & Sarah Mei
257d6f414a Top-level Diaspora object for js widget management 2010-11-25 22:24:25 -08:00
Dan Hansen & Sarah Mei
84face159d Removing unused js 2010-11-25 21:44:57 -08:00
danielvincent
b56af997cb comment streams rendered expanded/collapsed initially by server. 2010-11-25 20:23:33 -05:00
danielvincent
b5dbfc129c touched up aspect contact manage list, removed some unused sass. 2010-11-25 20:22:59 -05:00
Dan Hansen & Sarah Mei
eb314aa300 Fix application helper specs around youtube links 2010-11-25 16:29:30 -08:00
Dan Hansen & Sarah Mei
e78a86897a Video links now use data attributes and render in an iframe 2010-11-25 16:07:39 -08:00
Sarah Mei
050918a310 Added link to manage aspects page from sidebar. 
Now you can drag requests from that page, but not existing contacts. d&d interface for moving contacts between aspects needs some thought.
 2010-11-25 10:29:35 -08:00
Raphael
ed35969084 incorrect onClose in WS js 2010-11-24 18:10:49 -05:00
danielvincent
03243a277f took out slide animation on comments due to sluggish performance 2010-11-23 15:20:36 -08:00
danielvincent
c24150eca0 socketed posts now show up on home page. delete links are back in the stream. 2010-11-23 11:47:54 -08:00
danielvincent
9d98afb94f took out fade on photos#index, because it only displayed all photos half the time. 2010-11-23 09:44:58 -08:00
danielvincent
c9c84794af fixed build. publisher lights up on hover on aspect#index page. updated login page text. 2010-11-23 03:10:47 -08:00
maxwell
b283f5c579 pulling back needed partial 2010-11-22 17:29:51 -08:00
maxwell
173ec5f73b Revert "remove a duplicate view, hence many files updated, and fixed the js to socket people to the aspect sidebar" 
This reverts commit c45893d07d.

Conflicts:

	config/locales/diaspora/en.yml
 2010-11-22 17:11:34 -08:00
maxwell
1adf93ace1 Merge branch 'master' of github.com:diaspora/diaspora 
Conflicts:
	config/locales/diaspora/en.yml
 2010-11-22 16:40:01 -08:00
maxwell
c45893d07d remove a duplicate view, hence many files updated, and fixed the js to socket people to the aspect sidebar 2010-11-22 16:38:10 -08:00
Sarah Mei
bedc7ca41b Made landing page and log in views content-type agnostic. 
Added an un-minified version of jquery-mobile for debugging.
 2010-11-22 15:02:25 -08:00
danielvincent
0e7b1f5eb7 status messages and comments made by user will ajax onto the current page, and websocket everywhere else. 2010-11-22 14:52:13 -08:00
MrZYX
e72f4e1da7 translatable status is good again 
made default aspects translatable
fix all the misssing translations I found
cleanup en.yml
 2010-11-22 22:30:37 +01:00
danielvincent
8c6f3bddc3 added diaspora handle to home page with help text. added email address to account settings page. 2010-11-22 11:19:50 -08:00
danielvincent
857a4b5f11 photo large is now at 300px. a person's profile photo now references the larger size instead of medium. 2010-11-22 10:32:14 -08:00
danielvincent
cb837f5fd7 moved photo controls on photos#show to bottom of poloroid. make profile photo action gives feedback while loading. 2010-11-22 01:24:04 -08:00
maxwell
5c2d161146 small changes to mobile 2010-11-22 01:19:11 -08:00
Sarah Mei
218aa1c0d6 MSSM aspect switcher in mobile interface plus tests; added check for ipad useragent 2010-11-21 19:56:35 -08:00
danielvincent
752d50a6a9 editing captions on photos uses remote forms. removed photo in album from WSR. 2010-11-21 19:51:20 -08:00
danielvincent
069b372c19 photo show links to original post and siblings. status message shows all photos associated with it. youtube player makes http/s call instead of just http. 2010-11-21 16:30:47 -08:00
danielvincent
d16a4601c2 contact list on aspect#show is ajaxy 2010-11-21 16:30:46 -08:00
maxwell
39f596462e saying sent on requests via js 2010-11-21 16:13:01 -08:00
maxwell
7f97b6f812 MS DG form now works reasonably well. still need to limit number of photos 2010-11-21 16:13:00 -08:00
maxwell
7fb751b00c making photo uploader work better 2010-11-21 16:11:55 -08:00
danielvincent
242d0ab9c5 a search yielding exactly one person will redirect to that person's page. hotkey ctrl+f triggers focus on search box. 2010-11-21 16:11:55 -08:00
Raphael
6f0d008914 Move WebSocketReceiver out to a js file 2010-11-21 16:14:36 -05:00
Raphael
7db1da935a Stream is a class 2010-11-21 13:21:42 -05:00
maxwell
9882fa183d Merge branch 'master' of github.com:diaspora/diaspora 2010-11-17 23:19:27 -08:00
maxwell
2ffd2d93e3 made mailchimp form ssl 2010-11-17 23:19:12 -08:00
Sarah Mei
64237534fd Merge branch 'master' of github.com:diaspora/diaspora 2010-11-17 22:31:21 -08:00
Sarah Mei
c19ebcece3 Request delete now returns head :ok instead of redirecting. On client side, request div is removed. 2010-11-17 22:28:24 -08:00
maxwell
31d33054ef added jammit, now js and css compress for production 2010-11-17 21:51:59 -08:00
maxwell
e959e529ff ga looks like it only likes if the code is pasted...hrmpf 2010-11-17 12:29:58 -08:00
maxwell
ba620e5400 spell vendor correctly 2010-11-17 12:25:09 -08:00
maxwell
643950cf52 added google a 2010-11-17 12:16:44 -08:00
maxwell
6a695479f7 adding updated jquery UI for compatability 2010-11-16 23:58:16 -08:00
maxwell
f55509085a upgraded jquery, and deleted a second version of both jqueries 2010-11-16 21:41:20 -08:00
Raphael
e2412d2e43 Add error messages for friending from aspect-manage 2010-11-16 18:00:55 -08:00
Sarah Mei
45e47513c2 AspectEdit#onDeleteRequestSuccess now adds and drops attributes properly 2010-11-14 21:49:36 -08:00
danielvincent
aa9966ea26 removed the word friend everywhere minus translation files 2010-11-12 20:22:55 -08:00
Sarah Mei
6c439608f0 started specs for AspectEdit.deletePersonFromAspect 2010-11-12 17:04:15 -06:00
Sarah Mei
506d13335a Finally have complete specs for AspectEdit.onDropMove. 2010-11-12 16:05:17 -06:00
Sarah Mei
b77547e940 Responding to a friend request now only calls RequestsController#delete instead of also calling AspectsController#move_friend 2010-11-12 14:51:16 -06:00
Sarah Mei
feec6d971d More specs for aspect edit JS 2010-11-12 13:40:23 -06:00
danielvincent
85e2316280 Add a contact pane on aspects#show altered to also allow removal of existing contact from aspect 2010-11-11 19:41:12 -08:00
Sarah Mei
ca9331970a Renaming image_picker to image-picker since js likes dashes better than underscores 2010-11-10 10:52:33 -07:00
maxwell
034d7ee2b1 first commit 2010-11-09 15:29:43 -08:00
danielvincent
d7172767ba moved fancybox assets to vendor/css 2010-11-07 12:24:54 -08:00
danielvincent
0127c9eb6f people on manage page are draggable again. took out jquery.cycle. fixed loading issue with tipsy.gif 2010-11-07 11:07:37 -08:00
Sarah Mei
32d953f457 Reorganized public folder - third-party js is now in public/javascripts/vendor. Third-party css is now in public/stylesheets/vendor. 2010-11-06 16:50:07 -07:00
danielvincent
be916384a1 collapsed remove from aspect and remove person into one function on aspects#manage 2010-11-04 17:50:48 -07:00
danielvincent
2c24eba49c make profile photo button on photos#show works again 2010-11-04 16:04:58 -07:00
Raphael
152025f912 Update flashsocket 2010-11-04 12:01:39 -07:00
Sarah Mei
dbdd6884a7 SM MS jasmine specs for aspect edit 2010-11-03 22:19:20 -07:00
Sarah Mei
fad9c09212 refactor aspect-edit.js in prep for jasmine testing 2010-11-02 13:37:27 -07:00
Raphael
fd0f3a9a1c Fix reshare, user_menu 2010-11-01 17:30:10 -07:00
Raphael
47f040f740 Use jquery id selector 2010-11-01 16:45:09 -07:00
OhaiBBQ
a548ab1345 Small optimizations 2010-11-01 14:58:53 -07:00
OhaiBBQ
8b0d20dec7 Small optimizations 2010-11-01 14:45:51 -07:00
OhaiBBQ
94e4c22fcf Fixed some tabbing 
Removed some more unneeded jQuery object constructors for the button fancyboxes
Replaced event.target with the this keyword
 2010-11-01 14:23:16 -07:00
OhaiBBQ
175e5bdc30 Added strict equality operator to #publisher and #stream keydown event 
Added caching of the $container jQuery object
Added caching of $controls and $this in the .make_profile_photo click event
changed the success callback to use this.src = photo_url; instead of creating a new jQuery object
 2010-11-01 10:37:07 -07:00
OhaiBBQ
6474f5c5f3 Added more caching of jQuery objects, saved a line by using .toggleClass() 2010-11-01 10:07:41 -07:00
OhaiBBQ
c8e8ef06e7 You don't need to make a new jQuery object to do that. 
Fixed typo in the click param
Cache the .edit_photo jQuery object
 2010-11-01 05:26:58 -07:00
danielvincent
bfb132280a reshare button displays dropdown on click 2010-10-31 14:30:03 -07:00
danielvincent
51dd6d32b3 upload a photo button next to publisher 2010-10-29 10:38:53 -07:00
danielvincent
a7df1bca68 photos do not require an album. uploading files on a user's photos#index page will post to all aspects. 2010-10-29 10:38:17 -07:00
danielvincent
2b4e3e3a41 a person now has a photos#index page. 2010-10-29 10:38:17 -07:00
danielvincent
b320f5df72 fixed js for changing a user's profile photo on photos#show 2010-10-27 08:45:43 -07:00
danielvincent
ec141a2019 a user can add a person to an aspect from getting_started#2 2010-10-26 13:04:47 -07:00
danielvincent
69b1b71a5d removed javascript slider. made each getting_started section its own page. added bio to profile (and changed xml_accessors to xml_readers). 2010-10-26 13:04:47 -07:00
danielvincent
f23d199230 added slider to getting started flow 2010-10-26 13:04:46 -07:00
danielvincent
d8ca91769f dragging a person to Remove from Aspect on aspect#manage fades person correctly (re: #442) 2010-10-26 13:03:45 -07:00
danielvincent
ff13cad116 names of people display immediately on aspect#manage page 2010-10-26 12:19:32 -07:00
danielvincent
7b3f6f66c1 removed second #stream declaration on status_message#show. fixed bug where show pages would get posts as well as comments. 2010-10-24 14:44:43 -07:00
danielvincent
661ad20a02 added delegate, proper finders, and more chaining to stream.js. removed div.comment_set from the DOM. 2010-10-24 14:44:43 -07:00
danielvincent
f8347a3dd4 added tipsy tooltips for user pictures on left pane in aspect#index and aspect#show 2010-10-23 22:21:51 -07:00
danielvincent
c0423e5e56 reverting commit manually 2010-10-22 15:57:00 -07:00
danielvincent
829ad6360a multiple dropzones function. person image does not copy, delete is disabled. 2010-10-22 15:56:28 -07:00
danielvincent
a52870b21c improved animations 2010-10-22 15:56:28 -07:00
danielvincent
e1f4e12b8f style. also, made sense of aspect-edit.js 2010-10-22 15:56:28 -07:00
danielvincent
69528b95a3 removed ignore bucket. people now have x's to delete them 2010-10-22 15:56:27 -07:00
danielvincent
8e175be2ba fixed comments not showing up through websocket on photo show page 2010-10-20 23:40:48 -07:00
ilya
84e19f833a Merge branch 'master' of github.com:diaspora/diaspora 2010-10-20 18:30:36 -07:00
ilya
30bae4f807 throws an alert if you try to remove person from the last aspect 2010-10-20 18:30:22 -07:00
danielvincent
e880a5a11f comment submit buttons show again. further changes to show pages. 2010-10-20 18:15:07 -07:00
ilya
6fa82490c9 remove friend from aspect box, with js call to remove the person from the aspect 2010-10-20 17:34:52 -07:00
danielvincent
e9ced7b2e6 changing photo now updates all user images in page 2010-10-20 12:35:16 -07:00
danielvincent
61122b83d0 make profile button on photo show page. (removed clean hash on usercontroller) 2010-10-20 12:19:06 -07:00
Raphael
fd8028db33 Revert "Revert "Merge remote branch 'upstream/master'"" 
This reverts commit 1481056af2.
 2010-10-20 09:51:55 -07:00
Alec Leamas
1481056af2 Revert "Merge remote branch 'upstream/master'" 
This reverts commit fb70dc8c99, reversing
changes made to 53fef63a9a.

Conflicts:

	pkg/fedora/diaspora-setup
	pkg/ubuntu/diaspora-setup
	public/stylesheets/sass/application.sass
	spec/models/user/attack_vectors_spec.rb
 2010-10-20 14:59:55 +02:00
danielvincent
8751503aa4 header on public explain fancybox 2010-10-19 16:28:45 -07:00
danielvincent
f6303b8fff reshare dropdown looks nicer. fixed user menu to drop down on click 2010-10-19 16:16:46 -07:00
danielvincent
ea00d35f1f padding on stream fix. added add aspect button in aspect nav. 2010-10-19 12:10:22 -07:00
ilya
a8bf082e35 The invitation now has an optional personal message 2010-10-18 14:35:41 -07:00
Raphael
3436371a96 Merge remote branch 'archi/332-quickfix' 2010-10-18 11:44:47 -07:00
Raphael
d38316002e Merging in Hexagon fancybox. TODO: Refactor out fancybox options hash. 2010-10-18 11:24:47 -07:00
danielvincent
4b1516542d various. fixed publisher in new layout. 2010-10-18 11:00:52 -07:00
danielvincent
54e5fb4abb add new aspect back on manage page. changed badges 2010-10-18 11:00:52 -07:00
archi
5e97fd3b52 Merge branch 'master' of git://github.com/diaspora/diaspora into 332-quickfix 2010-10-18 11:06:42 +02:00
danielvincent
060767e794 comments submit on enter. design touchup 2010-10-17 19:36:43 -07:00
archi
f2af56f4b2 Youtubelink support :) 
Tested with Firefox, Chrome and Mobile Safari (IE8 is broken anyway)
 2010-10-17 20:18:24 +02:00
archi
f676e284f7 Added Youtube links - Still TODO: Caching of titles! 2010-10-17 16:14:01 +02:00
archi
8e753cc073 Youtube proof of concept patch/preview - not done yet (see bug #332) 2010-10-17 12:56:26 +02:00
maxwell
e8c49feca4 made the public info link in all aspects publisher 2010-10-15 14:10:10 -07:00
danielvincent
12bdd1712d share on facebook checkbox instead of broadcast button 2010-10-15 13:56:49 -07:00
danielvincent
45d7d54c66 added an empty message for the case of an aspect with no friends 2010-10-14 16:23:29 -07:00
Robin Nilsson
96219b7360 Making fancybox modal 2010-10-14 00:23:14 +02:00
danielvincent
be017bfb0a DG MS; invite is now a lightbox on feed and manage pages 2010-10-11 14:16:24 -07:00
danielvincent
82f526ea23 DG MS; added tooltip 2010-10-11 10:53:00 -07:00
danielvincent
884d7b7dd7 flash message should slide in 2010-10-10 23:13:03 -07:00
danielvincent
b313272ff3 flash messages look nicer 2010-10-09 22:32:39 -07:00
danielvincent
154ec95717 killed the public tab. made a broadcast button in everyone tab 2010-10-08 14:06:49 -07:00
danielvincent
b314ee22ec intermediate misc ui polish 2010-10-07 22:51:08 -07:00
Raphael
1fd3aeabd9 Add or later to license notice 2010-10-07 16:25:34 -07:00
Alec Leamas
e9252e8aec After applying known rules in diaspora-bundle.spec, perm-fix patch + *.png 2010-10-07 14:59:13 +02:00
Alec Leamas
a9806ddad0 Fixing bad execute permissions on various *.html, *.js, *.css,*.png etc. 2010-10-06 04:59:46 +08:00
danielvincent
577b5545bf comment blocks slide 2010-09-28 11:50:13 -07:00
Dorian
6ffc03a4c9 Big clean up: delete trailing whitespace 2010-09-26 12:48:40 -04:00
danielvincent
955d9130a2 DG IZ; shift+enter in publisher box submits contents 2010-09-22 15:35:23 -07:00
danielvincent
f50b70da9e DG IZ; removed stray mustache 2010-09-20 18:14:12 -07:00
danielvincent
e588d7ab6a DG IZ moving friends is now ajaxy 2010-09-20 17:26:20 -07:00
danielvincent
14ad24ba7e visual tweaks on header. moved upload a file button to header on album#show 2010-09-19 14:27:20 -07:00
MrZYX
7c62a5adf7 fixed drag & drop on aspect manage page 2010-09-19 09:57:58 +08:00
Rick Waldron
535f6ed334 More clean up to decrementRequestsCounter() 2010-09-18 08:05:51 +08:00
Rick Waldron
fcdc1d914c Cached all reused match selector sets, moved synchronous functions into callbacks where needed for optimization; Moved all DOM manip into $(function () {} ) 2010-09-18 08:04:47 +08:00
Rick Waldron
773839308c Moved .live(...) into $(function() {}) block - DOM logic should not be left to synchronously execute outside of a DOMContentLoaded closure 2010-09-18 08:03:59 +08:00
danielvincent
292a38e694 DG IZ; arrow keys work in fancybox. removed background color change on close button on hover 2010-09-16 18:55:54 -07:00
danielvincent
755e2a744c DG IZ; dropzones now light up when dragging on aspect page 2010-09-16 17:30:49 -07:00
danielvincent
d74c4bd117 DG IZ; use focus instead of click 2010-09-16 16:47:10 -07:00
Raphael
708e9f88a5 Spell our own name right 2010-09-15 17:56:18 -07:00
Raphael
aa3ebe372c License notices replaced 2010-09-15 10:58:48 -07:00
Daniel Vincent Grippi
b77260af6b Decrement request counter on request action 2010-09-14 21:24:57 -07:00
Daniel Vincent Grippi
12e15ba3a1 forgot a paren 2010-09-14 21:17:27 -07:00
Daniel Vincent Grippi
6c2c3d9157 working? 2010-09-14 21:16:16 -07:00
Daniel Vincent Grippi
aaaa10b7e4 more testing 2010-09-14 21:12:56 -07:00
Daniel Vincent Grippi
509c16d953 debugging js 2010-09-14 21:10:10 -07:00
Daniel Vincent Grippi
f2c6e7b820 made group manage a little nicer 2010-09-14 20:35:30 -07:00
maxwell
15651a7bb6 IZ MS group manage page can now add friends to groups 2010-09-13 18:10:07 -07:00
Daniel Vincent Grippi
94765906e0 forgot licenses on javascript files. 2010-09-13 14:43:24 -07:00
Daniel Vincent Grippi
4c15b1a01c added license to every single goddamn file. also, put one in the root dir. 2010-09-13 14:23:50 -07:00
Daniel Vincent Grippi
6aeaea1b7d removed some things. also, comment buttons are now css-ified when they come through the socket 2010-09-13 11:42:41 -07:00
Raphael
9837340eb2 Rename files from group to aspect 2010-09-13 10:43:15 -07:00
Raphael
44a1f82da9 Rename group to aspect 2010-09-13 10:38:38 -07:00
ilya
3014c4d057 silly little thing 2010-09-12 23:22:20 -07:00
ilya
0896efa5d6 now requests are called requested people, same css but less hacky selection 2010-09-12 22:54:53 -07:00
ilya
3bd686143f need to send it without data 2010-09-12 22:10:50 -07:00
ilya
593f620216 a tiny change should make the things fadeout 2010-09-12 21:57:15 -07:00
ilya
6b7f0888d0 Testing ignore friend request on remote 2010-09-12 19:56:23 -07:00
ilya
9b07c780c3 the acceptance now works need to do the ignores and unfriend bucket 2010-09-11 23:31:43 -07:00
ilya
b1dcc4cf43 testing request acceptance on remote 2010-09-11 21:58:01 -07:00
Daniel Vincent Grippi
7fefdd3753 minor cleanup 2010-09-11 08:59:25 -07:00
Daniel Vincent Grippi
266a896bde mtweaking comments in stream 2010-09-10 23:55:33 -07:00
Daniel Vincent Grippi
0c5ab4f20e undo for now 2010-09-10 15:44:36 -07:00
Daniel Vincent Grippi
ef6ce98c12 DG IZ alert on dragging a request, trying to check 2010-09-10 15:41:58 -07:00
Daniel Vincent Grippi
8afb590128 small fix 2010-09-10 15:28:11 -07:00
Daniel Vincent Grippi
136eb61b02 DG IZ; groups = relations. now you can rename groups in the manage relation page 2010-09-10 14:52:11 -07:00
Daniel Vincent Grippi
5812bbd1f1 removed group name edit madness from javascript. 2010-09-09 09:35:32 -07:00
Daniel Vincent Grippi
1c2bfa64a1 cleaned login page resources 2010-09-08 23:30:08 -07:00
Daniel Vincent Grippi
20d9334ce1 DG IZ; changed the photo uploader to drag and drop. now works in firefox. 2010-09-07 17:20:48 -07:00
Daniel Vincent Grippi
41afd86fe7 DG IZ; fixed photos. 2010-09-07 12:03:43 -07:00
ilya
9a4edc419c DG IZ first commit from the car, now can change groups a couple of times 2010-08-31 22:55:50 -07:00
ilya
98db03d36e the group edit resets the data started to reset the from id attr 2010-08-31 10:46:49 -07:00
ilya
82ff7dc4e4 the person bg color now reset to white, need to reset the original group param and reset the moves var so that one can submit again 2010-08-29 20:38:59 -07:00
ilya
9a5f7b4675 IZ now the bg color of the moved people changes to blue and changes back to white when you move them back, still need to reset to white on submit and make it pretty 2010-08-29 20:23:20 -07:00
ilya
990be921f3 added an switch to reset the data if the thing is moved into the original group 2010-08-27 18:17:08 -07:00
Daniel Grippi & Raphael Sofaer
cf161cb8cf publisher box back up top 2010-08-27 16:09:10 -07:00
Raphael
5ff1bdae90 Groups can now be batch edited 2010-08-27 12:23:20 -07:00
danielvincent
81438678cd Refactored more photo js out to photos.js. That should be it for that refactor 2010-08-26 17:10:19 -07:00
danielvincent
239ae048cc group names are now editable 2010-08-26 15:02:13 -07:00
Raphael
19e8aa5c35 Refactored view js 2010-08-26 11:06:35 -07:00
maxwell
9b690b863a droping things 2010-08-25 21:53:04 -07:00
Raphael
6d3d37b7c6 Merge branch 'master' of github.com:diaspora/diaspora 2010-08-25 18:20:37 -07:00
Raphael
2c54fee1af Adding minified jquery 2010-08-25 18:20:21 -07:00
maxwell
a26229223c Merge branch 'master' of github.com:diaspora/diaspora 2010-08-25 18:07:49 -07:00
Raphael
e714e0d457 Comment sets now pop open on receiving a new comment 2010-08-25 18:00:53 -07:00
maxwell
22f63a4c44 MS IZ added the move friend method 2010-08-25 16:58:07 -07:00
Raphael
be6dc1d443 Delete tinymce 2010-08-25 13:58:16 -07:00
Raphael
2c89a96e79 Merge branch 'master' of github.com:diaspora/diaspora 2010-08-25 13:56:49 -07:00
Raphael
9d2653ecd4 Move some stuff out of document ready 2010-08-25 13:56:38 -07:00
maxwell
c9e64ae209 Merge branch 'master' of github.com:diaspora/diaspora 2010-08-25 13:54:27 -07:00
maxwell
6a613c3304 addded the draggable javascript 2010-08-25 13:53:53 -07:00
Raphael
f8d63052d4 Remove stream lives from ready block 2010-08-25 13:52:59 -07:00
Raphael
17636f4fd2 View modifications, refactored stream javascript to another file 2010-08-25 13:51:16 -07:00
danielvincent
f4b3a2eb3a more cleaning up of comment box. javascript stuff. 2010-08-24 20:49:32 -07:00
danielvincent
501f98b9e1 fixed comments from not showing. also, touched them up a bit. 2010-08-24 20:13:37 -07:00
Raphael
3f5df61810 minor tab tweaks 2010-08-24 16:38:42 -07:00
Raphael
de3044fa0a Remove publisher selection remnants, fix posting 2010-08-24 15:55:35 -07:00
Raphael
5a02f92448 Merge branch 'master' of github.com:diaspora/diaspora 2010-08-23 13:58:46 -07:00
Raphael
ae6f0fdc51 new photo form now loads through ajax 2010-08-23 13:58:33 -07:00
Raphael
9ef2008613 Remove tinymce init block 2010-08-23 11:59:58 -07:00
danielvincent
2d21ac0460 moving things around 2010-08-23 11:05:28 -07:00
ilya
21f70c643d DG IZ; moved update_profile from Person into User. removed notify_people methods. temporarily broke album pushing 2010-08-18 16:15:10 -07:00
ilya
6c729b382f fixed some color on the header 2010-08-17 21:50:18 -07:00
Raphael
08de5caf97 make signup page look better 2010-08-17 17:20:29 -07:00
danielvincent
013a6d0849 add photo is now in a fancy-pancy box 2010-08-11 20:45:57 -07:00
Raphael
cc070ba168 RS, DG; Removed fancybox gone mad from photo adder 2010-08-10 18:08:27 -07:00
Raphael
a201390123 DG, RS; Added fancybox, made the contextual panes fancyboxes, photo adding is all broken 2010-08-10 17:59:22 -07:00
Raphael
bd7ce5250f renamed the route for signup. also, removed the link from the login page: get_to_the_choppa 2010-08-10 17:14:58 -07:00
Raphael
37bf5b45f1 RS, DG; You now can't open the photo upload form while photos are uploading 2010-08-10 16:56:19 -07:00
Raphael
9947a2abb8 RS, DG; latest_status thing now works, started putting signup back in 2010-08-10 12:26:43 -07:00
Raphael
744693e7fb RS, DG; There is now a add friend box on the front page that passes group idto the app 2010-08-09 17:33:54 -07:00
Raphael
838fec4921 RS, DG; Working on group nav, fixed some stuff in photo 2010-08-09 16:34:06 -07:00
danielvincent
6f1a596dff small color changes 2010-08-06 00:40:44 -07:00
danielvincent
c54d47337b updated button style 2010-08-06 00:15:22 -07:00
danielvincent
f3bc651359 stuff fades 2010-08-02 19:16:01 -07:00
danielvincent
3d5f27fe5a javascript gets group param for temp testing... friend pictures on group nav displays all people and authors, also for testing 2010-08-02 17:27:45 -07:00
Raphael
d503c6541f RS; posted statuses now use the websocket to update latest, time is now styled right 2010-08-02 11:13:21 -07:00
Raphael
dc1a164b67 Removing unused function 2010-07-30 12:42:39 -07:00
ilya
b5b8e29d6a DG IZ album view page brush up 2010-07-28 15:33:27 -07:00
ilya
3f27e1f67d DG IZ photo spacing now works 2010-07-28 14:48:28 -07:00
danielvincent
d4ac19e9ce all form buttons are now using button definition in UI 2010-07-27 12:23:21 -07:00
danielvincent
dbc8f0112e some misc design cleanup. album page toggle pending. 2010-07-27 12:12:25 -07:00
danielvincent
97daaf81c2 made custom css3 buttons (pending FF compatability; works in webkit for now.) 2010-07-26 21:48:02 -07:00
maxwell
d73d36f162 MS i had broke atom generation in my refactor. now it is fixed 2010-07-26 17:39:48 -07:00
danielvincent
9afb8beb25 Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-26 17:04:00 -07:00
danielvincent
ec59b89e83 DG IZ; few changes to uploader. added prefetching to photo prev/next links on photo show page 2010-07-26 16:57:44 -07:00
maxwell
a9b1954ff6 MS status message now updates the big one on the index page...hooray for jquery 2010-07-26 16:27:10 -07:00
danielvincent
087cf47b3f DG IZ added the JS file 2010-07-26 15:51:30 -07:00
danielvincent
d93c331615 moved publisher 2010-07-23 20:12:28 -07:00
maxwell
695a93ddad DG MS added basic album traversal 2010-07-21 14:29:58 -07:00
danielvincent
c01e9846cf began album index page. added a larger thumbnail on image upload. also, there is one HUGE memory leak somewhere 2010-07-21 00:24:11 -07:00
ilya
7901791ee3 DG IZ; added simple image picker for edit profile page. currently displays all images uploaded. 2010-07-20 11:50:36 -07:00
ilya
e08ed8805f DG IZ photo upload form now with all the others 2010-07-20 10:00:02 -07:00
Raphael
501620e9fb DG RS; fixed some visual bugs. request link now turns red on new request 2010-07-15 18:40:55 -07:00
maxwell
3a785e24fd removed old jquery ajax form thing we never used but made it into the repo 2010-07-10 10:42:38 -07:00
Raphael
d00798e982 added preventdefault to publisher 2010-07-06 11:49:54 -07:00
ilya
a009bb1565 Added the expected behavior of fading out the publisher field(s) if content type is clicked again 2010-07-05 05:37:23 -04:00
danielvincent
33611abeba Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-03 23:39:20 -07:00
danielvincent
0001797850 moved user's name to the right of their picture 2010-07-03 23:39:05 -07:00
Raphael
0c09445919 RS; blur in clear_form 2010-07-03 23:35:10 -07:00
Raphael
a0cdd7cb0e RS; Refactored publisher, tested it, it seems to work perfectly, but I could be wrong. 2010-07-03 13:26:11 -07:00
Raphael
cae4f832cf hover fix 2010-07-02 15:28:32 -07:00
Raphael
6ab9904f25 delete js now applies to new things 2010-07-02 15:19:33 -07:00
danielvincent
6ce0f4464f reverted publisher javascript refactor. working again in chrome. 2010-07-01 20:04:31 -07:00
Raphael
51e36b9659 RS, merged publisher refactor 2010-07-01 17:09:35 -07:00
Raphael
a70fbc6a4a Changed cap script 2010-07-01 16:54:12 -07:00
maxwell
86c6cdcafa Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-01 16:38:51 -07:00
maxwell
ba984009f8 added chrome frame 2010-07-01 16:38:32 -07:00
danielvincent
b25880f04a Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-01 16:25:11 -07:00
danielvincent
03e7071aae fixed nav list/link deal for firefox, html compliance 2010-07-01 16:24:51 -07:00
maxwell
6f17e5f28f added chrome frame for ie lameos 2010-07-01 16:17:32 -07:00
maxwell
38465c350c RS, MS; Forms now clear 2010-07-01 11:19:08 -07:00
Raphael
a7659ae902 Marked the problem area in infieldlabels 2010-06-30 21:53:05 -07:00
Raphael
34400594ec RS, AML; fixed jumping to top of page on comment toggle 2010-06-30 13:29:20 -07:00
Raphael
2b0659e21d Comment toggle now applies to socketed posts 2010-06-30 08:28:24 -07:00
maxwell
dc5b321b62 sorry for the monster commit.... 4 small chores...1) moved tons of dynamic javascript to haml partials in the new js view folder, and moved some of the js that got put in the application layout into view.js 2. set up a static config prefrence loader in initializers, loaded from yaml 3) fixed the top right login text from being pushed over. 4) fixed a bug when no user is on the node and someone hits the landing page.... you still cant create a new user from there, but now at least it doesnt blow up. 2010-06-30 00:27:11 -07:00
maxwell
448fcf8f89 MS RS fixed real name, now profiles are created with a new friend 2010-06-29 20:33:55 -07:00
danielvincent
984f5f62b6 DG IZ; publisher reflects what type is selected 2010-06-29 19:55:50 -07:00
danielvincent
0c16038e2d Merge branch 'master' of github.com:diaspora/diaspora_rails 
Conflicts:
	app/views/layouts/application.html.haml
	public/stylesheets/application.css
	public/stylesheets/sass/application.sass
 2010-06-29 17:30:29 -07:00
danielvincent
acc782d5b2 DG IZ; cool labels fade in 2010-06-29 17:27:09 -07:00
maxwell
eebed9d457 fixed publisher in chrome and broke it out to a seperate js file 2010-06-29 17:04:46 -07:00
danielvincent
39a1874ce3 DG IZ; all input fields are now textareas on dashboard page 2010-06-29 16:28:12 -07:00
maxwell
ee9acc5c82 thanks to dan, GS works great now MS RS 2010-06-29 15:00:30 -07:00
maxwell
6532962c1c trying to get google analytics working 2010-06-29 13:58:36 -07:00
maxwell
60336bd520 trying to get GS working 2010-06-29 13:45:54 -07:00
maxwell
a683a2c1aa RS MS added goog analytics 2010-06-29 11:45:41 -07:00
maxwell
46ab63de36 added will pagination action. 2010-06-28 21:56:58 -07:00
maxwell
36b5a90d34 MS figured out how to get comments to come thru the websocket. this is super super super hacky, and kind of terrible, but it works 2010-06-28 17:35:38 -07:00
ilya
a7d46bffab removed socket.js 2010-06-26 02:08:19 -04:00
ilya
d4f528bba8 Removed bookmark new page, moved form to index 2010-06-25 23:23:37 -04:00
maxwell
5cade230ac added silly debug toggle 2010-06-25 15:33:23 -07:00
maxwell
a673e48317 DG MS fixed js for statusmessage 2010-06-23 12:07:22 -07:00
maxwell
671772f901 MS DG added tinyMCE, now a blog is better than a status messsage 2010-06-23 11:58:46 -07:00
maxwell
fba4ce9e3b DG MS; fixed flash message visual bug 2010-06-23 11:11:58 -07:00
maxwell
5e5dea85a8 pushing small js fixes 2010-06-23 10:25:49 -07:00
maxwell
60fa7e3ac4 view stuffs 2010-06-23 01:26:00 -07:00
maxwell
94de043862 fixed not hardcoded port for websockets 2010-06-22 17:20:07 -07:00
maxwell
4af10a95fa oops forgot to add jquery_form 2010-06-22 16:44:41 -07:00
maxwell
3064d208eb added firefox websocket stuffs, only loads if it is not safari or chrome 2010-06-22 14:31:16 -07:00
maxwell
655dd64a54 websockets work 2010-06-21 14:12:05 -07:00
maxwell
7bc165d7a0 added js file 2010-06-20 22:11:37 -07:00
maxwell
8019fc8d31 working websocket 2010-06-19 00:09:58 -07:00
maxwell
408c2c719d swaped out js for jquery 2010-06-15 09:53:19 -07:00
Raphael Sofaer
0390bbde8a Activerecord this time\! 2010-06-11 10:40:49 -07:00