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
Jonne Haß
6feb7969a3
bump mime-types
2013-04-15 01:36:48 +02:00
Jonne Haß
63732d8722
bump rake
2013-04-15 01:36:48 +02:00
Jonne Haß
d136fd56e7
bump guard
2013-04-15 01:36:48 +02:00
Jonne Haß
dacaaca7e5
bump chunky_png
2013-04-15 01:36:48 +02:00
Jonne Haß
bef8b1ea3c
Fix typo in devise initializer
2013-04-15 02:35:53 +03:00
Jonne Haß
5607a71458
Merge pull request #4116 from Raven24/remove-capistrano
...
remove capistrano from the main source code repo
2013-04-14 15:55:23 -07:00
Florian Staudacher
f3aa802a0d
remove capistrano from the main source code repo
...
capistrano deployment scripts will be maintained in a separate deployment repo
2013-04-15 00:50:23 +02:00
Jonne Haß
19206fb67d
Merge pull request #4115 from movilla/small_fix
...
Correction typos for changelog and activity mobile feature
2013-04-13 13:32:20 -07:00
movilla
c1479b36ca
Correction typos for changelog and activity mobile feature
2013-04-13 22:24:07 +02:00
Jonne Haß
3572ae8d2e
Merge branch 'remove_navbar' of git://github.com/movilla/diaspora into movilla-remove_navbar
...
Conflicts:
Changelog.md
2013-04-13 13:04:52 +02:00
Jonne Haß
fd069af2c6
Merge branch 'activity_more' of git://github.com/movilla/diaspora into movilla-activity_more
...
Conflicts:
Changelog.md
2013-04-13 12:53:31 +02:00
Jonne Haß
7a0d1c647a
Merge pull request #4096 from RoonyH/3897-submit_a_comment_by_shift+enter
...
3897 submit a comment by shift+enter
2013-04-13 03:49:40 -07:00
Jonne Haß
ac7bccfe4c
bump sidekiq
2013-04-13 11:27:26 +02:00
Jonne Haß
bef05c14d7
Merge branch '3681-infinite-scroll-on-contact-page' of git://github.com/asphxia/diaspora into develop
...
Conflicts:
Changelog.md
2013-04-10 18:24:47 +02:00
Jonne Haß
15418eae67
Merge pull request #4112 from marpo60/issues_4017_4107_fixes
...
close issues #4017 and 4107 by including jquery.textchange
2013-04-10 07:58:30 -07:00
Juan Manuel Azambuja
01d91e02d4
Add changelog entry for #4017 & #4107
2013-04-10 11:17:40 -03:00
Jonne Haß
f272c7ed03
Merge branch 'brauliomartinezlm-4058_redirect_to_downcase_version_of_tags' into develop
2013-04-10 10:20:18 +02:00
Braulio Martinez
c651cbab78
Always redirect user to downcase version of tags on UTF-8 encoding
2013-04-10 00:08:58 -03:00
Juan Manuel Azambuja
5a85fd71f1
close issues #4017 and 4107 by including jquery.textchange
2013-04-09 16:21:19 -03:00
Aruna Herath
b0879dd256
added same feature to publisher
2013-04-08 19:29:36 +05:30
Aruna Herath
5f6ce87a23
added shift+enter key from new comment box to submit the comment.
2013-04-08 19:08:29 +05:30
