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

173 commits

Author SHA1 Message Date
danielvincent
7fdbc9015b swapped new invitation lightbox for a proper page. 2010-12-03 00:57:53 -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
Dan Hansen & Sarah Mei
e78a86897a Video links now use data attributes and render in an iframe 2010-11-25 16:07:39 -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
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
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
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
7db1da935a Stream is a class 2010-11-21 13:21:42 -05:00
Raphael
e2412d2e43 Add error messages for friending from aspect-manage 2010-11-16 18:00:55 -08: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
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
danielvincent
2c24eba49c make profile photo button on photos#show works again 2010-11-04 16:04:58 -07:00
Raphael
fd0f3a9a1c Fix reshare, user_menu 2010-11-01 17:30:10 -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
danielvincent
bfb132280a reshare button displays dropdown on click 2010-10-31 14:30:03 -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
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
ff13cad116 names of people display immediately on aspect#manage page 2010-10-26 12:19:32 -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
829ad6360a multiple dropzones function. person image does not copy, delete is disabled. 2010-10-22 15:56:28 -07:00
danielvincent
8e175be2ba fixed comments not showing up through websocket on photo show page 2010-10-20 23:40:48 -07:00
danielvincent
e880a5a11f comment submit buttons show again. further changes to show pages. 2010-10-20 18:15:07 -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
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
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
Raphael
1fd3aeabd9 Add or later to license notice 2010-10-07 16:25:34 -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
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
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
Raphael
44a1f82da9 Rename group to aspect 2010-09-13 10:38:38 -07:00
Daniel Vincent Grippi
7fefdd3753 minor cleanup 2010-09-11 08:59:25 -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 Grippi & Raphael Sofaer
cf161cb8cf publisher box back up top 2010-08-27 16:09:10 -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
Raphael
9d2653ecd4 Move some stuff out of document ready 2010-08-25 13:56:38 -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
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
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
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
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