Benjamin Neff
|
1289b3b541
|
Merge branch 'next-minor' into develop
|
2018-07-13 10:22:04 +02:00 |
|
Dennis Schubert
|
af500dabbc
|
Add section in the User's settings to register the protocol handler
closes #7833
|
2018-07-13 10:19:43 +02:00 |
|
Benjamin Neff
|
dcbdb69e22
|
Merge branch 'next-minor' into develop
|
2018-07-11 01:35:50 +02:00 |
|
cmrd Senya
|
6f812a5b8f
|
Add LinksController
LinksController redirects requests for provided diaspora:// links to
respective entities urls.
|
2018-07-11 01:24:28 +02:00 |
|
Benjamin Neff
|
4aa08ddf14
|
Merge branch 'next-minor' into develop
|
2018-06-27 02:46:26 +02:00 |
|
Benjamin Neff
|
c2fa0b1eba
|
Merge branch 'master' into next-minor
|
2018-06-27 02:46:04 +02:00 |
|
Benjamin Neff
|
2b3bbc1a6c
|
Merge branch 'release/0.7.6.0'
|
2018-06-27 02:42:00 +02:00 |
|
Benjamin Neff
|
097754e493
|
updated 6 locale files [ci skip]
|
2018-06-27 02:31:52 +02:00 |
|
Benjamin Neff
|
67d6d2ff25
|
Prepare 0.7.7.0 cycle
|
2018-06-20 01:38:17 +02:00 |
|
Benjamin Neff
|
299c04a24a
|
Merge pull request #7781 from SuperTux88/enable-csp-by-default
Enable Content-Security-Policy header by default
|
2018-06-16 21:21:07 +02:00 |
|
Benjamin Neff
|
8983901b1a
|
Merge branch 'next-minor' into develop
|
2018-06-16 21:19:41 +02:00 |
|
Benjamin Neff
|
10841b6031
|
updated 16 locale files [ci skip]
|
2018-06-16 21:18:15 +02:00 |
|
Jonne Haß
|
fe75602928
|
update armenian locales
|
2018-06-16 21:12:13 +02:00 |
|
Jonne Haß
|
fac3c4bbe3
|
update plural rules
|
2018-06-16 21:12:13 +02:00 |
|
goobertron
|
d1597c0b23
|
Update locale_settings.yml with 3 Armenian variants
|
2018-06-16 21:12:09 +02:00 |
|
Benjamin Neff
|
f3d2a54050
|
Merge branch 'next-minor' into develop
|
2018-06-16 04:36:13 +02:00 |
|
cmrd Senya
|
87968284ba
|
Support fetching StatusMessage by Poll guid
When public fetch is requested with Poll guid, return parent
StatusMessage for it, which includes the Poll in its turn.
closes #7815
|
2018-06-16 04:36:05 +02:00 |
|
Benjamin Neff
|
212da3a2b7
|
Merge branch 'next-minor' into develop
|
2018-06-16 01:23:10 +02:00 |
|
Alex Tribble
|
1b03265c2e
|
Allow fonts to be served from asset host in CSP.
Closes #7796
closes #7825
|
2018-06-16 01:22:22 +02:00 |
|
Benjamin Neff
|
22d1ad995c
|
Merge branch 'next-minor' into develop
|
2018-04-30 22:54:33 +02:00 |
|
Benjamin Neff
|
b7cd9d6238
|
Merge branch 'master' into next-minor
|
2018-04-30 22:54:03 +02:00 |
|
Benjamin Neff
|
42ceb8b3e3
|
Merge branch 'release/0.7.5.0'
|
2018-04-30 22:51:23 +02:00 |
|
Benjamin Neff
|
6a3d9ede52
|
Make ja-KS avaliable
|
2018-04-30 22:18:55 +02:00 |
|
Benjamin Neff
|
f5350e2df6
|
updated 77 locale files [ci skip]
|
2018-04-30 22:10:06 +02:00 |
|
Dennis Schubert
|
8d6c891ecb
|
Prepare 0.7.6.0 cycle
|
2018-04-23 20:35:18 +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 |
|
Benjamin Neff
|
c1ebc4d338
|
Merge branch 'next-minor' into develop
|
2018-04-12 02:49:11 +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
|
e0b4bff6a6
|
Bump fixture_builder
|
2018-04-12 02:41:55 +02:00 |
|
Benjamin Neff
|
7854e14e07
|
Bump secure_headers
|
2018-04-12 02:41:53 +02:00 |
|
Benjamin Neff
|
66175f6908
|
Merge branch 'next-minor' into develop
|
2018-04-12 01:56:07 +02:00 |
|
Benjamin Neff
|
7d6623d069
|
Remove contacts page on profiles
closes #7769
|
2018-04-12 01:40:49 +02:00 |
|
Benjamin Neff
|
4fa92c1823
|
Remove flag for contacts visible to each other
This feature only worked on the same pod and was more confusing than
useful.
|
2018-04-12 01:39:11 +02:00 |
|
Benjamin Neff
|
c0a4895854
|
Enable Content-Security-Policy header by default
|
2018-04-10 21:29:34 +02:00 |
|
Benjamin Neff
|
aa6f4d46c9
|
Merge branch 'hotfix/0.7.4.1'
|
2018-04-10 01:56:29 +02:00 |
|
Dennis Schubert
|
ae17248b2e
|
Merge pull request #7734 from Fensterbank/client-side-picture-resize
Resize images on client-side before uploading
|
2018-04-02 10:38:51 +02:00 |
|
Benjamin Neff
|
c84411ea62
|
Merge branch 'next-minor' into develop
|
2018-03-25 08:37:11 +02:00 |
|
cmrd Senya
|
0080a2567f
|
StatusMessageController#create: respond 422 when aspect_ids are wrong
fixes #3862
closes #7742
|
2018-03-25 08:31:32 +02:00 |
|
Besnik Bleta
|
bc3908a103
|
Update for sq translation
|
2018-03-25 08:24:38 +02:00 |
|
Jonne Haß
|
5e96cc6d89
|
add carrierwave error messages
|
2018-03-25 08:24:10 +02:00 |
|
Besnik Bleta
|
a867d64631
|
Update for sq translation
|
2018-03-24 18:13:12 +02:00 |
|
Benjamin Neff
|
0d07d9f3de
|
Merge branch 'next-minor' into develop
|
2018-03-18 23:14:20 +01:00 |
|
Benjamin Neff
|
c7709e29f2
|
Merge branch 'master' into next-minor
|
2018-03-18 23:13:48 +01:00 |
|
Benjamin Neff
|
d031375610
|
Merge branch 'release/0.7.4.0'
|
2018-03-18 23:11:47 +01:00 |
|
Benjamin Neff
|
aadd64b0a5
|
updated 43 locale files [ci skip]
|
2018-03-18 23:05:19 +01:00 |
|
Jonne Haß
|
e1b1491f75
|
Merge branch 'next-minor' into develop
|
2018-03-16 11:31:34 +01:00 |
|
Jonne Haß
|
300d09e258
|
add ja-KS fallback to ja
|
2018-03-16 11:31:11 +01:00 |
|
Benjamin Neff
|
4d54c85eee
|
Start 0.7.5.0 cycle
|
2018-03-12 23:59:31 +01:00 |
|
Frédéric Bolvin
|
6d55b15604
|
Resize images on client-side before uploading
|
2018-03-11 11:20:16 +01:00 |
|