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

459 commits

Author SHA1 Message Date
danielvincent
055fbe3e00 stream is now a div. generalized some partial extentions for mobile site. 2011-01-01 23:09:18 -05:00
Thomas R. Koll
869cbdf9e9 * Localizeable "Rename aspect" button 
* Don't list emails_delivered if there are none yet
* Don't show drag_to_add button if there are no @remote_requests
 2010-12-29 17:00:08 +01:00
Dorian
346217ea46 Bug #761 : Aspect name double escaped in page title 2010-12-26 03:59:15 +01:00
maxwell
152670a72b notification badge now in header 2010-12-20 18:05:31 -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
danielvincent
a41f45b846 contact count on home page 2010-12-16 18:21:06 -08:00
danielvincent
43810907f5 show all contacts in edit aspect pane 2010-12-16 10:00:18 -08:00
zhitomirskiyi
4256ea34b6 rename aspect on the aspect show page 2010-12-15 14:15:07 -08:00
Raphael
e63a8a4bfa Take contact.person query out of the views, only query people once in hashes_for_aspects 2010-12-14 12:11:36 -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
danielvincent
8de5c5babd fixing request bar on aspects#manage 2010-12-10 10:12:30 -08:00
MrZYX
0374ee436e fixed untranslatable strings 2010-12-10 16:52:35 +01:00
danielvincent
5731f32cfe add correct page titles 2010-12-09 20:09:20 -08:00
Raphael
2be0666d80 Remove query from aspects manage, correct spec in User spec 2010-12-09 19:11:47 -08:00
maxwell
f659ba58ef limit the new aspect form name to be less than 20 char in the form 2010-12-08 13:58:16 -08:00
Raphael
f421f1327c Take nested queried out of aspects manage 2010-12-07 00:21:05 -08:00
danielvincent
d3483c1cd5 forgot to remove something... 2010-12-07 00:00:34 -08:00
danielvincent
de0ecff5b7 aspects first on home contact list. 2010-12-06 23:59:16 -08:00
Raphael
9442553504 Refactor aspectscontroller and aspect_contacts.haml 2010-12-06 17:20:21 -08:00
Raphael
14a9bc02f9 Move aspect_contacts in to aspects 2010-12-06 17:20:21 -08:00
Raphael
c034113a7c Refactor to aspect partial 2010-12-06 17:20:21 -08:00
danielvincent
03961bce7b removed last reference to invitation fancybox 2010-12-04 20:06:24 -08:00
Sarah Mei
fea6884acc Mobile homepage looks decent. 2010-12-04 19:30:14 -08:00
danielvincent
47b6d66b83 fixed proportions in stream, etc. 2010-12-03 23:38:29 -08:00
danielvincent
5da5ee26bb two column aspect listing on manage page. made avatars smaller. 2010-12-03 16:22:20 -08:00
danielvincent
7fdbc9015b swapped new invitation lightbox for a proper page. 2010-12-03 00:57:53 -08:00
danielvincent
828635def9 Person#real_name -> Person#name 2010-11-30 13:01:53 -08:00
maxwell
96776f93f9 we need this for socketing... sorry 2010-11-29 16:19:36 -08: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
017075e480 actually include the javascript in the view... 2010-11-28 00:36:46 -05:00
Raphael
7ca124c002 Refactor views to not be so dumb. 2010-11-27 21:27:27 -05:00
danielvincent
a932547d12 minimizing some queries in the views. only select aspect names and ids in application controller. 2010-11-27 01:05:55 -05:00
MrZYX
e916e33482 pulled and merged request 509, thanks siefca 2010-11-26 15:48:08 +01:00
danielvincent
7c6d5b8d27 cleaned up right pane on aspects#all. moved edit_contacts_pane out to a partial -- translation locations need updating. 2010-11-25 23:14:45 -05:00
danielvincent
b5dbfc129c touched up aspect contact manage list, removed some unused sass. 2010-11-25 20:22:59 -05:00
Paweł Wilk
8138473b91 Unscoped 'contacts' and 'new_requests' translation keys and modified en.yml accordingly. 2010-11-26 00:47:02 +01:00
Paweł Wilk
e1a965c2fb Added multiple plurals for translations of 'contacts' and 'requests'. 
- Added multiple plurals handling for .contacts token in views/shared/_aspect_contacts.haml,
- Added multiple plurals handling for .new_requests token in views/shared/_aspect_contacts.haml,
- Added multiple plurals handling for .contacts token in views/aspects/show.html.haml.
 2010-11-26 00:47:02 +01:00
