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
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