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
Dennis Schubert
541e053ddb
Merge branch 'stable' into develop
2016-01-24 07:09:12 +01:00
Benjamin Neff
ebfb901b39
update federation gem to prevent locale leakage in receive requests
...
closes #6651
2016-01-24 07:02:15 +01:00
Dennis Schubert
9c7b5bc0ce
Merge pull request #6648 from svbergerem/fix-timeago-reshares
...
Fix timeago tooltips for reshares
2016-01-22 02:33:39 +01:00
Dennis Schubert
e79eab67b9
Merge branch 'stable' into develop
2016-01-22 01:42:39 +01:00
Dennis Schubert
072ce711d2
Merge branch 'master' into stable
2016-01-22 01:41:49 +01:00
Dennis Schubert
22fa2c7cc4
Merge branch 'hotfix/0.5.6.1' into develop
2016-01-22 01:40:29 +01:00
Dennis Schubert
cd119f3193
Merge branch 'hotfix/0.5.6.1'
2016-01-22 01:38:51 +01:00
Steffen van Bergerem
a3adc2fb36
Fix timeago tooltips for reshares
2016-01-21 22:42:30 +01:00
Steffen van Bergerem
f6da6a68f6
Merge branch 'stable' into develop
2016-01-21 21:13:01 +01:00
Steffen van Bergerem
18a46d9f90
Fix Changelog [ci skip]
2016-01-21 21:12:37 +01:00
Dennis Schubert
dd93cb6cad
Merge pull request #6646 from svbergerem/commenting-when-ignored
...
Tell user that the author might ignore them when commenting/liking failed
2016-01-21 21:07:37 +01:00
Steffen van Bergerem
a52c8a2f55
Tell user that the author might ignore them when commenting/liking failed
2016-01-21 21:02:39 +01:00
Dennis Schubert
ff867cd471
Merge branch 'stable' into develop
2016-01-21 21:00:32 +01:00
Steffen van Bergerem
749016a7b4
Fix keyboard shortcuts on profile pages
...
closes #6647
2016-01-21 21:00:26 +01:00
Dennis Schubert
a8008571b3
Bump devise
2016-01-21 20:55:46 +01:00
Dennis Schubert
f7d42fa83d
Bump nokogiri
2016-01-21 20:47:54 +01:00
Dennis Schubert
64a780c831
Prepare 0.5.6.1 hotfix
2016-01-21 20:47:44 +01:00
Steffen van Bergerem
6fce81fc99
Merge branch 'stable' into develop
2016-01-20 21:37:30 +01:00
tamatsyk
960e651764
internationalize controller rescue_from text
...
Fix typos
change forbitten to forbidden
fix styling issue and copypaste
improve code style for aspec_memberships_controller.rb with rubocop
fix styling issues
aligned elements of hash literals
fix typo
fix locale name and styling of its usage
fix failing tests
closes #6554
2016-01-20 21:37:02 +01:00
Dennis Schubert
053625c277
Merge branch 'stable' into develop
2016-01-13 23:11:35 +01:00
Dennis Schubert
e30019988f
Merge branch 'master' into stable
2016-01-13 23:10:27 +01:00
Dennis Schubert
5aef0441e8
Merge branch 'release/0.5.6.0'
2016-01-13 23:09:51 +01:00
Jonne Haß
aa6e4ec0d2
Merge pull request #6631 from svbergerem/white-color-theme
...
White color theme
2016-01-12 16:35:42 +01:00
Jonne Haß
ec0ba06857
Merge branch 'stable' into develop
2016-01-12 16:26:04 +01:00