Sarah Mei
aa4a61870c you can click on photos in manage aspects to see profiles 2010-11-24 22:09:14 -08:00
maxwell
bd1cbdb297 adding drag to add people above friend accept box 2010-11-24 14:03:11 -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
danielvincent
376d403651 made publisher semi-hidden on home page 2010-11-23 00:34:28 -08:00
maxwell
ffedd9fa77 Merge branch 'master' of github.com:diaspora/diaspora 2010-11-22 17:30:00 -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
danielvincent
c63319f127 aspect#show cleanup. added 3 icons. 2010-11-22 17:03:33 -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
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
maxwell
5c2d161146 small changes to mobile 2010-11-22 01:19:11 -08:00
danielvincent
8df864dec1 everyone -> 'all contacts' on home page. removed repeated user links. 2010-11-21 22:37:22 -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
d16a4601c2 contact list on aspect#show is ajaxy 2010-11-21 16:30:46 -08:00
danielvincent
f6491816a3 adding a contact on an aspect page does not produce a fancybox anymore. more ui fixing. 2010-11-21 16:13:00 -08:00
danielvincent
52cde14221 more touchups 2010-11-21 16:11:54 -08:00
danielvincent
2b54d9a0c5 adjusting more page structure. drafting about there. 2010-11-21 16:10:54 -08:00
danielvincent
7a259d6d53 drafted a basic structure 2010-11-21 16:09:27 -08:00
MrZYX
6f5c3f3258 made recent changes translatable and cleanup up en.yml a bit 2010-11-19 17:25:45 +01:00
Raphael
c564d2819e Fixing no contacts link in _no_contacts. Thanks to alepane21. 2010-11-18 11:55:03 -08:00
maxwell
31d33054ef added jammit, now js and css compress for production 2010-11-17 21:51:59 -08:00
maxwell
6a695479f7 adding updated jquery UI for compatability 2010-11-16 23:58:16 -08:00
danielvincent
ed50fe7f1f Aspect.people -> Aspect.contacts. Fixed diaspora.en to reflect friend -> contact changes. 2010-11-12 20:22:56 -08:00
danielvincent
aa9966ea26 removed the word friend everywhere minus translation files 2010-11-12 20:22: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
Sarah Mei
a39bd2badb AspectsController#manage now works if you have pending friend requests. 2010-11-10 12:05:28 -07:00
maxwell
f7cc01ceb2 more work done. much more to go 2010-11-09 15:29:43 -08:00
maxwell
034d7ee2b1 first commit 2010-11-09 15:29:43 -08:00
maxwell
091d98ea15 invite friends actually calls up the invite friends pane on all aspects 2010-11-08 18:00:36 -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
f594fa1d80 Stream is its own partial, which takes a collection of posts 2010-11-07 10:38:00 -08:00
danielvincent
020cd90341 aspect labels on people#show view 2010-11-06 11:09:11 -07:00
danielvincent
ecfcc96f8e Post a message to aspect dialog will only display if people are present. 2010-11-05 21:14:00 -07:00
danielvincent
1a481d43d2 Use _stream_element.haml as a wrapper for posts in the stream. 2010-11-05 17:40:28 -07:00
Raphael
1bba4c60f7 Merge remote branch 'MrZYX/untranslated-strings' 
Conflicts:
	app/views/aspects/manage.html.haml
	config/locales/diaspora/en.yml
 2010-11-04 20:05:57 -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
