danielvincent
|
ae8686ef25
|
add which_action_and_user to application_controller
|
2011-01-28 16:15:50 -08:00 |
|
Raphael
|
2dfb9f9618
|
remove unused method
|
2011-01-28 15:18:22 -08:00 |
|
zhitomirskiyi
|
c3a30bb481
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2011-01-28 13:46:33 -08:00 |
|
zhitomirskiyi
|
3b68fc3e9a
|
the friend finder is respecting of searchable
|
2011-01-28 13:45:58 -08:00 |
|
denschub
|
ba532536e3
|
Fixed bug in sod-thin.yml
|
2011-01-28 22:17:12 +01:00 |
|
denschub
|
9040d60977
|
Added mysql to deamontools-recipe
|
2011-01-28 22:17:12 +01:00 |
|
denschub
|
9001728772
|
Fixed bugs in nginx.conf-template
|
2011-01-28 22:17:12 +01:00 |
|
denschub
|
65d581770e
|
Added mysql-install
|
2011-01-28 22:17:12 +01:00 |
|
Raphael
|
ca76572eae
|
Include profile in services finder
|
2011-01-28 12:49:30 -08:00 |
|
Raphael
|
dde8fd65e5
|
Fix build
|
2011-01-28 12:18:56 -08:00 |
|
danielvincent
|
d04a8bff09
|
changes weren't added last commit
|
2011-01-28 12:04:24 -08:00 |
|
danielvincent
|
80fbfd77e8
|
socketed stream elements now don't come in as their mobile partial
|
2011-01-28 12:02:36 -08:00 |
|
Raphael
|
767e58bf94
|
Correct email picture url
|
2011-01-28 11:43:15 -08:00 |
|
Raphael
|
5967ce25fd
|
add spec for youtube_titles
|
2011-01-28 11:43:15 -08:00 |
|
zhitomirskiyi
|
3f42c5bdb9
|
fixed cucumber features
|
2011-01-28 11:26:08 -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 |
|
maxwell
|
0913389698
|
fix the null person ID bug in profile
|
2011-01-27 13:44:37 -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
|
a8306f9f37
|
don't select duplicate people
|
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 |
|
Raphael
|
a23290986a
|
add contacts_visible field in aspects
|
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 |
|
Raphael
|
a6f8b2c14e
|
Add splunk logging for errors
|
2011-01-27 11:44:35 -08:00 |
|
zhitomirskiyi
|
0fa0b7e950
|
fixed syntax error in mobile layout. removed ipad from mobile_fu
|
2011-01-27 11:30:15 -08:00 |
|
zhitomirskiyi
|
01ce26cbf3
|
fixed errror on services inviter action, specs
|
2011-01-27 10:58:09 -08:00 |
|
maxwell
|
a705824b0c
|
make invites default to 5 again
|
2011-01-27 10:36:02 -08:00 |
|
MrZYX
|
bd6617ea55
|
Merge branch 'added_feature_close_account' of https://github.com/jairodiaz/diaspora
|
2011-01-27 19:22:31 +01:00 |
|
MrZYX
|
cf0a090704
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2011-01-27 19:22:03 +01:00 |
|
zhitomirskiyi
|
62c8685154
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2011-01-27 10:19:52 -08:00 |
|
zhitomirskiyi
|
c997f6ee05
|
fix finder controller action
|
2011-01-27 10:19:38 -08:00 |
|
MrZYX
|
9230bf5fe1
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2011-01-27 19:06:54 +01:00 |
|
maxwell
|
644dfb0fd3
|
remove sass cache
|
2011-01-27 09:53:31 -08:00 |
|
Philip Champon
|
0588dafe6b
|
added enumeration to args and a spec to verify it
|
2011-01-27 12:46:02 -05:00 |
|
MrZYX
|
087e0389bb
|
Merge branch '712-route-for-login' of https://github.com/TomK32/diaspora
|
2011-01-27 18:38:51 +01:00 |
|
MrZYX
|
60c0c4dc76
|
Merge branch '819-checks-for-redis-conf-in-usr-local-etc' of https://github.com/Dorian/diaspora
Conflicts:
script/server
|
2011-01-27 18:29:18 +01:00 |
|
MrZYX
|
45c590a3bf
|
Merge branch 'fix_typo_at_default_language' of https://github.com/jairodiaz/diaspora
|
2011-01-27 18:27:23 +01:00 |
|
MrZYX
|
1c344f97f8
|
Merge branch 'fix-signin-button' of https://github.com/lfortin/diaspora
|
2011-01-27 18:25:50 +01: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 |
|
MrZYX
|
e9dddca86d
|
updated locales
|
2011-01-27 17:04:39 +01:00 |
|
Dan Goldenberg
|
30baff22ea
|
Added close_account feature and added scenarios to other features
|
2011-01-26 23:39:59 -08: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 |
|
Raphael
|
f892a00b99
|
Fix data conversion, fixture generation in publicscontroller
|
2011-01-26 18:39:09 -08:00 |
|