zhitomirskiyi
|
27f1231479
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2011-02-01 12:11:49 -08:00 |
|
zhitomirskiyi
|
181bd823c4
|
Merge branch 'open-aspects'
|
2011-02-01 12:10:12 -08:00 |
|
zhitomirskiyi
|
55403d9bea
|
the saved aspects works properly now
|
2011-02-01 12:07:18 -08:00 |
|
Raphael
|
7d18e2bcd8
|
Finish autocomplete
|
2011-02-01 11:56:56 -08:00 |
|
Raphael
|
518642d0d7
|
Move image_url defaulting logic into profile
|
2011-02-01 11:56:56 -08:00 |
|
Dan Hansen
|
cdb5cf37e7
|
show publisher if it was closed when you select another aspect
|
2011-02-01 00:40:11 -06:00 |
|
Raphael
|
c56eaadfa0
|
Make person profile a little bit aware of an incoming request
|
2011-01-31 15:47:01 -08:00 |
|
Raphael
|
e3a5102624
|
incoming request on person show should just link to share_with
|
2011-01-31 15:28:43 -08:00 |
|
Raphael
|
906de27922
|
Make notifications/read_all non-ajax, link back to index page
|
2011-01-31 15:28:43 -08:00 |
|
zhitomirskiyi
|
d6ab633e2c
|
Merge branch 'notification-migration'
|
2011-01-31 14:41:15 -08:00 |
|
MrZYX
|
391a9b0de5
|
translate contacts in _header.haml
|
2011-01-31 19:48:36 +01:00 |
|
zhitomirskiyi
|
cfef9a747e
|
all green
|
2011-01-30 20:10:34 -08:00 |
|
zhitomirskiyi
|
17a2c9e311
|
moving over some code migration successful
|
2011-01-29 23:34:11 -08:00 |
|
maxwell
|
348ae0b61d
|
small hack to add some feedback when links are tapped on the mobile site.
|
2011-01-29 18:42:50 -08: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 |
|
Raphael
|
07850c7cb2
|
fix fb finder, flesh out test
|
2011-01-28 17:13:20 -08:00 |
|
Raphael
|
8151f3b540
|
correct partial name
|
2011-01-28 16:54:30 -08:00 |
|
Raphael
|
7339e46bfb
|
Moving remote friend view out to a partial
|
2011-01-28 16:42:43 -08:00 |
|
zhitomirskiyi
|
a8ac403e30
|
share with action for people who are already on diaspora
|
2011-01-28 16:37:11 -08:00 |
|
Raphael
|
767e58bf94
|
Correct email picture url
|
2011-01-28 11:43:15 -08:00 |
|
zhitomirskiyi
|
ced2c18da1
|
remove caching the footer due to localization issues
|
2011-01-27 14:17:50 -08:00 |
|
zhitomirskiyi
|
f5ad03f5d9
|
added visiblity for new aspect on getting started
|
2011-01-27 13:58:59 -08:00 |
|
zhitomirskiyi
|
897786bce4
|
able to send email invites if the pod is not fb connected
|
2011-01-27 13:53:53 -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 |
|
Raphael
|
31e4683183
|
Finished contacts of contacts for local users
|
2011-01-27 13:41:22 -08:00 |
|
MrZYX
|
86ab893a63
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2011-01-27 21:04:12 +01:00 |
|
MrZYX
|
cbfefc8fc3
|
fixed some untranslatable strings, thanks to Nygu
|
2011-01-27 21:04:03 +01:00 |
|
zhitomirskiyi
|
0fa0b7e950
|
fixed syntax error in mobile layout. removed ipad from mobile_fu
|
2011-01-27 11:30:15 -08:00 |
|
MrZYX
|
14f4e1aa57
|
some fixes to the translations of the mobile site
|
2011-01-27 18:20:25 +01:00 |
|
MrZYX
|
eba99c84ba
|
made 'mark all as read' translatable
|
2011-01-27 17:13:27 +01:00 |
|
zhitomirskiyi
|
0ba9889025
|
removed bug in finder view
|
2011-01-26 18:50:02 -08:00 |
|
zhitomirskiyi
|
2b8635f0aa
|
hide share request button for people already on diaspora in friend finder (for now)
|
2011-01-26 18:44:17 -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
|
9bd6b11ddf
|
made facebox wider, remove disable with, added default profile photo for those not connected to diaspora
|
2011-01-26 17:50:49 -08:00 |
|
zhitomirskiyi
|
8941448866
|
placed friend finder in facebox. added translations
|
2011-01-26 17:44:40 -08:00 |
|
zhitomirskiyi
|
a610618057
|
display resend link if already sent invitation in friend finder
|
2011-01-26 16:57:39 -08:00 |
|
zhitomirskiyi
|
9e22f4a6e6
|
checks if you already invited the person
|
2011-01-26 16:31:34 -08:00 |
|
zhitomirskiyi
|
1a911a8b99
|
translation of invitation message, better checking of existing users and unique index on user(invitation_service and invitation_identifier)
|
2011-01-26 16:01:57 -08:00 |
|
zhitomirskiyi
|
ab41a5f24a
|
friend finder has invite buttons and aspect dropdowns
|
2011-01-26 13:03:53 -08:00 |
|
zhitomirskiyi
|
e56ba84094
|
friend finder basic styling
|
2011-01-26 12:16:47 -08:00 |
|
zhitomirskiyi
|
cf45f31712
|
facebook friend finder is now contact-aware
|
2011-01-26 12:16:47 -08:00 |
|
zhitomirskiyi
|
d976bf0966
|
fixed bug in facebook service finder
|
2011-01-26 12:16:46 -08:00 |
|
zhitomirskiyi
|
f3f38cf4fd
|
fetch person object associated with facebook id in friend finder
|
2011-01-26 12:16:46 -08:00 |
|