Commit graph

3760 commits

Author SHA1 Message Date
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
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
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
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
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
Dennis Schubert
6918dbc761
Randomize start times of daily Sidekiq-Cron jobs
closes #7787
2018-04-16 01:26:48 +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
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
aa6f4d46c9
Merge branch 'hotfix/0.7.4.1' 2018-04-10 01:56:29 +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
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ß
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
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
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
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
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
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
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
Rete2
fc33a2ac5d
Create birthday notification and mailer
closes #7624

fixes #1649
2017-12-18 04:34:35 +01:00
Benjamin Neff
89eeec72d3
Merge branch 'master' into next-minor 2017-11-01 00:50:17 +01:00
Benjamin Neff
2c9fec91da
Merge branch 'hotfix/0.7.1.1' 2017-11-01 00:49:19 +01:00
Benjamin Neff
63fcc9c1bc
Fix compatibility with Bundler 1.6
Stop using `Bundler.settings.with`, because it will be removed from
Bundler 1.6.

Also, as described in #7653, we could use `Bundler.settings[:with]`, but
that would be internal API again, so it probably breaks again in the
future. That's why I added a `BundlerHelper` module to parse the
required optional group from our config files, without the use of any
internal Bundler API.

Fixes #7653
2017-11-01 00:45:18 +01:00
Benjamin Neff
2ce7d59cb3
Merge branch 'master' into next-minor 2017-10-21 00:45:59 +02:00
Benjamin Neff
db95c94c97
Merge branch 'release/0.7.1.0' 2017-10-21 00:44:32 +02:00
Benjamin Neff
783650e34c
updated 35 locale files [ci skip] 2017-10-21 00:41:40 +02:00
Benjamin Neff
1b6ffa2528
Start 0.7.2.0 cycle 2017-09-28 23:38:57 +02:00
Benjamin Neff
fd36517dee
Limit the number of parallel exports that are allowed to run
closes #7629
2017-09-28 23:11:46 +02:00
Benjamin Neff
bb97aa8538
Allow RFC 7033 WebFinger via http:// for development 2017-09-28 23:04:34 +02:00
Benjamin Neff
508e44e01b
Merge branch 'hotfix/0.7.0.1' 2017-09-19 20:24:37 +02:00
Benjamin Neff
e82690963d
Add # frozen_string_literal: true to all files 2017-09-17 19:29:15 +02:00
goobertron
e7cac2e466
Replace <b> with <strong> in translations
closes #7585
2017-08-29 02:00:34 +02:00
goobertron
51152e140d
Add ignore feature to help section
Fixes #7572
2017-08-29 01:59:51 +02:00
Rete2
b556ad5211
show users vote in poll
closes #7550
2017-08-26 03:16:05 +02:00
Benjamin Neff
5ea7b8ee13
Set fog_provider and load carrierwave/storage/fog if S3 is enabled
Fixes #7563

