ilya
324f14c719
setting the token to nil on accept of invite
2010-10-12 18:23:59 -07:00
ilya
bb7e2a9918
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-11 14:58:22 -07:00
ilya
007f6cfb6f
close account
2010-10-11 14:58:11 -07:00
danielvincent
afad554f01
DG MS; added link to send invitation, consolidated locale file for devise invitable, upgraded devise to 1.1.3 in the gemfile
2010-10-11 13:42:05 -07:00
danielvincent
9bfb213465
Merge branch 'invites' of github.com:diaspora/diaspora into invites
2010-10-11 11:52:57 -07:00
Alec Leamas
0c30f544d9
Fallback to static version data if git unavailable.
...
Uses the file config/gitversion if git is unavailable. This is to
support deployment without git (which will be necessary). Installation
script will generate the file config/gitversion when app is shipped.
2010-10-10 16:38:01 +02:00
ilya
ef3e627bed
the users are now made with people
2010-10-08 15:40:42 -07:00
Nick van der Burgt
09b38bb726
Added dutch locale
2010-10-08 09:11:04 +02:00
ilya
9a34ca07c4
Merge branch 'master' of github.com:diaspora/diaspora into invites
2010-10-07 19:25:42 -07:00
ilya
ddb98502b9
setup the controller, still need to make the person
2010-10-07 19:25:34 -07:00
danielvincent
75aadc5c57
DG MS; cleaned up routes, killed all deprication warnings in everything. totally legit.
2010-10-07 18:25:59 -07:00
ilya
4ecda6ab8f
Merge branch 'master' of github.com:diaspora/diaspora into invites
...
Conflicts:
Gemfile
Gemfile.lock
2010-10-07 18:20:51 -07:00
danielvincent
c756e1a331
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-07 18:17:38 -07:00
danielvincent
2e73104d6f
DG MS; updated BSON gems, added devise-mongomapper gem fix, using unforked devise 1.1.2
2010-10-07 18:17:26 -07:00
Raphael
399e437655
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-07 17:34:03 -07:00
Raphael
2bb36a266a
Merge remote branch 'minilibra/master'
2010-10-07 17:32:20 -07:00
ilya
c75a2ebd66
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-07 17:00:52 -07:00
ilya
97f058c625
moving to app config yml
2010-10-07 17:00:38 -07:00
danielvincent
7a56d82873
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-07 16:56:22 -07:00
danielvincent
4deea95057
DG MS; export photos button in users#edit
2010-10-07 16:56:10 -07:00
ilya
ad348ed24c
trying the mailer_condig
2010-10-07 16:54:38 -07:00
ilya
9c59adee51
in dev env as well
2010-10-07 16:48:49 -07:00
ilya
487637d5a3
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-07 16:42:49 -07:00
ilya
f022c2d8bd
correct smtp server
2010-10-07 16:42:39 -07:00
Raphael
1fd3aeabd9
Add or later to license notice
2010-10-07 16:25:34 -07:00
ilya
720d1daa9e
moved the mailer settings back into env
2010-10-07 15:40:18 -07:00
ilya
8fae836b65
isolating the problem
2010-10-07 15:28:58 -07:00
ilya
e174722315
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-07 15:06:03 -07:00
ilya
43600905dc
trying making the port an int
2010-10-07 15:05:52 -07:00
Raphael
6dbe429ed1
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-07 15:02:37 -07:00
Raphael
a01a059293
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-07 14:47:32 -07:00
danielvincent
efcd0c418d
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-07 14:47:31 -07:00
danielvincent
bd9e9043e0
fixed nb locale
2010-10-07 14:37:38 -07:00
ilya
7aa49b277c
moved the smtp setting to intializers
2010-10-07 14:36:08 -07:00
Raphael
9646a453a1
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-07 14:34:57 -07:00
ilya
c036e63289
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-07 14:27:38 -07:00
ilya
2a104ea622
Revert "moved the SMTP setting into app_config.yml"
...
This reverts commit 2451ac4957
2010-10-07 14:26:59 -07:00
danielvincent
1a8d4a603f
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-07 14:22:10 -07:00
danielvincent
8f1973815e
DG MS; added route for exported xml
2010-10-07 14:21:53 -07:00
ilya
2451ac4957
moved the SMTP setting into app_config.yml
2010-10-07 14:20:31 -07:00
Raphael
9912769b5b
Merge remote branch 'guillei/s3_upload'
2010-10-07 14:17:43 -07:00
ilya
8352a7cf95
Merge branch 'master' of github.com:diaspora/diaspora
...
Conflicts:
config/routes.rb
2010-10-07 14:04:31 -07:00
ilya
7ecc94d7b2
added the password route to make email reset password work
2010-10-07 14:03:18 -07:00
minilibra
ae6f39a0d0
Localization file for Indonesian added. Change "en" at the top of both files to "id". Thanks to rsofaer.
2010-10-08 02:09:13 +07:00
Raphael
e47aa90b15
Merge remote branch 'Stigjb/master'
2010-10-07 11:06:27 -07:00
Raphael
6ae6d20e4f
Merge remote branch 'crimer/master'
2010-10-07 10:57:51 -07:00
Raphael
d7bbb66d27
Run whitespace:cleanup
2010-10-07 10:47:37 -07:00
Raphael
0831812e97
Merge remote branch 'kashif/master'
2010-10-07 10:41:50 -07:00
Raphael
f078bd0a54
Merge remote branch 'leamas/perm-fix'
2010-10-07 10:09:29 -07:00
Raphael
b6a3549693
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-07 09:37:00 -07:00
