Raphael
d753e31205
Merge remote branch 'ed0h/309-user-choose-language'
...
Add explicit language set to spec in users_controller_spec.rb
Conflicts:
app/models/user.rb
2010-10-29 12:06:14 -07:00
maxwell
47a9b2d189
switching deploy branch to master
2010-10-29 11:39:28 -07:00
maxwell
1e349e6a61
last time
2010-10-29 11:16:50 -07:00
maxwell
1b48572674
MS tests are now green
2010-10-29 11:16:50 -07:00
maxwell
fdb169558a
dont restart servers after db:reset
2010-10-29 11:16:11 -07:00
maxwell
493969e458
trying a timer
2010-10-29 11:16:11 -07:00
maxwell
07b2e7e227
omg i was deploying the wrong branch for the past two hours
2010-10-29 11:15:14 -07:00
maxwell
d89cb53e26
pumping up the zombie sleep to allow for mail to get send out .
2010-10-29 11:13:42 -07:00
maxwell
eddcb71fcb
EM websocket cleanly merged with master. webfingering is now async
2010-10-29 11:11:05 -07:00
maxwell
53e9df5455
pumping up the zombie sleep to allow for mail to get send out .
2010-10-29 11:05:18 -07:00
maxwell
8fe339b03b
EM websocket cleanly merged with master. webfingering is now async
2010-10-29 11:05:17 -07:00
danielvincent
2b4e3e3a41
a person now has a photos#index page.
2010-10-29 10:38:17 -07:00
Alec Leamas
94327264d4
Comments on Swedish diaspora terms, trailing blanks killed
2010-10-29 11:11:56 +02:00
Hexagon
09fb02ec9f
modified: config/locales/diaspora/sv.yml
2010-10-29 00:55:27 +02:00
livefromthemoon@gmail.com
52522c102e
add some basic verification when loading the languages config file
2010-10-28 18:09:25 +02:00
livefromthemoon@gmail.com
c4d8f4e587
remove two useless lines of code
2010-10-28 17:38:45 +02:00
livefromthemoon@gmail.com
b7a586b1a5
allow user to change his language in his settings
2010-10-28 17:29:17 +02:00
danielvincent
1d5b7a87f1
Merge branch 'master' into getting-started
2010-10-27 18:14:08 -07:00
danielvincent
cd726c0ba7
users#getting_started route -> getting_started. getting_started is now a mini-template referring to partials in users/getting_started/
2010-10-27 12:21:25 -07:00
Raphael
16e455958c
Merge remote branch 'hexagon/se-localization'
2010-10-27 11:08:06 -07:00
Raphael
f700eb537a
Add activemodel error message for person to en and fr locales
2010-10-27 10:27:30 -07:00
zhitomirskiyi
634538eff3
IZ MS change back deploy config
2010-10-27 10:13:04 -07:00
zhitomirskiyi
63c740fce7
Merge branch 'master' of github.com:diaspora/diaspora into contact-refactor
2010-10-27 09:53:50 -07:00
danielvincent
a8086f2990
further refinements. added back buttons, more explanation text.
2010-10-26 23:27:26 -07:00
zhitomirskiyi
21c75c08bb
removed the http inspect
2010-10-26 19:19:34 -07:00
zhitomirskiyi
c4b79aebc0
mongo query profing
2010-10-26 18:42:53 -07:00
zhitomirskiyi
0b2e00b7d6
MS IZ the mailer will not be setup unless turned on in the APP_CONFIG
2010-10-26 17:46:19 -07:00
danielvincent
385e1673ab
Merge branch 'master' into getting-started
...
Conflicts:
app/controllers/users_controller.rb
app/views/users/_account.haml
app/views/users/_profile.haml
2010-10-26 16:50:57 -07:00
Raphael
f975199f19
Merge remote branch 'mael/fr-locales'
2010-10-26 16:40:50 -07:00
danielvincent
6e015790a7
settings are more restful with account settings submitting to users#update, and profile settings submitting to person#update
2010-10-26 16:02:53 -07:00
zhitomirskiyi
c0c8c6253c
added a logging line for debugging
2010-10-26 15:13:16 -07:00
danielvincent
69b1b71a5d
removed javascript slider. made each getting_started section its own page. added bio to profile (and changed xml_accessors to xml_readers).
2010-10-26 13:04:47 -07:00
danielvincent
278a74f1f9
draft
2010-10-26 13:04:46 -07:00
maxwell
a992c5fbc2
dont show service if you dont have the keys for it. also, update deploy script
2010-10-25 22:06:53 -07:00
Sarah Mei
33410899d9
Fix for build breakage
2010-10-25 21:38:53 -07:00
danielvincent
a1d00d41e5
deploys back to master
2010-10-25 19:33:23 -07:00
danielvincent
6ff94e67b3
remove unused fb_config.yml files. removed oauth_keys.yml from git, updated .example"
2010-10-25 17:50:04 -07:00
danielvincent
b2e8ebd0bc
OmniauthService -> Service. Cleaned up views.
2010-10-25 17:41:59 -07:00
danielvincent
3d302f8db7
facebook and twitter both use omniauth and are saved as OmniauthServices
2010-10-25 17:41:59 -07:00
maxwell
c489f49a25
DG beginning to collapse twitter&facebook
2010-10-25 17:41:58 -07:00
maxwell
c4ff07b09a
twitter oauth dance complete
2010-10-25 17:41:58 -07:00
Hexagon
1382bd9d08
Fixed header in swedish translation
2010-10-25 21:45:43 +02:00
Hexagon
d617392108
Added/complemented swedish translation
2010-10-25 21:41:32 +02:00
maelsoucaze
14ac908c3d
French localizations updates.
2010-10-25 00:06:05 +02:00
maelsoucaze
294c8849b9
Merge remote branch 'upstream/master' into fr-locales
2010-10-25 00:04:24 +02:00
ilya
b337d5acc9
delivery method test in tests
2010-10-22 16:36:54 -07:00
ilya
47b03c45b2
commented out the email interceptor
2010-10-22 10:37:04 -07:00
maxwell
5701c3a873
should send the email when a new request is received. emails in dev should be intercepted to email@joindiaspora.com for now
2010-10-22 00:49:01 -07:00
MrZYX
5fa623552d
made smtp sender address configurable
2010-10-21 19:47:30 +02:00
maxwell
bc9c852e25
fixed translation showing en on person show page when the person had no posts
2010-10-20 17:52:07 -07:00
ilya
6fa82490c9
remove friend from aspect box, with js call to remove the person from the aspect
2010-10-20 17:34:52 -07:00
ilya
94a7a3c6ad
IZ MS; deleted move_friends removed
2010-10-20 14:26:45 -07:00
Alec Leamas
03f637eca9
Polishing up after git mess...
2010-10-20 22:05:42 +02:00
Joseph Method
4b588ccefb
Addresses [ #380 ] and [ #239 ] by handling the errors from bad identities
2010-10-19 23:44:43 -04:00
Raphael
9309be2d69
Merge branch 'import'
...
Conflicts:
spec/models/user/invite_spec.rb
2010-10-19 16:06:48 -07:00
danielvincent
0621aa2f6c
fixed no friends/posts message positioning
2010-10-19 12:28:54 -07:00
danielvincent
ea00d35f1f
padding on stream fix. added add aspect button in aspect nav.
2010-10-19 12:10:22 -07:00
Alec Leamas
fcd70ce152
Add a configuration file
...
Adds a config file with environment and default thin
options
2010-10-19 08:26:43 +02:00
ilya
d642928268
invite sends friend request if already friends, and raises if already friends
2010-10-18 16:27:02 -07:00
Joseph Method
e3e4a6b319
Continuation of previous commit
2010-10-17 19:07:54 -04:00
Sarah Mei
f688653936
disallow whitespace in username
2010-10-16 23:34:58 -07:00
Sarah Mei
d25847a626
Error message for duplicate email; add email validation spec.
2010-10-16 22:46:13 -07:00
Sarah Mei
83b23a0ffe
Error message for duplicate username; refactor User validation specs.
2010-10-16 22:36:26 -07:00
maelsoucaze
34b21e7543
French localization updates.
2010-10-16 17:19:19 +02:00
danielvincent
db31357172
another typo change
2010-10-15 11:16:04 -07:00
danielvincent
d18b59f3d3
typo fix
2010-10-15 11:12:12 -07:00
maxwell
341009e20f
Merge branch 'master' of github.com:diaspora/diaspora into maxwell
...
Conflicts:
Gemfile
Gemfile.lock
spec/models/user/invite_spec.rb
2010-10-14 23:02:06 -07:00
Raphael
0680c2b5a6
Merge remote branch 'maelsoucaze/fr-locales'
2010-10-14 17:43:27 -07:00
Raphael
ecc7a55f8b
Merge remote branch 'flea/master'
...
Conflicts:
.gitignore
2010-10-14 17:24:46 -07:00
Raphael
08e629668d
I18ning empty_messages
2010-10-14 16:55:00 -07:00
maelsoucaze
9134c4545c
Fixes and updates French (Informal Honorifics) localization.
2010-10-15 01:17:33 +02:00
maelsoucaze
753deedc65
Fixes and updates French (Formal Honorifics) localization.
2010-10-15 01:17:17 +02:00
danielvincent
32a0f60a2f
moved photos link to the side bar for now
2010-10-14 14:38:19 -07:00
maxwell
e218ab6780
Merge branch 'master' of github.com:diaspora/diaspora into import
...
Conflicts:
app/controllers/users_controller.rb
2010-10-13 23:09:48 -07:00
maxwell
04f6cdaacf
MS DG; basic view support; it works, but it is ugly
2010-10-13 18:42:24 -07:00
Volkan Unsal
241d104bc1
change en to tr
2010-10-13 21:10:36 -04:00
ilya
36b9f66f60
the invited user keeps track of who invited them, limit on invites,
...
removed the invites controller test
2010-10-13 16:52:33 -07:00
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
Volkan Unsal
73f06bb61b
add devise.tr.yml
2010-10-11 15:09:43 -04:00
danielvincent
9bfb213465
Merge branch 'invites' of github.com:diaspora/diaspora into invites
2010-10-11 11:52:57 -07:00
Volkan Unsal
6d00b2ca8a
correct some spelling errors in Turkish translation
2010-10-10 23:49:36 -04:00
Volkan Unsal
35ad703a5b
Merge branch 'master' of http://github.com/diaspora/diaspora
2010-10-10 23:09:19 -04:00
Volkan Unsal
633048fbed
finished Turkish translation
2010-10-10 23:06:56 -04: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
Crimer
56ed245db0
MongoMapper now not overrides database name in MONGOHQ_URL configuration if provided. It also works on Heroku.
2010-10-07 14:29:17 +00:00
Alec Leamas
0d51af0a13
Removing shebang on non-script.
2010-10-07 16:11:43 +02:00
ilya
131e905322
fixed the public route
2010-10-06 19:05:43 -07:00
Raphael
a315b489f1
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-06 18:19:38 -07:00
danielvincent
66b356b5fe
moved public route
2010-10-06 18:14:37 -07:00
Raphael
caffd8f9ff
Don't check for servers that aren't there
2010-10-05 17:58:48 -07:00
Raphael
79f19b6870
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-05 17:46:25 -07:00
Raphael
de9cdfbe7b
Always set the FACEBOOK constant
2010-10-05 17:46:14 -07:00
Yaron Shahrabani
77d5b68e15
Fixed some typos
2010-10-06 08:29:58 +08:00
Daniele Di Sarli
5074d2f8f2
Updated Italian translation
2010-10-06 08:25:29 +08:00
Raphael
22f90086ca
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-05 16:58:06 -07:00
Raphael
37fb2bfd32
Don't require a facebook yml
2010-10-05 16:57:22 -07:00
UserAd
1d0a4579f6
Add missing localization for aspect managment
2010-10-06 07:56:23 +08:00
UserAd
e7c153df4e
Add translation support in profile ('or' between buttons). Fix Russian locale
2010-10-06 07:56:23 +08:00
danielvincent
33e478229e
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-05 13:40:10 -07:00
danielvincent
f3c34692d8
pubsub support
2010-10-05 13:39:56 -07:00
ilya
45d40f27d9
changed the deploy config back to master
2010-10-05 13:06:55 -07:00
ilya
85f71aa4aa
added the deploy task to symlink the fb_config
2010-10-05 12:38:20 -07:00
ilya
82455981b8
added fb_config to gitignore
2010-10-05 12:21:33 -07:00
