Commit graph

13275 commits

Author SHA1 Message Date
Jonne Haß
d37a8205b7 Merge pull request #4146 from eloydegen/patch-1
Update _header.html.haml
2013-05-06 06:50:09 -07:00
eloydegen
eb5bc379d1 Update _header.html.haml
Change blog url, now there is no 301 required :)
2013-05-06 16:27:40 +03:00
Jonne Haß
c41db6634c Fix reading of redis namespace from config
Changed default to nil to not screw users running develop already
2013-05-05 16:12:22 +02:00
Jonne Haß
fdff9c8b8a drop another capistrano leftover 2013-05-05 10:53:35 +02:00
Jonne Haß
e70c2593ff bump configurate 2013-05-03 12:07:50 +02:00
Jonne Haß
3cd60c3061 Merge pull request #4139 from brauliomartinezlm/remove_found_ruby187_hack
Remove unnecessary ruby187 hacks
2013-05-02 07:04:30 -07:00
Braulio Martinez
00a3332013 Remove unnecessary ruby187 hacks 2013-05-02 10:07:30 -03:00
Jonne Haß
d2c9295389 Merge pull request #4111 from Raven24/install_refactor
refactor install script
2013-05-01 13:33:35 -07:00
Jonne Haß
4ed9a8a83e Merge pull request #4138 from movilla/translation_backtotop
Fix missing translation back to top - Only develop branch
2013-05-01 13:30:13 -07:00
movilla
19d22a8928 fix missing translation back to top 2013-05-01 19:22:53 +02:00
Florian Staudacher
4005cd05ea refactor install script
the script is now split up in parts that will be fetched from github
on demand.
fixes #4047
2013-05-01 14:01:11 +02:00
Jonne Haß
ea792246d0 bump sidekiq 2013-04-25 21:30:35 +02:00
Dennis Schubert
aab960d896 Merge pull request #4125 from movilla/reactions_mobile
Fix reactions link on mobile broken. Close #3972
2013-04-25 10:34:41 -07:00
movilla
5839d304db Fix reactions link on mobile broken 2013-04-25 13:55:57 +02:00
Jonne Haß
25b3f6bcdc Merge pull request #4127 from marpo60/fix_aspects_max_selection
Fix select & deselect all aspects check image
2013-04-22 08:34:13 -07:00
Juan Manuel Azambuja
06ef58bc97 Add changelog entry for pull 4127 2013-04-22 10:25:24 -03:00
Jonne Haß
dec639cbd5 Merge pull request #4126 from Raven24/ruxton_service_user
show username of the services in the publisher
2013-04-22 00:09:00 -07:00
Juan Manuel Azambuja
de7044c602 Fix select & deselect all aspects check image 2013-04-21 21:38:03 -03:00
Florian Staudacher
c1b680e51d show username of the services in the publisher
original work by @Ruxton
rebased and extended to include feedback from the original PR #3959
2013-04-21 23:29:04 +02:00
Florian Staudacher
3cb6f1cc3f Merge pull request #3940 from MrZYX/embed_photo_xml
Embed associated photos into the status message xml
2013-04-21 13:32:26 -07:00
Jonne Haß
322f4da4d8 Embed associated photos into the status message xml 2013-04-21 19:44:09 +02:00
Florian Staudacher
6bcac2a7ad Merge pull request #4117 from MrZYX/script_server
Refactor script/server
2013-04-21 07:25:33 -07:00
Jonne Haß
95cef200bd do slightly less metaprogramming in script/get_config.rb 2013-04-20 17:38:42 +02:00
Jonne Haß
9935dc9999 Merge pull request #4097 from diaspora/update_gems
Update gems
2013-04-20 07:09:53 -07:00
Jonne Haß
6302de458d bump sidekiq 2013-04-20 14:37:42 +02:00
Jonne Haß
38ceb93377 bump temple 2013-04-20 14:37:41 +02:00
Jonne Haß
cf506114c0 bump facter 2013-04-20 14:37:41 +02:00
Jonne Haß
9c582a775a bump addressable 2013-04-20 14:37:41 +02:00
Jonne Haß
4bbbe93b2d bump acts-as-taggable-on 2013-04-20 14:37:41 +02:00
Jonne Haß
b3e1d860e9 bump rails_admin 2013-04-20 14:37:41 +02:00
Jonne Haß
c8eec463e5 bump configurate 2013-04-20 14:37:41 +02:00
Jonne Haß
849b0befd6 bump gon 2013-04-19 19:25:44 +02:00
Jonne Haß
347ea03042 bump pg 2013-04-19 19:25:43 +02:00
Jonne Haß
b2ae15fe6c bump nested_form 2013-04-19 19:25:43 +02:00
Jonne Haß
83ab708d44 bump uglifier 2013-04-19 19:25:43 +02:00
Jonne Haß
e4f2c7128f bump subexec 2013-04-19 19:25:43 +02:00
Jonne Haß
d7c68347b9 bump hike 2013-04-19 19:25:43 +02:00
Jonne Haß
734f6cadbd bump fog 2013-04-19 19:25:42 +02:00
Jonne Haß
73aa63565c bump cucumber 2013-04-19 19:25:42 +02:00
Jonne Haß
0694b3e9d0 bump foreigner 2013-04-19 19:25:42 +02:00
Jonne Haß
eeba00cde4 bump omniauth 2013-04-19 19:25:42 +02:00
Jonne Haß
f98b8e30d6 bump haml 2013-04-19 19:25:42 +02:00
Jonne Haß
07b2ceaf69 bump selenium-webdriver 2013-04-19 19:25:42 +02:00
Jonne Haß
62c6ccdc56 bump rspec-mocks 2013-04-19 19:25:41 +02:00
Jonne Haß
ec32e33a37 bump faraday 2013-04-19 19:25:41 +02:00
Jonne Haß
20c5857612 bump client_side_validations 2013-04-19 19:25:41 +02:00
Jonne Haß
90c294c4d5 bump omniauth-twitter 2013-04-19 19:25:41 +02:00
Jonne Haß
9028616bdc bump safe_yaml 2013-04-19 19:25:41 +02:00
Jonne Haß
aca134d54a Refactor script/server
* Made style consistent
* Add helper functions to print messages
* Abort script if critical command fails
* Made number of started Sidekiq workers configurable again
2013-04-15 17:03:41 +02:00
Jonne Haß
cdaffbd906 bump oauth2 2013-04-15 01:36:48 +02:00