nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
11987 commits 4 branches 0 tags 121 MiB
Commit graph

2535 commits

Author SHA1 Message Date
danielgrippi
d7a099dadb add publish_actions to facebook connection [ci skip] 2012-05-15 14:07:34 -07:00
Maxwell Salzberg
900067ba1e disable the mass assignment thing until we deal with it [ci skip] 2012-05-15 13:35:22 -07:00
Jonne Haß
9950342599 updated locales [ci skip] 2012-05-15 17:09:13 +02:00
Maxwell Salzberg
ab2e740ca2 upgrade to Rails 3.2.3 2012-05-14 21:53:16 -07:00
Dennis Collinson
927b78b79d kill references to ServiceUser 2012-05-14 18:47:14 -07:00
Maxwell Salzberg
379df76118 Update to faraday-middleware, as faraday stack has been deprecated. 
Hopefully this will make REE happy in Travis
 2012-05-14 15:59:07 -07:00
Maxwell Salzberg
ad6151c808 Revert "@joshsusser hates our ci setup, /cc @suss" 
This reverts commit cbca19b3f5.
 2012-05-14 15:59:06 -07:00
Maxwell Salzberg
7a6633e82a Merge pull request #3256 from SuperTux88/invitation-mail 
Invitation mail cleanup
 2012-05-14 15:38:43 -07:00
Maxwell Salzberg
9d20f66d2f Merge pull request #3252 from movilla/regis_tra 
Translation registrations/new [ci skip]
 2012-05-14 15:18:52 -07:00
Benjamin Neff
5db6604d79 remove old invite_code_url from locales 2012-05-13 03:21:56 +02:00
Benjamin Neff
9abfb6a266 make invite url clickable 2012-05-13 03:17:16 +02:00
Dennis Collinson
f6e3c1b88b seperate interactions from posts 
Lazily load post interactions on show page
hella refactorz
 2012-05-12 17:41:58 -07:00
movilla
7538f89a95 Translation registrations/new 2012-05-12 22:18:10 +02:00
Steven Hancock
b16f309aca Upgrade Rails Admin to latest gem 
This gives us a clean fix for the Kaminari vs. Will Paginate
issues and fixes a few other little bugs in Rails Admin.

fixes #3210
 2012-05-11 03:32:05 -07:00
danielgrippi
608a15faf4 the landing page. 2012-05-11 01:06:51 -07:00
Maxwell Salzberg
eaedfc9827 create a new publisher using the new composer. only for beta users 2012-05-09 16:55:33 -07:00
Steven Hancock
4c644c336b Actually only load rails admin in production mode 
This is what I think 28f8db51e7 was supposed to do.

With the initializer in an "unless Rails.env.production?" block
the entire initializer was being ignored in production mode and
loaded in all other environments, but Rails Admin was still
loading regardless of that. 😁

This only loads rails admin in production and excludes it from
all other environments. Also keeps non-admins out of /admin_panel
(without the initializer it was free-for-all) and temp fixes #3210
until a new gem is released.
 2012-05-09 11:46:18 -07:00
danielgrippi
0ec364e44c DG MS; popup on services, inlined in the composer 2012-05-08 18:09:33 -07:00
Maxwell Salzberg
3a6f32e2d7 Merge pull request #3240 from pubis/update-federation-logger 
Update federation logger
 2012-05-08 10:01:00 -07:00
Jonas Lundqvist
324663e4b4 match integration pod ports 2012-05-08 12:42:12 +02:00
Jonne Haß
d444a1dc56 updated 47 locale files [ci skip] 2012-05-08 12:21:45 +02:00
Jonas Lundqvist
819bb95dbd reorder so integration2 connects to correct redis port 2012-05-08 11:20:56 +02:00
Jonas Lundqvist
436ec039c8 remove debug_rjs reference 2012-05-08 11:20:42 +02:00
danielgrippi
56913ffb80 upload wallpaper for great success. 2012-05-06 12:35:11 -07:00
Maxwell Salzberg
2f618f6dde Merge pull request #3230 from movilla/close-amparito 
Translation "[X] Close" photo-post [ci skip]
 2012-05-06 10:09:04 -07:00
movilla
bca5d3ffa7 Translation "[X] Close" photo-post 2012-05-05 14:39:58 +02:00
Adrián Chaves Fernández (Gallaecio)
52964ec7c9 Updated the Galician translation. 2012-05-05 13:21:48 +02:00
Dennis Collinson
0fc399243b fix next post and previous post, more efficient 
make controller actions
make the presenter reflect that it is instance data ;-p

needs tests lol.
 2012-05-04 18:25:09 -07:00
danielgrippi
5821a84024 validations and all that jazz [ci skip] 2012-05-04 17:38:08 -07:00
danielgrippi
31af414a04 actually use labels, html5 validations, etc [ci skip] 2012-05-04 17:38:08 -07:00
danielgrippi
7be7acdfd6 add chartbeat option for great success (and metrics) 2012-05-03 14:04:19 -07:00
Liam Nicholson
01c51d26f5 Fix 'go' Admin Translation 2012-05-03 20:24:25 +01:00
Jonne Haß
5b7342bb8e updated 34 locale files [ci skip] 2012-05-03 12:12:12 +02:00
danielgrippi
fe49579ff5 remove google-analytics middleware due to the fact that it doesn't support injection of custom variables before _trackPageView is called (this results in custom vars not getting tracked) 
i've submitted an issue to the gem.  hopefully we can put it back in later… for now i've copy and pasted its output into a helper method.
 2012-05-01 18:02:25 -07:00
movilla
4d3ba4f274 Little traslation "HOME" /post 2012-05-01 17:43:51 +02:00
danielgrippi
bbd4ee5738 correctly redirect for beta and admin users (profile vs stream homepages) 2012-04-28 15:09:02 -07:00
movilla
57e6c3861e Translation popup "Reshare author's post?" /stream 2012-04-28 23:42:37 +02:00
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