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 |
|
Raphael
|
b67aca0ffc
|
Put in a lot of non nullable fields, edit the specs to match, drop a couple superfluous columns
|
2011-01-26 18:29:23 -08:00 |
|
zhitomirskiyi
|
a037575ebc
|
added invites in the tests
|
2011-01-26 18:14:17 -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
|
49f5f15b98
|
properly call translations in services controller
|
2011-01-26 17:02:07 -08:00 |
|
zhitomirskiyi
|
a610618057
|
display resend link if already sent invitation in friend finder
|
2011-01-26 16:57:39 -08:00 |
|
zhitomirskiyi
|
906dd8d6d4
|
added the migration
|
2011-01-26 16:32:51 -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 |
|
Paweł Wilk
|
1eb0d3bbab
|
Depends on the version 0.2.x of i18n-inflector-rails which has some improvements
|
2011-01-27 00:32:03 +01:00 |
|
zhitomirskiyi
|
6242ac64ed
|
removed unique index on email to a regular index in order to make inviting users through fb work (no email present)
|
2011-01-26 15:04:46 -08:00 |
|
zhitomirskiyi
|
be57170bf9
|
added the empty email spec
|
2011-01-26 14:22:04 -08:00 |
|
zhitomirskiyi
|
8bc857cf4d
|
updated devise added a devise_invitable fork and performed migration
|
2011-01-26 13:46:50 -08:00 |
|
zhitomirskiyi
|
ab41a5f24a
|
friend finder has invite buttons and aspect dropdowns
|
2011-01-26 13:03:53 -08:00 |
|
zhitomirskiyi
|
89a8817ce6
|
made service#invite redirect to the right place
|
2011-01-26 12:16:48 -08:00 |
|
zhitomirskiyi
|
3392f11b64
|
Job::InviteUser -> Job::InviteUserByEmail
|
2011-01-26 12:16:48 -08:00 |
|
zhitomirskiyi
|
5c5e450a1e
|
Invitation.new_or_existing_user_by_email -> Invitation.new_or_existing_user_by_service_and_identifier
|
2011-01-26 12:16:47 -08:00 |
|
zhitomirskiyi
|
a92d5f41c9
|
added the migration to invitation_service and invitation_identifier
|
2011-01-26 12:16:47 -08:00 |
|
zhitomirskiyi
|
d595a64169
|
new interface to send invitation WIP
|
2011-01-26 12:16:47 -08:00 |
|
zhitomirskiyi
|
b3467b5d17
|
pending specs for facebook inviter
|
2011-01-26 12:16:47 -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 |
|
zhitomirskiyi
|
8bc52cdb55
|
facebook friend finder gathers fb friends.
|
2011-01-26 12:16:46 -08:00 |
|
Raphael
|
e890d73de7
|
Remove mocha
|
2011-01-26 11:52:14 -08:00 |
|
Raphael
|
f9fbb63ecb
|
Make 'not sharing' a button, eliminate xss in alert
|
2011-01-26 11:26:14 -08:00 |
|