Florian Staudacher
462959fbcd
Merge pull request #3190 from diaspora/reshare-flash
...
use flash message instead of just appending reshares to the current stream
2012-04-28 10:04:40 -07:00
Sean Tilley
f2bbbec49e
Merge pull request #3192 from ktkaushik/patch-1
...
Updated readme. [ci skip]
2012-04-27 11:07:16 -07:00
Jonne Haß
560da5ce98
Merge pull request #3193 from ktkaushik/better_pirate_translation
...
Modified Pirate Translation making it better.
2012-04-27 09:48:54 -07:00
Kaushik Thirthappa
1dae3d9f47
Modified Pirate Translation making it better.
2012-04-27 21:51:13 +05:30
Kaushik
9ab6bf1af5
Updated readme.
2012-04-27 16:28:24 +05:30
Florian Staudacher
0dee8aae36
[reshares] display flash message instead of just appending it to the stream ( fixes #2094 )
2012-04-27 00:57:20 +02:00
Jonne Haß
8cea8715eb
updated 6 locale files [ci skip]
2012-04-26 15:43:09 +02:00
Jonne Haß
eb2eaa8ea1
updated 50 locale files [ci skip]
2012-04-25 22:49:40 +02:00
Maxwell Salzberg
d22a98cd96
monkey patch to_xs for ruby 1.8, and fix a test as a result
2012-04-25 11:38:42 -07:00
Maxwell Salzberg
70fb426487
Merge pull request #3184 from movilla/amparito_users
...
Add translation app/views/admins/user_search.html.haml - Admin Panel
2012-04-25 10:28:39 -07:00
Steven Hancock
87ceabc0ba
Precompile Rails Admin assets
...
Rails Admin adds its CSS and Javascript assets to the asset pipeline
in an initializer, which doesn't run if config.assets.initialize_on_precompile
is disabled. This manually adds those assets in config/application.rb to make
sure they get precompiled on each deploy.
See 579785c120
2012-04-25 04:50:46 -07:00
Dennis Collinson
e55073fdd4
temp reverting to prove max wrong.
...
Revert "killing rails admin to investigate if its what's causing boot and deploy to be so slow"
This reverts commit 78bcb1c321
2012-04-24 16:45:25 -07:00
Dennis Collinson
78bcb1c321
killing rails admin to investigate if its what's causing boot and deploy to be so slow
2012-04-24 16:30:31 -07:00
Maxwell Salzberg
28f8db51e7
only load rails admin in production mode
2012-04-24 13:48:14 -07:00
Maxwell Salzberg
66e9423dc9
more cool seed fixings
2012-04-24 13:48:14 -07:00
Maxwell Salzberg
7fb3e8e901
for now; Revert "updated 50 locale files [ci skip]"
...
This reverts commit a9dd997f23
2012-04-24 12:20:58 -07:00
Jonne Haß
a9dd997f23
updated 50 locale files [ci skip]
2012-04-24 18:14:01 +02:00
Maxwell Salzberg
6c5dafa6e9
cool seed wip [ci skip]
2012-04-24 01:13:57 -07:00
movilla
cc329594c5
Add translation app/views/admins/user_search.html.haml - Admin Panel
2012-04-24 02:05:13 +02:00
danielgrippi
75d25e9475
users can now favorite posts
2012-04-22 12:06:15 -07:00
Dennis Collinson
062de4c269
MDC DC New Profile shows users info
...
Profile show json
Profile backbone model
2012-04-21 13:12:56 -07:00
Jonne Haß
579785c120
do not load the whole env to precompile assets [ci skip]
2012-04-20 23:56:52 +02:00
Maxwell Salzberg
63616c5ced
trying this on for size again; Revert "I can't test this at this momement. I will put it back in once i have a"
...
This reverts commit 53304df740
2012-04-19 21:02:29 -07:00
Dennis Collinson
8cc5f86298
reverting some test env munging
...
max isn't a princess
learn2git
learn2bash
lulz
2012-04-19 14:59:33 -07:00
Dennis Collinson
cbca19b3f5
@joshsusser hates our ci setup, /cc @suss
...
Revert "silence asset noise in development. Thanks to @joshsusser. @denniscollective said I should put something pithy here, but that sounds like a bad idea."
This reverts commit 1307907330
2012-04-19 14:43:19 -07:00
Dennis Collinson
8386179f16
max, you're a princess, WIP
2012-04-19 11:15:59 -07:00
Dennis Collinson
7831f9cad3
Max Salzberg was wrong.
...
/cc @joshsusser @groupon @dhh
2012-04-18 18:04:38 -07:00
Maxwell Salzberg
1307907330
silence asset noise in development. Thanks to @joshsusser. @denniscollective said I should put something pithy here, but that sounds like a bad idea.
2012-04-18 17:26:27 -07:00
Maxwell Salzberg
c9e3852de8
oembed mostly works
2012-04-18 16:12:56 -07:00
Maxwell Salzberg
b10aedb615
update the iframe route, fix a small styleing thing in newspaper style for iframe view
2012-04-17 22:43:47 -07:00
Maxwell Salzberg
90a2f05515
include an iframe route, for posts, and a magic body padding removal for screens with small widths (for some reason, smaller than 770
2012-04-17 22:28:01 -07:00
Sean Tilley
4d95c52960
Image Redirect URL should be blank [ci skip]
2012-04-18 00:18:22 -05:00
Sean Tilley
d46734e90c
Set single_process_mode to true by default [ci skip]
2012-04-17 23:27:34 -05:00
Jonne Haß
25f6df230d
Merge pull request #3150 from Gallaecio/l10n-gl
...
Updated the Galician translation.
2012-04-17 13:59:43 -07:00
Maxwell Salzberg
d456fed99c
Merge pull request #3148 from DeadSuperHero/appconfiglove
...
Refactor application.yml.example [ci skip]
2012-04-17 10:48:24 -07:00
Jonne Haß
b99e77d8ce
Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca
2012-04-16 23:59:03 +02:00
Jonne Haß
959523aae8
updated 22 locale files [ci skip]
2012-04-16 23:58:57 +02:00
Maxwell Salzberg
24b69236a0
exclude share vis in rails admin, dont exclude users [ci skip]
2012-04-15 17:58:49 -07:00
Jordi Mallach
00e42b11f2
Fix typo in Catalan translation (thanks to David Bas@JD).
2012-04-15 21:54:08 +02:00
Jordi Mallach
c9fff4a435
Update Catalan translation to 4d92653.
2012-04-15 19:09:01 +02:00
Jordi Mallach
4d92653874
Fix typo in key name: seperated → separated.
2012-04-15 19:07:59 +02:00
Jordi Mallach
2bb9fbf58d
Fix typo in key name: autorize → authorize.
2012-04-15 19:05:03 +02:00
Jordi Mallach
7b73c62a0b
Update Catalan translation to cac2b1e.
2012-04-15 18:56:55 +02:00
Adrián Chaves Fernández (Gallaecio)
0956fbbdb6
Improved the Galician translation and fixed a quoting error.
2012-04-14 22:44:13 +02:00
Adrián Chaves Fernández (Gallaecio)
c659b8f393
Updated the Galician translation.
2012-04-14 22:29:52 +02:00
Steven Hancock
7e517c2636
Initialize on asset precompile
...
This re-enables 'config.assets.initialize_on_precompile' to allow the
Rails Admin assets to precompile. On Heroku deploys, this may require
the Heroku Labs 'user_env_compile' feature to be enabled, which you
should be using anyway for Asset Sync to work properly. :)
2012-04-13 20:42:05 -07:00
Maxwell Salzberg
ecc1a84b42
rails_admin; i do what i want
2012-04-13 18:08:52 -07:00
Sean Tilley
af389a97f8
refactor appconfig
2012-04-13 19:56:46 -05:00
Sean Tilley
aaa8930264
Refactor AppConfig
2012-04-13 19:46:23 -05:00
Maxwell Salzberg
c4b36a179e
Merge pull request #3138 from stevenh512/bootstrap-sass
...
bootstrap-sass (w00t)
2012-04-13 17:44:08 -07:00
