Commit graph

19775 commits

Author SHA1 Message Date
Benjamin Neff
f5350e2df6
updated 77 locale files [ci skip] 2018-04-30 22:10:06 +02:00
cmrd Senya
8680b24a2e
Account merging support
Adds support for merging accounts with account migration by eliminating
duplicate data in favor of the target user's data.

closes #7803
2018-04-30 22:06:34 +02:00
Dennis Schubert
360ea20367
Merge branch 'next-minor' into develop 2018-04-23 20:37:03 +02:00
Dennis Schubert
8d6c891ecb
Prepare 0.7.6.0 cycle 2018-04-23 20:35:18 +02:00
Dennis Schubert
74bac8c495
Merge branch 'next-minor' into develop 2018-04-23 20:33:20 +02:00
HankG
211e5cd1bc
Bugfix 7714 twitter char overflow
closes #7791
2018-04-23 20:33:07 +02:00
Benjamin Neff
c061425022
Add changelog entry for #7788 [ci skip] 2018-04-16 01:32:41 +02:00
Benjamin Neff
c643743df0
Merge pull request #7788 from SuperTux88/remove-mention-backport
Remove backporting of mention syntax
2018-04-16 01:27:47 +02:00
Benjamin Neff
d5f5e1991b
Merge branch 'next-minor' into develop 2018-04-16 01:26:56 +02:00
Dennis Schubert
6918dbc761
Randomize start times of daily Sidekiq-Cron jobs
closes #7787
2018-04-16 01:26:48 +02:00
Steffen van Bergerem
53d58a8bcb
Remove fileuploader.css
closes #7778
2018-04-16 01:24:38 +02:00
Benjamin Neff
8daf934c45
Remove backporting of mention syntax
fixes #7276, #7392 and #7640
2018-04-15 15:49:23 +02:00
Benjamin Neff
9171f6b5ef
Revert "Revert "Bump twitter-text""
Bump twitter-text on develop branch again

This reverts commit 15ff67499b.
2018-04-12 04:01:52 +02:00
Benjamin Neff
25fc4c746a
Merge branch 'next-minor' into develop 2018-04-12 04:01:39 +02:00
Benjamin Neff
15ff67499b
Revert "Bump twitter-text"
This adds a new dependency (`libidn11-dev` on debian, I'm not sure about
other distros).

This reverts commit 070e4caa57.
2018-04-12 04:00:41 +02:00
Benjamin Neff
bd175cfb12
Bump rails-assets-cropperjs 2018-04-12 02:50:41 +02:00
Benjamin Neff
c1ebc4d338
Merge branch 'next-minor' into develop 2018-04-12 02:49:11 +02:00
Benjamin Neff
9a661177f1
Replace rails-assets-perfect-scrollbar with rails-assets-utatti-perfect-scrollbar
closes #7772
2018-04-12 02:44:43 +02:00
Benjamin Neff
9fb63c8bd6
Bump tins 2018-04-12 02:41:58 +02:00
Benjamin Neff
417ec29ad0
Bump scss_lint 2018-04-12 02:41:57 +02:00
Benjamin Neff
6767465843
Bump rugged 2018-04-12 02:41:57 +02:00
Benjamin Neff
7e3e0058b6
Bump omniauth-oauth2 2018-04-12 02:41:57 +02:00
Benjamin Neff
e6c3d0c8f7
Bump octokit 2018-04-12 02:41:57 +02:00
Benjamin Neff
309d6d7049
Bump oauth 2018-04-12 02:41:57 +02:00
Benjamin Neff
6165a6664c
Bump gitlab 2018-04-12 02:41:57 +02:00
Benjamin Neff
129efe66eb
Bump et-orbi 2018-04-12 02:41:57 +02:00
Benjamin Neff
ed8c03860a
Bump chunky_png 2018-04-12 02:41:57 +02:00
Benjamin Neff
0e526f9221
Bump jasmine
Disable random tests for now, many tests fail when this is true (which
is now default)
2018-04-12 02:41:56 +02:00
Benjamin Neff
eb68343ae1
Bump rspec and rspec-rails 2018-04-12 02:41:56 +02:00
Benjamin Neff
fc2834e7c1
Bump webmock 2018-04-12 02:41:56 +02:00
Benjamin Neff
42c93fd4cb
Bump cucumber-api-steps 2018-04-12 02:41:56 +02:00
Benjamin Neff
2b4fed8339
Bump poltergeist 2018-04-12 02:41:56 +02:00
Benjamin Neff
e0a8a5e34c
Bump database_cleaner 2018-04-12 02:41:56 +02:00
Benjamin Neff
5432a91839
Bump capybara 2018-04-12 02:41:56 +02:00
Benjamin Neff
1a6afa54e8
Bump fuubar 2018-04-12 02:41:55 +02:00
Benjamin Neff
e0b4bff6a6
Bump fixture_builder 2018-04-12 02:41:55 +02:00
Benjamin Neff
cba90cebe8
Bump pry-byebug 2018-04-12 02:41:55 +02:00
Benjamin Neff
64f330d66b
Bump rubocop 2018-04-12 02:41:55 +02:00
Benjamin Neff
6d0cee3047
Bump haml_lint 2018-04-12 02:41:55 +02:00
Benjamin Neff
36c55e2d2e
Bump rb-fsevent 2018-04-12 02:41:55 +02:00
Benjamin Neff
39f0c58c4e
Bump guard 2018-04-12 02:41:55 +02:00
Benjamin Neff
c98b766d03
Bump asset_sync 2018-04-12 02:41:55 +02:00
Benjamin Neff
9e20215a24
Bump eye 2018-04-12 02:41:54 +02:00
Benjamin Neff
0602e7fa94
Bump versionist 2018-04-12 02:41:54 +02:00
Benjamin Neff
9240a61662
Bump hamlit 2018-04-12 02:41:54 +02:00
Benjamin Neff
7ea9a4d7ae
Bump gon 2018-04-12 02:41:54 +02:00
Benjamin Neff
b8094544a0
Bump faraday 2018-04-12 02:41:54 +02:00
Benjamin Neff
9c054e03d8
Bump openid_connect 2018-04-12 02:41:54 +02:00
Benjamin Neff
6773a49362
Bump twitter 2018-04-12 02:41:54 +02:00
Benjamin Neff
8b2a4b18c6
Bump omniauth 2018-04-12 02:41:53 +02:00