MrZYX
a2715ca963
fixed migration naming, fixed translation
2011-03-20 23:00:56 +01:00
danielgrippi
55ac4c8054
show tags under names in people partials
2011-03-16 17:46:09 -07:00
danielgrippi
a85b5bb70f
add a people count on tag page
2011-03-16 17:27:27 -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
danielgrippi
c608c70ca7
tagging profiles complete
2011-03-15 13:21:36 -07:00
MrZYX
ed8d4db3a8
some reformatting/refactor of en.yml. This might break some translations but I think I've catched the most ones, at least the most important ones
2011-03-12 03:27:28 +01:00
MrZYX
dc7a672d9f
fixed some translations
2011-03-09 22:46:58 +01: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
Raphael Sofaer
770091e82b
Don't retrieve all the user's contacts again unnecessarily
2011-03-02 12:11:25 -08:00
MrZYX
ab706f4127
fixed sort by css for languages different from english
2011-02-20 19:00:13 +01:00
MrZYX
77cac72ed5
fixed #306
2011-02-20 13:34:22 +01:00
MrZYX
aa6ac41d68
remeber sort order
2011-02-19 17:06:26 +01:00
MrZYX
124ac738ea
'sort by:'translatable
2011-02-19 11:39:28 +01:00
zhitomirskiyi
61dd5a835a
default scope on contact
2011-02-18 17:38:02 -08:00
maxwell
43f17b3ed8
made toggle for post time on aspects#index
2011-02-18 16:47:44 -08:00
maxwell
3c8a87783f
stream order can take created at to be sorted by origin post time
2011-02-18 16:07:22 -08:00
maxwell
c6eb5d0340
IZ MS; refactored aspect_membership_controller, moved and updated views accordingly
2011-02-17 18:05:21 -08:00
danielvincent
fc9d9a4c55
make the invite friends dialog more obvious
2011-02-17 15:58:37 -05:00
Raphael Sofaer
056bebd4f4
Autocompletion contacts now change with changing aspect selection
2011-02-09 16:07:25 -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
maxwell
1ed737c3b9
make aspects a link, and remove a big db query from the view
2011-02-03 16:15:51 -08: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
b89a59ca55
update timeago usages
2011-01-29 13:30:32 -08:00
Dan Hansen
0831ad6e40
move i18n.loadLocale to the application template, remove localize controller & helper, renamed localize to get_javascript_strings_for and added it to the application helper
2011-01-29 13:29:54 -08:00
Dan Hansen
3078156dbb
javascript i18n wip
2011-01-29 13:28:43 -08:00
danielvincent
e3f4ae1cc7
fixed button styling
2011-01-28 17:42:04 -08:00
zhitomirskiyi
3ebda174fb
make aspect list visible option on new_aspect pane
2011-01-27 13:41:23 -08:00
zhitomirskiyi
dcf6469ded
visible contacts option on aspect edit pane
2011-01-27 13:41:22 -08:00
Raphael
94ae7a678b
Placeholder views for contacts_visible in aspects
2011-01-27 13:41:22 -08:00
zhitomirskiyi
4fb271b3bb
removed the aspect settings
2011-01-26 18:42:57 -08:00
zhitomirskiyi
1bb5f9f983
only allow invites if invite count > 0 for current user
2011-01-26 18:08:57 -08:00
zhitomirskiyi
bc81154c46
consolidated invite/invite friends sections on aspect/index
2011-01-26 18:05:42 -08:00
zhitomirskiyi
8941448866
placed friend finder in facebox. added translations
2011-01-26 17:44:40 -08:00
zhitomirskiyi
8bc52cdb55
facebook friend finder gathers fb friends.
2011-01-26 12:16:46 -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
maxwell
1b3c58c2c2
Use a fake to not allocate an AR model for every reference to a person
2011-01-24 15:13:52 -08:00
zhitomirskiyi
2c230fb80d
added menu notifications page aspect name header.
2011-01-24 12:23:52 -08:00
danielvincent
39c5189c1f
everything ported from pre-mysql mobile stuff. things missing: search page, aspect switcher, notification badge.
2011-01-24 12:22:17 -08:00
danielvincent
77042f9d47
publisher always shows textarea. outline publisher textarea in blue
2011-01-22 18:49:50 -08:00
Raphael
2c68bb0305
Remove n-query problem from contact_list
2011-01-19 18:06:35 -08:00
maxwell
cd92b1dccb
put timeago in document ready, not outside
2011-01-19 16:18:10 -08:00
danielvincent
4b74796c07
16 pictures on aspect listings
2011-01-19 16:06:35 -08:00
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 .
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