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
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
Frédéric Bolvin
23e4062342
Allow blob: URIs to be used as a content source in CSP header
2018-03-03 21:12:18 +01:00
Benjamin Neff
0b921c6657
Merge branch 'next-minor' into develop
2018-02-17 19:26:15 +01:00
cmrd Senya
3e31b91b11
Add @nophantomjs tag to default cucumber profile
...
Use this tag for tests which can't work with PhantomJS, but which we
can run with Selenium using some other profile (not implemented here).
closes #6418
2018-02-17 19:24:39 +01:00
cmrd Senya
b32c844314
Support for embedding HTML5 media links
...
Use markdown-it-html5-embed plugin so user can embed audio and
video using the markdown link syntax []() in the HTML5 way.
2018-02-17 19:21:10 +01:00
Dennis Schubert
948e31b10c
Merge branch 'next-minor' into develop
2018-02-09 03:15:38 +01:00
Dennis Schubert
f8ce276ddc
Merge branch 'master' into next-minor
2018-02-09 03:15:18 +01:00
Dennis Schubert
b23696bb88
Merge branch 'hotfix/0.7.3.1'
2018-02-09 03:13:51 +01:00
Dennis Schubert
005dd923c9
Pull updated German translations to fix "reshare" UX issues
2018-02-09 03:09:44 +01:00
Benjamin Neff
3033e915e5
Merge branch 'next-minor' of github.com:diaspora/diaspora into next-minor
2018-02-08 23:19:57 +01:00
Benjamin Neff
fc2397c062
Merge branch 'next-minor' into develop
2018-02-08 22:55:43 +01:00
Benjamin Neff
a8fcbb3365
Merge branch 'master' into next-minor
2018-02-08 22:55:30 +01:00
Benjamin Neff
1f3ad2fa65
Merge branch 'release/0.7.3.0'
2018-02-08 22:54:14 +01:00
Benjamin Neff
aff4be8821
updated 21 locale files [ci skip]
2018-02-08 22:46:45 +01:00
Dennis Schubert
ea606b374a
Merge branch 'next-minor' into develop
2018-02-03 16:43:30 +01:00
Fla
35535d5bfb
Remove unnecessary quotes in database.yml.examle
...
[ci skip]
closes #7711
2018-02-03 16:42:51 +01:00
Dennis Schubert
7abb0518e9
Start 0.7.4.0 cycle
...
[ci skip]
2018-02-01 23:48:04 +01:00
Dennis Schubert
13d24cc611
Merge branch 'next-minor' into develop
2018-01-08 21:15:49 +01:00
Janakas
d4e5d13a8f
Remove old export archives after 2 weeks
...
Fixes #5727
2018-01-08 21:14:06 +01:00
Janakas
497c647983
Rearrange userdata-export section and change timestamp to timeago
2018-01-08 21:14:01 +01:00
Benjamin Neff
03ee954c10
Merge branch 'next-minor' into develop
2017-12-26 03:38:10 +01:00
Benjamin Neff
25d41429bc
Merge branch 'master' into next-minor
2017-12-26 03:37:57 +01:00
Benjamin Neff
cf2bd66005
Merge branch 'release/0.7.2.0'
2017-12-26 03:36:49 +01:00
Benjamin Neff
a9cce95a74
updated 32 locale files [ci skip]
2017-12-26 03:30:32 +01:00
Benjamin Neff
c5536395c0
Start 0.7.3.0 cycle
2017-12-18 04:55:45 +01:00
Benjamin Neff
d42801a737
Merge branch 'next-minor' into develop
2017-12-18 04:41:49 +01:00
Rete2
fc33a2ac5d
Create birthday notification and mailer
...
closes #7624
fixes #1649
2017-12-18 04:34:35 +01:00
Jonne Haß
c8d1043590
add carrierwave error messages
2017-12-03 14:53:44 +01:00
