Maxwell Salzberg
8187fb9ddb
clean up and move help widget up the page
2011-09-20 10:05:39 -07:00
Jonne Hass
70c2fda2ca
Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca
2011-09-20 18:42:56 +02:00
Sarah Mei
3a9d8f0f38
ARRRGGGHH *twitch* *twitch*
2011-09-19 22:00:00 -07:00
Ilya Zhitomirskiy
352be4d0c0
added the have support section and reworded the donation section to be clearer
2011-09-19 15:29:19 -07:00
Jonne Hass
473642234d
updated locales and pulled in NN
2011-09-19 15:36:12 +02:00
Jordi Mallach
ff5919f43f
Change "Click this link" to "Follow this link".
...
As discussed with @rsofaer in 9797e04957 ,
"follow" is more device-neutral, better for mobile browser users.
2011-09-18 22:46:31 +02:00
Jordi Mallach
d006ca9850
Merge branch 'master' of git://github.com/diaspora/diaspora
2011-09-18 03:21:57 +02:00
Jonne Hass
661d5d3bbc
pull in ur-PK
2011-09-18 00:56:04 +02:00
Jordi Mallach
98aa2a0196
Update Catalan translation to 91e6499.
2011-09-17 21:50:37 +02:00
Jordi Mallach
021f704de7
Add trailing dot.
2011-09-17 21:47:57 +02:00
Jonne Hass
d498110b3d
updated 117 locale files [ci skip]
2011-09-17 17:32:01 +02:00
Maxwell Salzberg
bc1aef4999
MS IZ start to implement followed tags in the stream
2011-09-16 18:19:34 -07:00
Maxwell Salzberg
17b5e7b066
move admin rack to its own file
2011-09-16 13:33:05 -07:00
Jonne Hass
7ab963f859
whoops, fix my typo
2011-09-16 22:27:19 +02:00
Jonne Hass
b706edf76f
pull in parallel_testing to speed up rspec
...
- Initally run rake parallel:create
- After each schema change run rake parallel:prepare
- To run rspec super fast run rake parallel:spec
- Todo fix upstreams summary logger
2011-09-16 22:14:12 +02:00
Jonne Hass
fcff5a6774
do not break on not updated application.yml for mount_resque_web
2011-09-16 22:03:38 +02:00
Maxwell Salzberg
55999bc443
resolve route conflicts
2011-09-16 12:49:47 -07:00
Ilya Zhitomirskiy
f1a8b1fd6f
added the namespace constraint back to the envelope, protocol route, data type is now plain xml
2011-09-16 08:53:13 -07:00
Loïc Guitaut
a739c4f308
Ability to mount resque jobs monitoring directly into Diaspora* routes
...
As resque-web is considered as a debug tool, route is disabled for
production by default, and can be enabled via the `mount_resque_web` key
in application.yml.
2011-09-16 02:40:57 +02:00
danielgrippi
3f84dd066f
can't access git on heroku
2011-09-14 18:07:54 -07:00
danielgrippi
084ed0e838
dont tell faraday to get a custom ca file, hopefully heroku does magic to make sure they work
2011-09-14 18:07:53 -07:00
danielgrippi
c1b46e557f
added redis to go support in redis
2011-09-14 18:07:53 -07:00
Jonne Hass
70a9f3fd94
made openssl verify mode configurable for SMTP
2011-09-14 20:55:29 +02:00
danielgrippi
91e649977c
MS DG update copyright
2011-09-14 11:23:12 -07:00
Jonne Hass
d7a7154424
Revert "lets set the example collation to utf8_general_ci instead of utf8_bin, #1395 "
...
This reverts commit eb85cdab5b .
2011-09-14 14:01:53 +02:00
Maxwell Salzberg
df87b398c7
MS DG; fixed cucumber
2011-09-13 16:14:31 -07:00
Jonne Hass
10df8ef2c8
updated 6 locale files [ci skip]
2011-09-14 00:43:19 +02:00
Jonne Hass
cecd6ca5a1
Lets take another try at a consistent single process mode handling
...
Revert "dont call settingslogic single process mode, use the hash accessor so it is not required"
This reverts commit 57de976396 .
2011-09-13 22:29:56 +02:00
Jonne Hass
eb85cdab5b
lets set the example collation to utf8_general_ci instead of utf8_bin, #1395
2011-09-13 17:45:53 +02:00
Maxwell Salzberg
665facaeb0
DG MS renamed private dispatcher; started refactor including public
...
dispatcher
2011-09-12 17:02:40 -07:00
Maxwell Salzberg
6b0507949c
updated salmon to let us not always encrypt the header
2011-09-12 14:05:31 -07:00
Jonne Hass
5ae96efdf6
fix oauth keys, deep_merge vs deep_merge! my bad
2011-09-12 22:28:13 +02:00
Maxwell Salzberg
57de976396
dont call settingslogic single process mode, use the hash accessor so it is not required
2011-09-12 08:42:38 -07:00
Jonne Hass
37787605aa
updated 44 locale files [ci skip]
2011-09-12 00:00:58 +02:00
Jonne Hass
41effa7bd2
load oauth_keys.yml.example as default so I don't have to touch my oauth_keys.yml to have the specs pass on my machine
2011-09-11 23:45:14 +02:00
Jonne Hass
96fc057974
correct Rails.logger call in resque initializer
2011-09-11 22:07:54 +02:00
Lennart Prelle
40ac7b7620
make string in authorizations translateable
2011-09-11 17:20:54 +02:00
Jonne Hass
cce2ab2151
cleaned up application.yml.example
2011-09-11 14:45:47 +02:00
Jonne Hass
bdd6b9127a
overlooked one last old single process check
2011-09-11 14:19:26 +02:00
Jonne Hass
a614985d83
made single process mode configuration more consistent
...
* SINGLE_PROCESS_MODE environment variable takes precedence over
application.yml setting
* SINGLE_PROCESS environment variable takes precedence over
SINGLE_PROCESS_MODE environment variable to be backward compatible
2011-09-11 13:54:14 +02:00
Jonne Hass
79a8ab709f
updated 77 locales [ci skip]
2011-09-11 03:20:59 +02:00
Maxwell Salzberg
1fa01a811e
DG MS; updated text to reflect the fact that hiding posts now
...
mutes notifications as well
2011-09-09 10:52:19 -07:00
Maxwell Salzberg
328269e40d
re-added single process mode to the example
2011-09-09 10:10:10 -07:00
Maxwell Salzberg
bea76a4801
move the ugly type check into the ugly method, to keep all the ugly in
...
one place; restore listening to single process mode in resque; move the
exception handling to inside the method, rather than around the
intializer, and log when resque errors happen in development in single
process mode
2011-09-09 08:58:06 -07:00
Manuel Schölling
0b28376216
Fixed some texts in "Getting Started" that were not translatable
2011-09-09 01:15:54 +02:00
Maxwell Salzberg
cd7640a971
add resque timeout
2011-09-08 10:46:36 -07:00
Jonne Hass
2addd32274
shit we violoated the LDML
...
close #1920
* added two to pluralizations, see
http://www.unicode.org/reports/tr35/tr35-21.html#Language_Plural_Rules
* updated pluralization rules to CLDR 2.0.1
2011-09-08 02:00:46 +02:00
Maxwell Salzberg
faa44c0a91
make redis url configurable via app config
2011-09-07 15:59:38 -07:00
danielgrippi
d6689ba923
remove mime type :mobile from mime_types as the mobile_fu gem already registers it
2011-09-07 13:03:49 -07:00
Jonne Hass
daca5b0bc4
updated locales
2011-09-07 16:39:16 +02:00