 Kim Gardner
|
55998a67da
|
Merge branch 'master' into csp
|
2018-05-21 16:18:46 -04:00 |
|
|
Kim Gardner
|
eee1e858bf
|
Merge pull request #1634 from mkonikov/disabled-download-button
Show overflow text on download comments button when disabled
|
2018-05-21 16:18:30 -04:00 |
|
|
Kiwi
|
2c9d30bfd2
|
Small modification
Removed obsolete line and add todo
|
2018-05-21 17:09:36 -03:00 |
|
|
Kim Gardner
|
763833783d
|
Merge branch 'master' into disabled-download-button
|
2018-05-21 15:22:51 -04:00 |
|
|
Kim Gardner
|
1f5e3d9f3f
|
Merge pull request #1635 from conversario/translations-de-4.4.1
German translations for v4.4.1
|
2018-05-21 11:19:05 -04:00 |
|
|
Kim Gardner
|
30f03f5fb8
|
Merge branch 'master' into disabled-download-button
|
2018-05-21 11:07:59 -04:00 |
|
|
Kim Gardner
|
ced9d2ea4b
|
Merge branch 'master' into translations-de-4.4.1
|
2018-05-21 11:06:17 -04:00 |
|
|
Wyatt Johnson
|
5aba578a98
|
doc patch
|
2018-05-18 16:47:58 -06:00 |
|
|
Wyatt Johnson
|
dd0ad17038
|
fix for custom css
|
2018-05-18 16:44:43 -06:00 |
|
|
Wyatt Johnson
|
868343a29b
|
fixes to csp policy
|
2018-05-18 16:42:23 -06:00 |
|
|
Wyatt Johnson
|
5403872bb7
|
disable by default
|
2018-05-18 16:21:53 -06:00 |
|
|
Wyatt Johnson
|
f58e3df439
|
added config for report only mode
|
2018-05-18 16:21:53 -06:00 |
|
|
Wyatt Johnson
|
000d9ae56a
|
Merge branch 'master' into csp
|
2018-05-18 15:28:26 -06:00 |
|
|
Kim Gardner
|
e2ba08e708
|
Merge pull request #1632 from mkonikov/extra-p
Only display paragraph if delete requested
|
2018-05-18 17:18:00 -04:00 |
|
|
Kim Gardner
|
20860bb773
|
Merge branch 'master' into extra-p
|
2018-05-18 16:33:27 -04:00 |
|
|
Kim Gardner
|
b15766bf80
|
Merge pull request #1629 from coralproject/rte-bugfixes
RTE Bugfixes
|
2018-05-18 16:33:15 -04:00 |
|
|
Kim Gardner
|
531cb0793f
|
Merge branch 'master' into rte-bugfixes
|
2018-05-18 16:24:30 -04:00 |
|
|
Wyatt Johnson
|
8265c13149
|
Merge branch 'master' into extra-p
|
2018-05-18 11:26:37 -06:00 |
|
|
Mendel Konikov
|
ffa6b99d09
|
Wrap els in div
|
2018-05-18 12:32:24 -04:00 |
|
|
Wyatt Johnson
|
9484d4c6f5
|
Merge branch 'master' into csp
|
2018-05-18 10:11:39 -06:00 |
|
|
Fabian Neumann
|
8ee90387f6
|
German translations for v4.4.1
|
2018-05-18 16:03:30 +02:00 |
|
|
Wyatt Johnson
|
4f001bbdf2
|
Merge pull request #1628 from conversario/withremovetag-typo
fix optimisticResponse typo
|
2018-05-17 21:02:37 -06:00 |
|
|
Wyatt Johnson
|
f5362f445a
|
Merge branch 'master' into withremovetag-typo
|
2018-05-17 20:48:33 -06:00 |
|
|
Wyatt Johnson
|
1bcf1a23fc
|
Merge branch 'master' into extra-p
|
2018-05-17 20:34:37 -06:00 |
|
|
Wyatt Johnson
|
b2306066ce
|
Merge pull request #1627 from coralproject/upgrade-mongoose
Upgrade Mongoose
|
2018-05-17 20:32:40 -06:00 |
|
|
Wyatt Johnson
|
ebcff4d95e
|
patched migration bugs
|
2018-05-17 18:58:01 -06:00 |
|
|
Wyatt Johnson
|
2484066922
|
Merge branch 'master' into upgrade-mongoose
|
2018-05-17 18:43:24 -06:00 |
|
|
Wyatt Johnson
|
2822a2dddd
|
Merge branch 'master' into csp
|
2018-05-17 18:43:12 -06:00 |
|
|
Mendel Konikov
|
5f410276c6
|
Show overflow text on download comments button when disabled
|
2018-05-17 20:41:59 -04:00 |
|
|
Wyatt Johnson
|
c84a9716a1
|
added support for csp
|
2018-05-17 18:37:50 -06:00 |
|
|
Mendel Konikov
|
d83c2fd566
|
Only display paragraph if delete requested
|
2018-05-17 20:03:12 -04:00 |
|
|
Kim Gardner
|
cd6aacbc76
|
Merge pull request #1607 from coralproject/admin-auth
External Signin for Admin
|
2018-05-17 19:08:21 -04:00 |
|
|
Wyatt Johnson
|
95072be97e
|
switched ejs for nunjucks
|
2018-05-17 15:59:49 -06:00 |
|
|
Kiwi
|
f0589fba26
|
Merge branch 'master' into admin-auth
|
2018-05-17 16:36:32 -03:00 |
|
|
Chi Vinh Le
|
417befd52a
|
Don't close popup when there is an error
|
2018-05-17 21:34:37 +02:00 |
|
|
Wyatt Johnson
|
8d8cd57d79
|
Merge branch 'master' into upgrade-mongoose
|
2018-05-17 13:19:09 -06:00 |
|
|
Wyatt Johnson
|
086c43a003
|
Update .nsprc
|
2018-05-17 13:18:57 -06:00 |
|
|
Leandro
|
0339e97b37
|
fix optimisticResponse typo
|
2018-05-17 16:39:04 +02:00 |
|
|
Kiwi
|
ae88ae3f98
|
Merge pull request #1614 from conversario/comment-tombstone-slot
Add new slot 'commentTombstone'
|
2018-05-16 21:00:13 -03:00 |
|
|
Kim Gardner
|
5241206b03
|
Remove deprecated useMongoClient
|
2018-05-16 18:24:34 -04:00 |
|
|
Kim Gardner
|
663caa1001
|
Update lint-staged to fix dependency issue
|
2018-05-16 18:18:36 -04:00 |
|
|
Chi Vinh Le
|
d07c54918d
|
Indent, outdent fixes
|
2018-05-16 21:37:48 +02:00 |
|
|
Chi Vinh Le
|
2eac8f48d6
|
Workaround IOS focus bug when clicking on buttons
|
2018-05-16 21:37:35 +02:00 |
|
|
Kim Gardner
|
3a383ff8ba
|
Merge branch 'master' into admin-auth
|
2018-05-16 12:58:59 -04:00 |
|
|
Kim Gardner
|
34760653a2
|
Merge branch 'master' into comment-tombstone-slot
|
2018-05-16 12:58:51 -04:00 |
|
|
Kim Gardner
|
e3323ce5ec
|
Merge pull request #1544 from conversario/global-switchoff
New setting: Disable commenting site-wide
|
2018-05-16 12:14:09 -04:00 |
|
|
Belén Curcio
|
7fc5c5a6be
|
Merge branch 'master' into comment-tombstone-slot
|
2018-05-16 12:55:24 -03:00 |
|
|
Kim Gardner
|
f0b87501c0
|
Merge branch 'master' into admin-auth
|
2018-05-15 19:06:27 -04:00 |
|
|
Kim Gardner
|
ea6757cce5
|
Merge branch 'master' into global-switchoff
|
2018-05-15 18:55:58 -04:00 |
|
|
Kim Gardner
|
cb9945053f
|
Merge pull request #1624 from coralproject/username-change-copy
Username change copy
|
2018-05-15 18:48:31 -04:00 |
|