MrZYX
63a5fdb000 made a bunch of strings translatable 2010-11-04 20:49:50 +01:00
danielvincent
82c82b8ccc killed albums 2010-11-04 10:17:19 -07:00
danielvincent
3e001c74d6 Albums#index hidden from views. Photos must be accessed through a person. 2010-11-03 12:21:14 -07:00
Hexagon
bba3aaa684 Translating a huge amount of untranslated strings 2010-10-30 15:25:42 +02:00
danielvincent
a0d83e28a1 copy in manage page by clicking 'add a new friend' for now 2010-10-28 11:28:58 -07:00
danielvincent
dc89d984f1 put remove buttons on incoming requests, allowing a user to ignore again. 2010-10-27 18:36:15 -07:00
ilya
c27f05ed42 Initial refactor done, need to stop mapping user.friends to people so much 2010-10-22 18:11:04 -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
ed4c253ea8 show pages now identify content with content creator. publisher now takes a local 2010-10-22 15:32:41 -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
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
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
b218a53bf7 fancyboxes have title bars now, kind of. 2010-10-19 14:06:44 -07:00
danielvincent
0621aa2f6c fixed no friends/posts message positioning 2010-10-19 12:28:54 -07:00
danielvincent
ea00d35f1f padding on stream fix. added add aspect button in aspect nav. 2010-10-19 12:10:22 -07:00
danielvincent
7e9585c5f0 default user picture change. stream link on all aspects page fix. layout view is not fragmented. 2010-10-19 11:29:29 -07:00
danielvincent
54e5fb4abb add new aspect back on manage page. changed badges 2010-10-18 11:00:52 -07:00
danielvincent
15104cf920 somewhat there 2010-10-18 11:00:52 -07:00
danielvincent
eca37e1a28 small view cleanups 2010-10-17 21:55:03 -07:00
danielvincent
5ca3570667 added prefetch rels to prev/next links in photo show. fixed shadow bug in header 2010-10-16 02:06:46 -07:00
maxwell
a61c126aad manage page now uses partial 2010-10-15 11:29:23 -07:00
Raphael
08e629668d I18ning empty_messages 2010-10-14 16:55:00 -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
danielvincent
750b4b4388 empty message re-appears if all stream posts are deleted 2010-10-14 15:40:34 -07:00
danielvincent
8daf2d0fd5 add none message to aspect#index 2010-10-14 15:23:15 -07:00
danielvincent
cf2a4c25ae DG RS; remove empty message from stream upon adding something 2010-10-14 15:19:37 -07:00
danielvincent
5722f85c85 message in aspect if stream is empty 2010-10-14 15:00:47 -07:00
danielvincent
32a0f60a2f moved photos link to the side bar for now 2010-10-14 14:38:19 -07:00
ilya
36b9f66f60 the invited user keeps track of who invited them, limit on invites, 
removed the invites controller test
 2010-10-13 16:52:33 -07:00
danielvincent
be017bfb0a DG MS; invite is now a lightbox on feed and manage pages 2010-10-11 14:16:24 -07:00
danielvincent
afad554f01 DG MS; added link to send invitation, consolidated locale file for devise invitable, upgraded devise to 1.1.3 in the gemfile 2010-10-11 13:42:05 -07:00
danielvincent
44338a9897 removed traces of :public 2010-10-08 14:44:56 -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
Raphael
d7bbb66d27 Run whitespace:cleanup 2010-10-07 10:47:37 -07:00
ilya
d41b370630 removing the fb feed for now 2010-09-27 16:20:27 -07:00
ilya
08b9aa864a Merge branch 'master' of github.com:diaspora/diaspora into fb 
Conflicts:
	app/views/layouts/application.html.haml
	app/views/shared/_publisher.haml
	app/views/shared/_sub_header.haml
	app/views/users/edit.html.haml
	config/deploy_config.yml
	config/routes.rb
 2010-09-27 15:39:50 -07:00
