Faldrian
|
6da2720168
|
Check for collapsible content_view again after images are loaded
|
2016-02-04 21:39:28 +01:00 |
|
Jonne Haß
|
1832c2956e
|
Merge branch 'stable' into develop
|
2016-02-01 11:27:06 +01:00 |
|
Sayed Abdelhaleem
|
fa97a5a5a2
|
Issue #6662: fix refresh my photos routing error
closes #6667
|
2016-02-01 11:24:16 +01:00 |
|
Jonne Haß
|
1b34d01ba5
|
Merge pull request #6666 from svbergerem/fix-blueimp-gallery-indicators
Fix blueimp gallery indicators
|
2016-02-01 10:37:08 +01:00 |
|
Steffen van Bergerem
|
17e8d2fcbb
|
Fix blueimp gallery indicators
|
2016-02-01 02:32:49 +01:00 |
|
Steffen van Bergerem
|
ef31b441e8
|
Bump rails-assets-blueimp-gallery
|
2016-02-01 00:20:06 +01:00 |
|
Steffen van Bergerem
|
461a337cc6
|
Bump rails-assets-autosize
|
2016-02-01 00:19:48 +01:00 |
|
Steffen van Bergerem
|
6fa0fe5202
|
Bump sidekiq-cron
|
2016-02-01 00:18:32 +01:00 |
|
Steffen van Bergerem
|
53bf478f24
|
Bump sidekiq
|
2016-02-01 00:17:24 +01:00 |
|
Steffen van Bergerem
|
02a0650b0e
|
Bump eye
|
2016-02-01 00:14:21 +01:00 |
|
Jonne Haß
|
3a1ead1b21
|
Merge branch 'stable' into develop
|
2016-02-01 00:06:06 +01:00 |
|
Steffen van Bergerem
|
2f66c7c89a
|
Bump rails-assets-perfect-scrollbar
|
2016-01-31 23:56:56 +01:00 |
|
Steffen van Bergerem
|
f1aad6512a
|
Bump rails-assets-highlightjs
|
2016-01-31 23:42:58 +01:00 |
|
Steffen van Bergerem
|
89dedb8ba1
|
Bump will_paginate
|
2016-01-31 23:36:21 +01:00 |
|
Steffen van Bergerem
|
3065e1bf21
|
Bump sinatra
|
2016-01-31 23:33:23 +01:00 |
|
Steffen van Bergerem
|
80088fa2a0
|
Bump simple_captcha2
|
2016-01-31 23:27:09 +01:00 |
|
Steffen van Bergerem
|
0540a14056
|
Bump js-routes
|
2016-01-31 23:19:14 +01:00 |
|
Steffen van Bergerem
|
809763f653
|
Bump jquery-rails and rails-assets-jquery
|
2016-01-31 23:19:14 +01:00 |
|
Steffen van Bergerem
|
ce8e8716b9
|
Bump handlebars_assets
|
2016-01-31 23:19:14 +01:00 |
|
Steffen van Bergerem
|
3782935b19
|
Bump devise
|
2016-01-31 23:16:25 +01:00 |
|
Steffen van Bergerem
|
5995afbd36
|
Bump autoprefixer-rails
|
2016-01-31 23:13:57 +01:00 |
|
Jonne Haß
|
f4454f4488
|
Merge branch 'stable' into develop
|
2016-01-30 15:04:29 +01:00 |
|
Sayed Abdelhaleem
|
2af9ccddf1
|
Improve photo export download integration test
closes #6663
|
2016-01-30 15:03:26 +01:00 |
|
Jonne Haß
|
bf154a122e
|
Merge pull request #6660 from SuperTux88/fix-sidekiq-cron-queues
fix queues for cron jobs
|
2016-01-29 13:05:45 +01:00 |
|
Benjamin Neff
|
ce407568d9
|
fix queues for cron jobs
remove the queues from the schedule.yml so the configured queue in the worker is used
|
2016-01-28 23:46:37 +01:00 |
|
Jonne Haß
|
32bda8fe20
|
Merge branch 'stable' into develop
|
2016-01-28 18:47:18 +01:00 |
|
Faldrian
|
8e3816e64e
|
let mention-regex only match usable strings
closes #6658
|
2016-01-28 18:47:13 +01:00 |
|
Jonne Haß
|
762299b6ad
|
Merge branch 'stable' into develop
|
2016-01-28 16:36:46 +01:00 |
|
Sayed Abdelhaleem
|
8c0d12b6d3
|
fix NameError: uninitialized constant User::Zip by specifying rubzip gem main file name in Gemfile
closes #6659
|
2016-01-28 16:36:40 +01:00 |
|
Steffen van Bergerem
|
7e297ea18a
|
Add changelog entry for #6641 [ci skip]
|
2016-01-27 00:09:58 +01:00 |
|
Steffen van Bergerem
|
40c42eb5b3
|
Merge pull request #6641 from Flaburgan/add-poll-result
Add answer poll counts
|
2016-01-26 23:54:37 +01:00 |
|
Dennis Schubert
|
7c197756dd
|
Merge branch 'stable' into develop
|
2016-01-26 15:19:55 +01:00 |
|
Dennis Schubert
|
211365c169
|
Merge branch 'master' into stable
|
2016-01-26 15:19:27 +01:00 |
|
Dennis Schubert
|
ad20bb052c
|
Fix include_root_in_json misuse
since it is no longer exposed for instances, our post_presenter failed
hard.
|
2016-01-26 15:18:02 +01:00 |
|
Dennis Schubert
|
72fe5a79c2
|
Prepeare 0.5.6.3 hotfix-hotfix
|
2016-01-26 14:59:33 +01:00 |
|
Dennis Schubert
|
83971c507b
|
Merge branch 'stable' into develop
|
2016-01-26 14:36:39 +01:00 |
|
Dennis Schubert
|
629e489d1c
|
Merge branch 'master' into stable
|
2016-01-26 14:36:30 +01:00 |
|
Dennis Schubert
|
8da3cc0852
|
Merge branch 'stable' into develop
|
2016-01-26 14:33:36 +01:00 |
|
Dennis Schubert
|
6153fc7286
|
Merge branch 'hotfix/0.5.6.2' into stable
|
2016-01-26 14:30:34 +01:00 |
|
Dennis Schubert
|
c37154e6b3
|
Merge branch 'hotfix/0.5.6.2'
|
2016-01-26 14:29:18 +01:00 |
|
Dennis Schubert
|
33af30529a
|
Bump rails
|
2016-01-26 14:28:02 +01:00 |
|
Dennis Schubert
|
c04ee239c6
|
Prepare 0.5.6.2 hotfix
|
2016-01-26 14:26:10 +01:00 |
|
fla
|
1e27b509f9
|
Add number of votes on poll answers
|
2016-01-24 14:31:06 +01:00 |
|
Dennis Schubert
|
f7c03514cb
|
Remove old diaspora_federation-* Gems
|
2016-01-24 08:16:22 +01:00 |
|
Dennis Schubert
|
5f986464da
|
Drop Redis namespace support
|
2016-01-24 07:29:28 +01:00 |
|
cmrd Senya
|
ed61ef6d6a
|
Replace sidetiq with sidekiq-cron
closes #6616
|
2016-01-24 07:20:44 +01:00 |
|
Dennis Schubert
|
515cda7658
|
Merge branch 'stable' into develop
|
2016-01-24 07:15:04 +01:00 |
|
Benjamin Neff
|
44ab0df02b
|
fix suppress_annoying_errors
closes #6653
|
2016-01-24 07:14:58 +01:00 |
|
Dennis Schubert
|
b1aa8aacfd
|
Merge branch 'stable' into develop
|
2016-01-24 07:13:11 +01:00 |
|
Steffen van Bergerem
|
0213bbc028
|
Add podmin email to 500 error page
closes #6652
|
2016-01-24 07:12:06 +01:00 |
|