Commit graph

3650 commits

Author SHA1 Message Date
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
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
flaburgan
ea9e50085d
Add link to discourse in footer and left side bar 2017-07-05 01:57:17 +02:00
flaburgan
07d0ed916d
Fix design issues + pronto
closes #7295
2017-07-05 01:51:07 +02:00
SansPseudoFix
5cb4c6e5df
Refactor, more partials + No version check for mobile 2017-07-05 01:50:16 +02:00
SansPseudoFix
276b640418
Add admin views to mobile, use partials for common code with desktop 2017-07-05 01:50:10 +02:00
Benjamin Neff
4f9e560ab3
Use RFC 7033 webfinger from diaspora_federation gem 2017-07-03 03:14:41 +02:00
Benjamin Neff
87d0778086
Remove guid and public_key from WebFinger
Related to diaspora/diaspora_federation#39
2017-07-02 23:56:00 +02:00
Benjamin Neff
05efe9b8fe
Merge branch 'next-minor' into develop 2017-05-29 03:21:59 +02:00
Benjamin Neff
1751e21a87
Merge branch 'master' into next-minor 2017-05-29 03:21:49 +02:00
Benjamin Neff
7aadadce44
Merge branch 'release/0.6.6.0' 2017-05-29 03:20:38 +02:00
Benjamin Neff
f59055860a
updated 70 locale files [ci skip] 2017-05-29 03:17:45 +02:00