Dorian
e792344c0e Use improved whitespace:scrub_gratuitous_newlines 2010-09-26 12:52:39 -04:00
Dorian
6ffc03a4c9 Big clean up: delete trailing whitespace 2010-09-26 12:48:40 -04:00
ilya
e414558f79 passing the right things to the partial 2010-09-24 15:52:29 -07:00
ilya
c7757a302c typo 2010-09-24 15:06:48 -07:00
ilya
ac9854596f fb_status partial rendered in public 2010-09-24 15:04:31 -07:00
ilya
11dc225311 removed the old publish box 2010-09-23 17:19:43 -07:00
ilya
be10681945 IZ tying the publisher to fb in public aspect 2010-09-23 16:06:55 -07:00
ilya
5857838a0a adding the new files 2010-09-23 12:29:00 -07:00
Raphael
cc3819c256 Forgot a merge conflict 2010-09-22 21:39:22 -07:00
Raphael
2489f8503f Merge branch 'master' into HEAD 
Conflicts:
	app/controllers/albums_controller.rb
	app/controllers/aspects_controller.rb
	app/controllers/photos_controller.rb
	app/controllers/registrations_controller.rb
	app/controllers/requests_controller.rb
	app/helpers/dashboards_helper.rb
	app/views/albums/show.html.haml
	app/views/aspects/manage.html.haml
	app/views/shared/_aspect_nav.haml
	app/views/shared/_sub_header.haml
	app/views/status_messages/_status_message.html.haml
	app/views/status_messages/show.html.haml
	config/locales/de.yml
	config/locales/en.yml
	config/locales/es.yml
	config/locales/fr.yml
 2010-09-22 21:32:03 -07:00
danielvincent
e588d7ab6a DG IZ moving friends is now ajaxy 2010-09-20 17:26:20 -07:00
danielvincent
40c96fc619 DG IZ; click to edit rollover text on aspect manage page 2010-09-20 15:53:56 -07:00
Ariel Zavala
6501974f30 added more translations missing on views 2010-09-21 01:43:54 +08:00
Ariel Zavala
e9f74675e9 Merged with diaspora; fixed conflicts; only 2 red 2010-09-19 11:16:00 -04:00
danielvincent
cc4e9f8d39 description text for all boxes in manage page. search box text defaults to query on people#index. 2010-09-18 17:56:26 -07:00
Ariel Zavala
375f4f6808 added more translations missing on views 2010-09-17 10:43:59 -04:00
Ariel Zavala
0be3314e0a merge with diaspora and resolved a conflict 2010-09-16 20:42:45 -04:00
danielvincent
95a4120e57 DG IZ; dropzones on left back on aspect manage page. 2010-09-16 17:22:42 -07:00
danielvincent
0c7ba49e34 DG IZ; aspect deletion 2010-09-16 16:03:18 -07:00
Ariel Zavala
be9ae343cc Added localizations that I had missed 2010-09-16 15:55:54 -04:00
Ariel Zavala
443b5af4ce Added localization to aspect views 2010-09-16 14:57:56 -04: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
4a86632cf3 show default user photos for requests 2010-09-14 20:47:21 -07:00
Daniel Vincent Grippi
f2c6e7b820 made group manage a little nicer 2010-09-14 20:35:30 -07:00
Daniel Vincent Grippi
24cd518f11 DG, RS; Album creation no longer ejects you from context 2010-09-14 11:00:16 -07:00
Daniel Vincent Grippi
da8ec589b7 RS, DG; display the correct tab on manage, change edit to manage 2010-09-14 10:05:59 -07:00
Daniel Vincent Grippi
b49eaa1ceb minor visual tweaks 2010-09-13 20:51:27 -07:00
Daniel Vincent Grippi
0782e0b199 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-13 19:54:56 -07:00
Daniel Vincent Grippi
aa5447f553 Albums are now created within a context 2010-09-13 19:39:51 -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
c059069144 albums don't show publisher, refactored css 2010-09-13 17:57:30 -07:00
Daniel Vincent Grippi
1b92bcd17c Add albums_by_aspect method to user 2010-09-13 17:26:24 -07:00
Daniel Vincent Grippi
2fae1049d9 silent comments in all views except the layout and session wall 2010-09-13 15:11:14 -07:00
Daniel Vincent Grippi
40ecf176e8 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-13 14:26:15 -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
maxwell
24d957cb32 MS IZ removed the views and redirected the edit route 2010-09-13 12:20:47 -07:00
Raphael
aa0a00d9cb Finish moving to aspects, DB reset required 2010-09-13 11:15:08 -07:00
Raphael
9837340eb2 Rename files from group to aspect 2010-09-13 10:43:15 -07:00