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
Sayed Abdelhaleem
2af9ccddf1
Improve photo export download integration test
...
closes #6663
2016-01-30 15:03:26 +01:00
Faldrian
8e3816e64e
let mention-regex only match usable strings
...
closes #6658
2016-01-28 18:47:13 +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
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
629e489d1c
Merge branch 'master' into stable
2016-01-26 14:36:30 +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
Benjamin Neff
44ab0df02b
fix suppress_annoying_errors
...
closes #6653
2016-01-24 07:14:58 +01:00
Steffen van Bergerem
0213bbc028
Add podmin email to 500 error page
...
closes #6652
2016-01-24 07:12:06 +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
072ce711d2
Merge branch 'master' into stable
2016-01-22 01:41:49 +01:00
Dennis Schubert
cd119f3193
Merge branch 'hotfix/0.5.6.1'
2016-01-22 01:38:51 +01:00
Steffen van Bergerem
18a46d9f90
Fix Changelog [ci skip]
2016-01-21 21:12:37 +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
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
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
Benjamin Neff
4cb6afdc94
fix plurals (10-19 was handled as 'one')
...
closes #6630
2016-01-12 16:25:26 +01:00
Benjamin Neff
96677c14d1
update rubocop.yml
...
* ignore bin folder (generated files)
* allow same length for modules as for classes
closes #6635
2016-01-12 16:08:27 +01:00
Steffen van Bergerem
e99ecd259c
Update markdown-it
...
closes #6626
2016-01-09 20:11:15 +01:00
Dennis Schubert
65a28fcde0
Start 0.5.7.0 cycle
...
[ci skip]
2016-01-06 01:04:27 +01:00
Benjamin Neff
812510b44a
refactoring tests again
...
closes #6595
2016-01-06 00:47:55 +01:00
cmrd Senya
b6c7f004e4
Further receive tests development
2016-01-06 00:47:42 +01:00
cmrd Senya
2aaf45166b
bump diaspora_federation
2016-01-06 00:47:42 +01:00
cmrd Senya
56f022f28c
Fix a few issues with public receiver which include:
...
* Make Retraction be allowed to be received publicly (probably just never used before anywhere)
* Since public receiver bypasses @object.receive in some cases add the author signature verification for relayables to protect from relayables forgery
* xml_author was wrong in some cases for RelayableRetraction
2016-01-06 00:46:14 +01:00
cmrd Senya
e54f87b7a6
Add rspec persistance file
2016-01-06 00:46:14 +01:00
Jonne Haß
d025cc38d3
Drop another plurals hack at aspects
...
It doesn't look used anymore either
2016-01-05 21:33:41 +01:00
Steffen van Bergerem
09e2c1af2e
Mention media.ccc.de in the changelog [ci skip]
2016-01-04 14:19:44 +01:00
Manuel Vögele
a4257a70e5
Wait for spinner to disappear before checking for posts in the stream
...
closes #6615
2016-01-04 00:17:47 +01:00
Jonne Haß
b1f7a452f9
bump spring
2015-12-31 16:09:11 +01:00
Jonne Haß
733e61ee1a
bump responders
2015-12-31 16:09:11 +01:00
Jonne Haß
7c1600d1b1
bump redcarpet
2015-12-31 16:09:11 +01:00
Jonne Haß
65685695d2
bump omniauth
2015-12-31 16:09:11 +01:00
