Commit graph

18805 commits

Author SHA1 Message Date
Fla
f94fa95653 Add a Contributing file 2017-07-12 16:14:58 +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
bc663253d2
Merge branch 'next-minor' into develop 2017-07-07 09:02:19 +02:00
Benjamin Neff
1ce736df16
Merge branch 'release/0.6.7.0' into next-minor 2017-07-07 09:02:10 +02:00
Dennis Schubert
e47895f3e1
Center .excellence-box contents
closes #7481
2017-07-07 09:01:34 +02:00
flaburgan
2dc142bd70
Add access to the report page on mobile for moderators
closes #7479
2017-07-07 08:58:42 +02:00
Benjamin Neff
2dc129d9be
Merge branch 'next-minor' into develop 2017-07-06 02:55:31 +02:00
Benjamin Neff
2244781615
Merge branch 'release/0.6.7.0' into next-minor 2017-07-06 02:55:26 +02:00
flaburgan
59c343c0c6
Increase poltegeist timeout
closes #7478
2017-07-06 02:51:14 +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
068acd93ce
Cleanup changelog (no bugfixes in this release) 2017-07-05 02:04:07 +02:00
Benjamin Neff
0e13a316f6
Cleanup some translations
closes #7465
2017-07-05 02:02:13 +02:00
flaburgan
ddda28102c
Clean up the footer links a bit
closes #7446
2017-07-05 01:59:18 +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
flaburgan
427aa8794e
Add tests for mobile drawer 2017-07-05 01:50:16 +02:00
flaburgan
2782edc780
Refactor partials + pronto 2017-07-05 01:50:16 +02:00
flaburgan
a7d97b7fd3
Add mobile message confirmation on user invit action, Refactor admin responsive code to use bootstrap grid
Hide pod version alert only in the mobile version, not depending on screen size
2017-07-05 01:50:16 +02:00
flaburgan
7bdf33e1a8
Move invitation form under the user search in admin
Indicates when there is no report to review to avoid a weird empty page
2017-07-05 01:50:16 +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
d71aa6a54a
Merge branch 'next-minor' into develop 2017-07-03 03:46:54 +02:00
atulonruby
df1139234f
Warn user if he leaves profile editing page #6520
closes #7473

closes #6589
2017-07-03 03:45:57 +02:00
Benjamin Neff
cb50681cea
Merge branch 'next-minor' into develop 2017-06-30 02:13:40 +02:00
Benjamin Neff
0d232f1d1b
Switch PercentLiteralDelimiters to new default
Let's change that to the new rubocop default, which is also the
suggestion in the ruby style guide.

See https://github.com/bbatsov/ruby-style-guide#percent-literal-braces

closes #7466
2017-06-30 02:13:31 +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
Benjamin Neff
44e10a9172
Merge branch 'next-minor' into develop 2017-05-26 01:51:37 +02:00
Mahonri Gibson
5739f67605
Save email without confirmation when podmail is disabled.
fixes #7195

closes #7455
2017-05-26 01:50:55 +02:00
Benjamin Neff
a7093c6f7d
Merge branch 'next-minor' into develop 2017-05-23 00:17:19 +02:00
Benjamin Neff
a6869197d8
Start 0.6.7.0 cycle
[ci skip]
2017-05-23 00:15:06 +02:00
Dennis Schubert
01d1bb10ac
Merge branch 'next-minor' into develop 2017-05-21 12:08:16 +02:00
Benjamin Neff
0197cecaf8
Bump nokogiri
closes #7458
2017-05-21 12:08:12 +02:00
Dennis Schubert
7c37a62593
Merge branch 'next-minor' into develop 2017-05-21 12:07:14 +02:00
Benjamin Neff
65e8fc4012
Fix comment for environment.sidekiq.retry in diaspora.yml
fixes #7456

closes #7457
2017-05-21 12:07:10 +02:00
Dennis Schubert
1e06fd786c
Merge branch 'next-minor' into develop 2017-05-21 12:06:41 +02:00
Benjamin Neff
e177706769
Add admin account username to NodeInfo metadata
Fixes #7421

closes #7447
2017-05-21 12:06:35 +02:00
Benjamin Neff
7934c1e969
Add NodeInfo 2.0 support 2017-05-21 12:05:54 +02:00
Dennis Schubert
010c1953f9
Merge branch 'next-minor' into develop 2017-05-21 12:05:22 +02:00
Benjamin Neff
c2eb53e827
Bump rubocop
Use old style for Style/PercentLiteralDelimiters for now. Maybe we can
change this in the future, because the ruby style guide suggests to use
`[]` (which is also the new default for rubocop).

closes #7443#
2017-05-21 12:05:17 +02:00
Benjamin Neff
153569e297
Bump pronto and all pronto-runners
Also add `require: false` everywhere.
2017-05-21 12:05:13 +02:00
Benjamin Neff
e463397122
Merge branch 'next-minor' into develop 2017-05-16 00:37:06 +02:00
cmrd Senya
6abd0509f9
Use guid instead of id at permalink and in SPV
This changes links from /posts/:id to /posts/:guid where the links are
not clicked very often. ID search is faster than guid search so we can't
change it everywhere, but these links are not very useful for clicking,
but can be used for easier guid look up.

closes #7453
2017-05-16 00:36:43 +02:00
Benjamin Neff
ee05cc8270
Merge branch 'next-minor' into develop 2017-05-13 02:09:25 +02:00