maxwell
120c07ddf5
Merge branch 'master' of github.com:diaspora/diaspora
2011-01-19 16:04:54 -08:00
maxwell
35432880b2
adding timeago when the inf. scroll is involked
2011-01-19 16:04:46 -08:00
Raphael
f35f0212dd
Show the right contacts
2011-01-19 15:54:49 -08:00
zhitomirskiyi
122f182a4c
limit to 16 in the view
2011-01-19 15:52:52 -08:00
MrZYX
7f8ee17b40
pass @contacts to partial in aspects/index.js.erb
2011-01-19 21:09:06 +01:00
zhitomirskiyi
004094d66f
fixed the querying in the controllers got rid of hashes
2011-01-18 16:21:14 -08:00
Dan Hansen
ce4fe1938c
remove references to fancybox, we use facebox
2011-01-13 00:24:10 -06:00
maxwell
c832201bd9
remove trailing bracket from aspects#edit pane
2011-01-12 11:00:22 -08:00
MrZYX
137cde185f
unscope contacts
2011-01-12 16:03:19 +01:00
MrZYX
1319099cf3
made some strings translatable
2011-01-12 15:58:10 +01: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
cadba3f2b7
fixed specs with a reload. added header gradient for firefox
2011-01-08 13:11:55 -08:00
danielvincent
c5e0c616b5
share with pane styles fixed
2011-01-08 13:11:54 -08:00
danielvincent
c74dc120df
fixed all cucumber tests
2011-01-08 13:11:54 -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
2e472ded94
new notification/request text on aspects/index
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
5358ac32a1
photos can be posted to multiple aspects. header nav works from pages other than aspect/index.
2011-01-08 13:11:52 -08:00
danielvincent
0a07dd16b5
posts are properly socketed on filtered streams
2011-01-08 13:11:52 -08:00
danielvincent
b029475421
aspects now have edit pages accessible through the top nav
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
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
8074e481a3
stream fix on aspects/show
2011-01-06 13:51:59 -08:00
Raphael
8d5dc5d27b
Merge remote branch 'tomk/ui-cosmetics'
2011-01-04 16:02:11 -08:00
Raphael
6102217a88
Don't display the invitations link unless the user has invitations, thanks Pasta
2011-01-04 15:59:53 -08:00
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
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
