Commit graph

3584 commits

Author SHA1 Message Date
Dennis Schubert
10bf1c0925
Merge branch 'next-minor' into develop 2017-03-28 01:57:02 +02:00
Benjamin Neff
35f4d61d11
Disable rack session cookie for sidekiq
Since 4.2.3 sidekiq allows to disable its own session cookie for the
case where the app provides a session already.

closes #7395
2017-03-28 01:56:52 +02:00
Dennis Schubert
efdfa749a7
Merge branch 'next-minor' into develop
closes #7398
2017-03-28 01:48:35 +02:00
Steffen van Bergerem
7feed3545c
Create mention success flash message with JavaScript 2017-03-28 01:46:30 +02:00
Benjamin Neff
af0a5e32a1
Merge pull request #7369 from svbergerem/color-themes-i18n
i18n for color themes
2017-03-26 03:12:54 +02:00
Steffen van Bergerem
a2ca68b523
Merge branch 'next-minor' into develop 2017-03-21 13:34:59 +01:00
flaburgan
ad7d4d777b
Add links to liked and commented pages within My activity
closes #5502
2017-03-21 13:34:47 +01:00
cmrd Senya
c90cb3328e
jQuery 3 integration 2017-03-18 16:50:52 +02:00
Steffen van Bergerem
7eb3dabb44
i18n for color themes 2017-03-16 12:25:41 +01:00
goobertron
6657fd51fa
Capitalisation of colour themes 2017-03-16 12:03:53 +01:00
Benjamin Neff
78359d69d8
Merge branch 'next-minor' into develop 2017-03-12 04:32:47 +01:00
Benjamin Neff
3a6e5d5446
Merge branch 'master' into next-minor 2017-03-12 04:32:06 +01:00
Benjamin Neff
a9c282d986
Merge branch 'release/0.6.4.0' 2017-03-12 04:18:52 +01:00
Benjamin Neff
2c6101fbbd
updated 27 locale files [ci skip] 2017-03-12 04:17:45 +01:00
Benjamin Neff
13698bece5
Start 0.6.5.0 cycle 2017-03-05 01:56:50 +01:00
Benjamin Neff
ae687cf1d5
Merge branch 'next-minor' into develop 2017-03-05 00:01:11 +01:00
Benjamin Neff
8e4261100b
Create asterisk.png without digest after precompile
fixes #7317

closes #7322
2017-03-04 23:58:08 +01:00
Benjamin Neff
f9cf844602
Merge pull request #7280 from svbergerem/remove-chartbeat-and-mixpanel
Remove chartbeat and mixpanel support
2017-02-17 22:22:30 +01:00
Benjamin Neff
a025a23c71
Merge branch 'next-minor' into develop 2017-01-23 02:43:12 +01:00
Benjamin Neff
c130b78117
Merge branch 'master' into next-minor 2017-01-23 02:42:53 +01:00
Benjamin Neff
1702cc1c86
Merge branch 'release/0.6.3.0' 2017-01-23 02:39:54 +01:00
Benjamin Neff
3d992160c3
Enable locales: de-CH, gd, and oc 2017-01-23 02:35:14 +01:00
Benjamin Neff
46ef3e65c4
updated 86 locale files [ci skip] 2017-01-23 02:09:19 +01:00
Benjamin Neff
af00d7c5c0
Merge branch 'next-minor' into develop 2017-01-22 23:30:42 +01:00
flaburgan
1028632ac1
Add Liberapay button in the donate section
closes #7290
2017-01-22 23:29:57 +01:00
Benjamin Neff
a0bfe6ffbe Merge branch 'next-minor' into develop 2017-01-16 01:17:35 +01:00
Steffen van Bergerem
b508b9f6ef Update database config comments
closes #7282
2017-01-16 01:17:27 +01:00
Benjamin Neff
7b7fbeffdc Merge branch 'next-minor' into develop 2017-01-15 23:45:56 +01:00
Steffen van Bergerem
941118d7af Move formatting from locale to views
closes #7283
2017-01-15 23:42:03 +01:00
Steffen van Bergerem
bd0210a181
Remove chartbeat and mixpanel support 2017-01-15 13:30:54 +01:00
Benjamin Neff
66367cccd8 Start 0.6.4.0 cycle 2017-01-15 05:05:24 +01:00
Steffen van Bergerem
eb8d9809ff
Merge branch 'next-minor' into develop 2017-01-15 04:04:31 +01:00
SansPseudoFix
0f60b9fb94
Switch reason and message
unify

rename and show full post on reports

Fix XSS issue

Unification

Style

Fix pronto

closes #7180
2017-01-15 04:04:18 +01:00
Benjamin Neff
03f9147589 Merge branch 'next-minor' into develop 2017-01-15 02:19:10 +01:00
Steffen van Bergerem
b8d3323de0 Return error when unlike failed 2017-01-15 02:17:10 +01:00
cmrd Senya
1fb6040344
new PostController#mentionable_in_comment action 2017-01-13 04:47:50 +02:00
Benjamin Neff
ac136030c6 Merge branch 'next-minor' into develop 2017-01-11 02:43:41 +01:00
Steffen van Bergerem
c9d49c89a6 Always show mobile reaction counts
fixes #5829
2017-01-11 02:43:06 +01:00
Steffen van Bergerem
a11747a579
Merge branch 'next-minor' into develop 2017-01-07 03:05:13 +01:00
flaburgan
8e5d2f5c65
Add links to the aspects and followed tags page on mobile
closes #7265
2017-01-07 03:05:01 +01:00
Benjamin Neff
b632155772 Merge branch 'next-minor' into develop 2017-01-04 02:33:00 +01:00
flaburgan
03db9807d7 Remove Vines mention, fix #7262
closes #7264
2017-01-04 02:23:57 +01:00
Dennis Schubert
a1331aa3b1
Merge branch 'release/0.6.2.0' into next-minor 2016-12-13 18:51:33 +01:00
Dennis Schubert
ea35061feb
updated 121 locale files [ci skip] 2016-12-13 18:51:19 +01:00
Dennis Schubert
52b7d6ed9e
updated 121 locale files [ci skip] 2016-12-13 18:49:44 +01:00
Benjamin Neff
fca13efdf2 Merge branch 'next-minor' into develop 2016-12-08 03:19:45 +01:00
Benjamin Neff
7ce3982b6d Merge branch 'release/0.6.2.0' into next-minor 2016-12-08 03:19:23 +01:00
Flaburgan
f785de7484 Reformulate CSRF e-mail
closes #7241
2016-12-08 03:16:19 +01:00
Dennis Schubert
991b047be7
Start 0.6.3.0 cycle 2016-12-04 20:12:00 +01:00
Dennis Schubert
2c68c1f142
Merge branch 'next-minor' into develop 2016-12-04 20:10:17 +01:00