Commit graph

16430 commits

Author SHA1 Message Date
Jonne Haß
6601576149 Merge branch 'master' into stable 2015-07-02 11:11:58 +02:00
Jonne Haß
8624ebb921 bump to 0.5.1.2 2015-07-02 11:09:05 +02:00
Dennis Schubert
e92c8000ba Do not leak private profile fields in JSON format
Signed-off-by: Dennis Schubert <mail@dennis-schubert.de>
2015-07-02 10:07:59 +02:00
Jonne Haß
6855095e7b Merge branch 'stable' into develop 2015-06-30 23:30:14 +02:00
Steffen van Bergerem
4cda8675e6 Update markdown-it
closes #6150
2015-06-30 23:30:04 +02:00
Jonne Haß
d319474dea Merge branch 'stable' into develop 2015-06-27 20:25:12 +02:00
Jonne Haß
3dc1eb2bdc Shorter Travis notification for IRC 2015-06-27 20:24:37 +02:00
Dennis Schubert
8b773c89e1 Merge pull request #6066 from theworldbright/5483-fix-mobile-stream-comments
Fix for #5483 and #5757 (mobile stream comments)
2015-06-27 04:43:50 +02:00
Dennis Schubert
9613eb845f Merge branch 'stable' into develop 2015-06-27 04:38:37 +02:00
Jonne Haß
070e785714 bump rails
closes #6140
2015-06-27 04:38:25 +02:00
Dennis Schubert
4b1cd5b2fa Merge branch 'stable' into develop 2015-06-27 04:37:10 +02:00
Jonne Haß
8b6f487874 bump rails
closes #6140
2015-06-27 04:36:36 +02:00
Jonne Haß
e6712185a2 bump listen 2015-06-27 04:36:21 +02:00
Jonne Haß
21fe65bc02 bump bootstrap-sass 2015-06-24 04:01:22 +02:00
Jonne Haß
a2d894cb39 Improve stability for manages_aspects.feature:79
page.execute_scripts looks to be asynchronous, .synced is already set
by default, so the previous expectation would be fulfilled before
the script got to run, running into the page reload in the next step
which then aborts or hasen't seen the to be triggered request yet.

The fix is to use Capybaras drag_to instead
2015-06-24 04:01:15 +02:00
Dennis Schubert
caf565681c Merge branch 'stable' into develop 2015-06-24 04:01:04 +02:00
Jonne Haß
6c2e93c01d bump listen 2015-06-24 04:00:20 +02:00
Jonne Haß
bd96bb0607 bump cucumber 2015-06-24 04:00:17 +02:00
Jonne Haß
e8bcaf98ca bump sidekiq 2015-06-24 04:00:13 +02:00
Jonne Haß
4307e9b53a bump typhoeus 2015-06-24 04:00:09 +02:00
Jonne Haß
d7b8251503 bump sinon-rails 2015-06-24 04:00:00 +02:00
Jonne Haß
b5413f1050 bump rails_admin 2015-06-24 03:59:56 +02:00
Jonne Haß
bdcdf55f84 bump rails-assets-jquery.slimscroll 2015-06-24 03:59:24 +02:00
Jonne Haß
7309ba81e2 bump jwt 2015-06-24 03:59:19 +02:00
Jonne Haß
65708cb11d bump rails-assets-jasmine 2015-06-24 03:59:10 +02:00
Jonne Haß
f73e7c1b6d bump jasmine-core 2015-06-24 03:58:39 +02:00
Jonne Haß
7d741b8d8b bump hashie 2015-06-24 03:56:47 +02:00
Jonne Haß
9032059535 bump uuid 2015-06-24 03:56:30 +02:00
Jonne Haß
97dd149aa0 bump timecop 2015-06-24 03:56:25 +02:00
Jonne Haß
403f49cd50 bump spring 2015-06-24 03:56:18 +02:00
Jonne Haß
1d1a23c74e bump rubocop 2015-06-24 03:56:12 +02:00
Jonne Haß
ccb183c42c bump rspec-rails 2015-06-24 03:56:08 +02:00
Jonne Haß
cb0dd55355 bump redcarpet 2015-06-24 03:56:00 +02:00
Jonne Haß
e0966d0f48 bump rb-fsevent 2015-06-24 03:55:55 +02:00
Jonne Haß
4365c5935e bump mini_magick 2015-06-24 03:55:42 +02:00
Jonne Haß
fbbeffb645 bump json 2015-06-24 03:55:38 +02:00
Jonne Haß
da49bb2946 bump jquery-ui-rails 2015-06-24 03:55:33 +02:00
Jonne Haß
66c5280c61 bump handlebars_assets 2015-06-24 03:55:25 +02:00
Jonne Haß
4c525abe02 bump guard 2015-06-24 03:54:46 +02:00
Jonne Haß
54dabe446f bump fog 2015-06-24 03:54:39 +02:00
Jonne Haß
99c809deca bump devise 2015-06-24 03:54:35 +02:00
Jonne Haß
8e60fa33eb bump autoprefixer-rails 2015-06-24 03:54:26 +02:00
Jonne Haß
7cfc960a60 bump activerecord-import 2015-06-24 03:54:03 +02:00
Jonne Haß
7a3b66c44f bump pg 2015-06-24 03:53:39 +02:00
Jonne Haß
1f78315a23 Merge pull request #6134 from svbergerem/fix-autocomplete-offset-top
Fix offset top for autocomplete
2015-06-22 16:26:06 +02:00
Steffen van Bergerem
c9d67bdb91 Fix offset top for autocomplete 2015-06-22 15:08:16 +02:00
Jonne Haß
0b6dc320cb Merge pull request #6132 from svbergerem/fix-perfect-scrollbar
Fix overflow with perfect scrollbar
2015-06-22 01:29:40 +02:00
Jonne Haß
a663925197 Merge pull request #6130 from svbergerem/fix-autocomplete
Fix autocomplete
2015-06-22 00:48:06 +02:00
Steffen van Bergerem
df12878371 Fix overflow with perfect scrollbar 2015-06-22 00:44:42 +02:00
Steffen van Bergerem
d6ddbbe4af Navbar background color for autocomplete results 2015-06-21 21:13:57 +02:00