closes #7566
2017-08-26 02:50:18 +02:00
Frédéric Bolvin
398235ee6f
use asset manifest instead of entries in config.assets.precompile
closes #7565
2017-08-26 02:44:41 +02:00
Benjamin Neff
b8149a1fa1
Remove ie.js
Was needed for IE8
2017-08-24 14:56:37 +02:00
Benjamin Neff
7153df5c86
Merge branch 'release/0.7.0.0' 2017-08-19 22:38:38 +02:00
Benjamin Neff
1c753204bc
Merge branch 'release/0.7.0.0' into next-minor 2017-08-19 18:24:43 +02:00
Benjamin Neff
bf47e1bc93
Make sc avaliable
Also add "it" as fallback for "oc" and "sc"
2017-08-19 18:23:38 +02:00
Benjamin Neff
3b9848802e
updated 53 locale files [ci skip] 2017-08-19 18:05:00 +02:00
Benjamin Neff
0c1dd195da
Start 0.7.1.0 cycle 2017-08-15 01:45:45 +02:00
Benjamin Neff
5f3a62fc43
Disable rendering logging in production 2017-08-13 05:23:57 +02:00
flaburgan
d14908ed0d
Sharing and tags 2017-08-13 04:53:53 +02:00
flaburgan
770e7ddc2b
Public post 2017-08-13 04:53:53 +02:00
flaburgan
21cdc6041d
Private profile 2017-08-13 04:53:53 +02:00
flaburgan
0671a3a60c
Insert an image 2017-08-13 04:53:52 +02:00
flaburgan
8158a3a3b5
Markdown indications 2017-08-13 04:53:52 +02:00
flaburgan
1e591b041f
Report only spam or illegal content 2017-08-13 04:53:51 +02:00
flaburgan
8b63eabcbe
Search approximation 2017-08-13 04:53:51 +02:00
flaburgan
a14a0e34c6
Mention in comments 2017-08-13 04:53:51 +02:00
flaburgan
bd7f50f9b6
'Make contacts in this aspect visible to each other' is a local feature 2017-08-13 04:53:50 +02:00
flaburgan
c494640a51
Update the migration section 2017-08-13 04:53:50 +02:00
flaburgan
330e0f1fa1
Add link to discourse 2017-08-13 04:53:47 +02:00
Steffen van Bergerem
04735ce9b0
Remove unused interactions method in post controller 2017-08-12 18:09:14 +02:00
Steffen van Bergerem
6b162110ce
Add 'show all' links to the SPV to fetch missing likes and reshares 2017-08-12 18:09:13 +02:00
Benjamin Neff
04c3880d79
Use config.eager_load_paths in production
See http://guides.rubyonrails.org/upgrading_ruby_on_rails.html#autoloading-is-disabled-after-booting-in-the-production-environment
2017-08-12 17:04:00 +02:00
Benjamin Neff
b203862ca3
Workaround for bootstrap-sass
The change in assets.rb should be enough, but it doesn't work, because
sprockets `after_initialize` runs before it and initializes sprockets
with unfiltered paths.

But the trick with the underscore works, because bootstrap-sass has
named the file `_bootstrap.scss`, and rails-assets-bootstrap has
`bootstrap.scss`, so with `_bootstrap` it uses the correct bootstrap.
2017-08-12 15:39:26 +02:00
Benjamin Neff
3d7061b240
Update configs for rails 5
Used `rails app:update`
2017-08-12 15:39:19 +02:00
flaburgan
c2e0feb38b Include first/last name in invitation emails 2017-08-07 19:08:17 +02:00
Benjamin Neff
7f8108e4ac
Precompile bookmarklet to use in production
`Rails.application.assets` is only available when `config.assets.compile`
is true (which is false in production). So the old way with a separate
rake task doesn't work in production. But we can get the filename of the
precompiled file from `Rails.application.assets_manifest.assets`.
2017-07-31 22:43:28 +02:00
Benjamin Neff
a797f2d27b
Don't precompile all themes for tests
And sprockets 3 also caches files in tmp/cache/assets/sprockets
2017-07-30 05:57:19 +02:00
Benjamin Neff
7ee8bfbac4
Precompile poltergeist_disable_transition.css for tests 2017-07-30 05:01:39 +02:00
Benjamin Neff
29a7f151b6
Use config.assets.quiet instead of quiet_assets gem
The quiet_assets gem doesn't support rails 5, but sprockets 3 now has a
config.assets.quiet option, which deprecates the quiet_assets gem. But
the logging gem has a no-op silence method, that's why the quiet option
doesn't work out-of-the-box. I added a little hack to use the silence
method from ActiveSupport, which is also used from the original rails
logger.
2017-07-30 04:47:16 +02:00
Benjamin Neff
01ca08b86f
Merge pull request #7436 from SuperTux88/federation-update
Federation gem update
2017-07-14 01:31:32 +02:00
Benjamin Neff
d62d79bc29
Merge branch 'next-minor' into develop 2017-07-12 03:51:17 +02:00
Benjamin Neff
541dcbcd39
Merge branch 'master' into next-minor 2017-07-12 03:50:58 +02:00
Benjamin Neff
8bed8a84a3
Merge branch 'release/0.6.7.0' 2017-07-12 03:49:09 +02:00
Benjamin Neff
0e8bb71449
updated 126 locale files [ci skip] 2017-07-12 03:42:15 +02:00
Benjamin Neff
58609e42d7
Merge branch 'next-minor' into develop 2017-07-05 02:10:24 +02:00
Benjamin Neff
58aa59fb8e
Start 0.6.8.0 cycle 2017-07-05 02:07:45 +02:00
Benjamin Neff
0e13a316f6
Cleanup some translations
closes #7465
2017-07-05 02:02:13 +02:00