Jonne Hass
ee1c394aa2
Merge pull request #639 from cyberkov/add-region-selection-for-s3
...
Added region config to carrierwave to select other regions than US
2011-05-18 07:20:16 -07:00
MrZYX
e79a6597e6
eliminate config/server.sh; use config/app_config.yml.example as base for configuration, config/app_config.yml is now just an overider. This way we can add new configuration options without checking in the application if it's set and the user has to update his app_config.yml only when he want to change something
2011-05-18 16:11:20 +02:00
cyberkov
eb615c3e7e
Added region config to carrierwave to select other regions than US
2011-05-18 15:57:02 +02:00
MrZYX
66380fd33f
fixed some translations
2011-05-18 13:55:50 +02:00
Jonne Hass
4bd266e9f0
Merge pull request #638 from aneesh/malayalam-localization
...
Malayalam localization
2011-05-18 02:18:53 -07:00
Anish A
ddfb1f00f4
Malayalam translation, completed devise and javascript directory
2011-05-18 07:55:13 +05:30
Anish A
3837d3b1f8
Malayalam translation, nearing completion
2011-05-18 07:27:40 +05:30
Ilya Zhitomirskiy
60c0a9839b
added a podwide email preference
2011-05-17 18:19:47 -07:00
Raphael Sofaer
0bb349ff08
Merge branch 'evant_log_post_merge'
2011-05-17 18:17:14 -07:00
Raphael Sofaer
f409ace067
Merge remote branch 'evant/354-long-post' into evant_log_post_merge
...
Conflicts:
config/assets.yml
2011-05-17 18:02:36 -07:00
MrZYX
2edec3c6ae
updated locales
2011-05-18 02:58:58 +02:00
MrZYX
f752b5a71b
change infinitescroll in mobile too, thanks @dmorley
2011-05-18 01:01:36 +02:00
MrZYX
c47c9ef069
fix untranslated string; fix two translations; don't mess routes.rb again
2011-05-18 00:53:48 +02:00
Raphael Sofaer
2953cc8497
Move infinite scroll out of vendor, because it has been edited
2011-05-17 15:06:21 -07:00
danielgrippi
775e7b6b2b
Merge branch 'master' into follow
...
Conflicts:
features/step_definitions/user_steps.rb
2011-05-17 11:33:35 -07:00
MrZYX
401b198bbf
--amend
2011-05-17 16:02:37 +02:00
MrZYX
00c6631f11
replaced SOCKET_PORT in config/server.sh with the setting from config/app_config.yml; respect single_process_mode setting in app_config.yml in script/server
2011-05-17 16:00:47 +02:00
danielgrippi
7042b43799
use appconfig instead of config
2011-05-16 18:54:50 -07:00
danielgrippi
55d39521c4
rescue redis connection attempts in websocket
2011-05-16 18:34:37 -07:00
danielgrippi
8821043ed7
work in process
2011-05-16 18:27:12 -07:00
danielgrippi
8d7b0b2c4c
take out animations in inf scroll.
2011-05-16 16:55:24 -07:00
danielgrippi
7eaca0346c
Merge branch 'master' into follow
...
Conflicts:
config/assets.yml
public/stylesheets/sass/_mixins.scss
spec/models/user/posting_spec.rb
2011-05-16 14:56:28 -07:00
MrZYX
8c1e64a080
updated locales
2011-05-16 21:02:15 +02:00
Jerin Philip
946896da1f
Edited config/locales/diaspora/ml.yml via GitHub
2011-05-16 16:27:48 +05:30
Jerin Philip
6cc798de77
Edited config/locales/diaspora/ml.yml via GitHub
2011-05-16 16:27:48 +05:30
Anish A
f56da67b0b
Added rest of jerrinphilip's translations
2011-05-16 16:27:48 +05:30
Anish A
d87c1f3ff0
Translations of jerrinphilip
2011-05-16 16:27:48 +05:30
Anish A
d8426fe6d3
Added rest of jerrinphilip's translations
2011-05-16 16:27:48 +05:30
Anish A
577f0338be
Translations of jerrinphilip
2011-05-16 16:27:48 +05:30
Jerin Philip
4d31a69a20
Edited config/locales/diaspora/ml.yml via GitHub
2011-05-16 16:27:48 +05:30
Jerin Philip
fc1cddf03e
Edited config/locales/diaspora/ml.yml via GitHub
2011-05-16 16:27:26 +05:30
Anish A
9003db10d1
Added rest of jerrinphilip's translations
2011-05-16 16:26:59 +05:30
Anish A
91423c7d09
Translations of jerrinphilip
2011-05-16 16:25:48 +05:30
MrZYX
20231891d2
updated locales
2011-05-15 22:57:08 +02:00
MrZYX
7e6cae9f96
updated locales
2011-05-15 01:32:06 +02:00
Sarah Mei
43ab8cfcfa
Tell devise that :mobile is a navigational format.
2011-05-14 15:46:56 -07:00
Sarah Mei
c8e9225dfb
For the love of god, normal Rails logs in test & development.
...
There's now a setting in app_config.yml, :enable_splunk_logging, which if true outputs godawful machine-readable splunk logs. It's false in test and development, and true elsewhere.
2011-05-14 13:29:54 -07:00
danielgrippi
666fb76bfc
login as its own js file. accounted for the autofil state
2011-05-13 22:27:08 -07:00
Raphael Sofaer
32ceb278bf
Restore deploy.rb
2011-05-13 16:35:55 -07:00
Raphael Sofaer
a4f81c6410
Finish fixing password changing and keeping emails downcased
2011-05-13 16:32:07 -07:00
Raphael Sofaer
f8b7307441
Downcase emails upon inviting
2011-05-13 16:32:07 -07:00
Raphael Sofaer
a46ff394b1
update devise_invitable and devise
2011-05-13 16:32:07 -07:00
danielgrippi
402e84708b
ms iz; everything is green, the sharewith is translated in js, fixed the clicking on the checkbox bug
2011-05-13 16:05:37 -07:00
MrZYX
b7540ba6ab
updated locales
2011-05-14 00:04:43 +02:00
danielgrippi
c200c386fb
pulled new aspect into modal window
2011-05-13 11:58:18 -07:00
Evan Tatarka
5f406b18d5
Updated code to work with lastest master. Tests should now pass.
2011-05-12 20:38:05 -04:00
danielgrippi
60a60733df
Merge branch 'master' into follow
...
Conflicts:
app/controllers/aspects_controller.rb
app/controllers/contacts_controller.rb
app/controllers/people_controller.rb
app/controllers/photos_controller.rb
app/controllers/tags_controller.rb
app/helpers/notifications_helper.rb
app/models/notifications/new_request.rb
app/models/user_preference.rb
public/javascripts/view.js
spec/controllers/aspects_controller_spec.rb
spec/controllers/contacts_controller_spec.rb
spec/controllers/home_controller_spec.rb
spec/controllers/post_visibilities_controller_spec.rb
spec/controllers/requests_controller_spec.rb
spec/mailers/notifier_spec.rb
spec/models/user_spec.rb
2011-05-12 15:49:51 -07:00
danielgrippi
4280417e41
broke out dropdown into its own partial. aspect dropdown on person show. user menu fixed
2011-05-11 18:33:17 -07:00
Jerin Philip
ae2a0528b7
Edited config/locales/diaspora/ml.yml via GitHub
2011-05-12 05:43:30 +05:30
Jerin Philip
0a84f3d011
Edited config/locales/diaspora/ml.yml via GitHub
2011-05-12 05:43:30 +05:30
