maxwell
|
06445901f8
|
IZ MS retrations for posts now green
|
2010-11-01 17:11:06 -07:00 |
|
Raphael
|
377cae8cba
|
Merge remote branch 'ed0h/i18n-fallbacks'
Conflicts:
pkg/ubuntu/dist
|
2010-11-01 15:57:43 -07:00 |
|
Raphael
|
41d839ecf4
|
Merge remote branch 'ecleel/master'
Conflicts:
pkg/ubuntu/dist
|
2010-11-01 15:39:38 -07:00 |
|
maxwell
|
3c16a46f0e
|
MS IZ updated the backer script to use aspects.create
|
2010-11-01 14:54:40 -07:00 |
|
Hexagon
|
1acc206fa4
|
#475: Fixed more untranslated strings
|
2010-11-01 22:22:13 +01:00 |
|
Hexagon
|
65419e423a
|
Added missing strings to swedish translation
|
2010-11-01 16:42:47 +01:00 |
|
J David Eisenberg
|
1a32766fb0
|
Issue #492: Informal, vague description when signing up as a new user
|
2010-11-01 16:42:47 +01:00 |
|
Curtis J Schofield
|
f693a97bf3
|
i put in a dash
|
2010-11-01 16:42:46 +01:00 |
|
Sarah Allen
|
fb145beb9a
|
Rails.env is a string, not a symbol
|
2010-11-01 16:42:46 +01:00 |
|
livefromthemoon@gmail.com
|
bbd0d35070
|
Fix some bugs for I18n fallbacks
|
2010-10-31 22:39:54 +01:00 |
|
livefromthemoon@gmail.com
|
9e27797092
|
Fallback to default language when a translation is missing for the current language
|
2010-10-31 22:39:54 +01:00 |
|
livefromthemoon@gmail.com
|
cf82a0a9c8
|
Better to set the default locale in an initializer than in a before_filter
|
2010-10-31 22:39:54 +01:00 |
|
Abdulaziz Al-Shetwi
|
96906d9eaf
|
Retranslate arabic localization.
|
2010-10-31 14:14:48 +03:00 |
|
Hexagon
|
0bef839261
|
Translating a huge amount of untranslated strings
|
2010-10-30 15:24:26 +02:00 |
|
Alec Leamas
|
58ead768d6
|
Small fix
|
2010-10-30 09:58:01 +02:00 |
|
Alec Leamas
|
68cba5da98
|
Merge branch 'se-l10n-update-2' of http://github.com/Hexagon/diaspora into Hexagon-se-l10n-update-2
|
2010-10-30 09:54:28 +02:00 |
|
Raphael
|
555c15dfef
|
Simplify validations on user
|
2010-10-29 16:56:04 -07:00 |
|
Hexagon
|
99661a3240
|
Added swedish translations
|
2010-10-30 01:32:32 +02:00 |
|
danielvincent
|
8ec49e685b
|
going to a non-friend's page contains a way to add them.
|
2010-10-29 15:43:44 -07:00 |
|
zhitomirskiyi
|
2c0a189df4
|
removed the session secret from the repo
|
2010-10-29 12:20:06 -07:00 |
|
maxwell
|
9c2ca15e93
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-29 12:09:32 -07:00 |
|
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 |
|