 gaba
|
259b24faaa
|
A few strings where using -.
|
2017-05-23 12:53:48 -04:00 |
|
|
gaba
|
a184837ff8
|
Goes back to load all translations...
|
2017-05-23 12:46:53 -04:00 |
|
|
gaba
|
5757682732
|
Removes files that came from the merge and do not exist in master.
|
2017-05-23 11:57:51 -04:00 |
|
|
Gabriela Rodríguez Berón
|
6f7b8522c8
|
Merge branch 'master' into i18n-refactor
|
2017-05-23 11:47:58 -04:00 |
|
|
Riley Davis
|
3c4b510829
|
Merge pull request #605 from coralproject/missed-roles
hasRoles is no longer a function
|
2017-05-22 15:20:17 -06:00 |
|
|
riley
|
add3cbf7b3
|
hasRoles is no longer a function
|
2017-05-22 15:10:56 -06:00 |
|
|
gaba
|
f525af4c6e
|
Added a few more translations that were missing.
|
2017-05-19 15:42:56 -07:00 |
|
|
gaba
|
97e9419f02
|
Missing translations.
|
2017-05-19 13:34:56 -07:00 |
|
|
gaba
|
67fb829717
|
A few more issues from the merge.
|
2017-05-19 13:29:23 -07:00 |
|
|
gaba
|
625362d51e
|
Merge branch 'master' into i18n-refactor
|
2017-05-19 12:44:34 -07:00 |
|
|
gaba
|
9be443eda8
|
Moves i18n into coral-framework.
|
2017-05-19 12:28:44 -07:00 |
|
|
Riley Davis
|
f32208b35b
|
Merge pull request #585 from coralproject/multiple-roles
Multiple roles
|
2017-05-19 13:12:20 -06:00 |
|
|
gaba
|
88b5a4169d
|
Remove promise
|
2017-05-19 10:48:47 -07:00 |
|
|
riley
|
2c620c868d
|
merge master
|
2017-05-19 11:05:46 -06:00 |
|
|
Kiwi
|
04fbeededa
|
Merge pull request #600 from coralproject/suspend-user
Suspend user
|
2017-05-19 23:29:13 +07:00 |
|
|
Kiwi
|
8cb9945e25
|
Merge branch 'master' into multiple-roles
|
2017-05-19 23:26:45 +07:00 |
|
|
riley
|
17ceadd8c9
|
move client-side perms to services
|
2017-05-19 09:18:24 -06:00 |
|
|
Chi Vinh Le
|
3688d3f970
|
Gracefully allow user with no email
|
2017-05-19 17:53:10 +07:00 |
|
|
Chi Vinh Le
|
1d6455058e
|
Apply review suggestions
|
2017-05-19 17:51:58 +07:00 |
|
|
Chi Vinh Le
|
1374217680
|
Merge branch 'master' into suspend-user
|
2017-05-19 17:46:06 +07:00 |
|
|
gaba
|
8dddff25f9
|
Update es translation and add link to transifex.
|
2017-05-18 16:01:12 -07:00 |
|
|
gaba
|
12cb59ce30
|
Merge branch 'master' into i18n-refactor
|
2017-05-18 15:44:14 -07:00 |
|
|
Kim Gardner
|
f35a9ec8cd
|
Merge pull request #602 from coralproject/content-type-fix
added fix for chrome + content type negotiation
|
2017-05-18 18:40:35 -04:00 |
|
|
gaba
|
1a7ad410f5
|
Loads timeago translation when loading translations.
|
2017-05-18 15:38:53 -07:00 |
|
|
Wyatt Johnson
|
25230f2e9d
|
added fix for chrome + content type negotiation
|
2017-05-18 16:30:28 -06:00 |
|
|
gaba
|
3ca22bd101
|
Fix translation keys.
|
2017-05-18 15:14:37 -07:00 |
|
|
Kim Gardner
|
f29df23c07
|
Merge pull request #601 from coralproject/read-only-inputs
handle no-interaction input the correct way
|
2017-05-18 17:21:12 -04:00 |
|
|
Kim Gardner
|
b3e494d279
|
Merge branch 'master' into read-only-inputs
|
2017-05-18 17:14:48 -04:00 |
|
|
Kim Gardner
|
13376504b5
|
Merge pull request #598 from gobengo/edit-comment-settings
Edit Comment Window Length Setting
|
2017-05-18 17:14:29 -04:00 |
|
|
Kim Gardner
|
12ec058588
|
Merge branch 'master' into edit-comment-settings
|
2017-05-18 17:07:37 -04:00 |
|
|
Kim Gardner
|
5cbe9029aa
|
Merge pull request #596 from gobengo/fix-ignore-user
Ignored user tombstones work again
|
2017-05-18 16:43:46 -04:00 |
|
|
riley
|
6deee7cb80
|
add a perms utils file
|
2017-05-18 14:28:43 -06:00 |
|
|
Riley Davis
|
c772cffc92
|
handle no-interaction input the correct way
|
2017-05-18 13:51:48 -06:00 |
|
|
Chi Vinh Le
|
89b7918e41
|
Tiny renaming
|
2017-05-19 02:29:59 +07:00 |
|
|
Chi Vinh Le
|
b521934ee2
|
Remove unneeded refetch
|
2017-05-19 02:24:47 +07:00 |
|
|
Chi Vinh Le
|
061c18670b
|
Merge branch 'master' into suspend-user
Conflicts:
client/coral-admin/src/constants/moderation.js
client/coral-admin/src/containers/ModerationQueue/ModerationContainer.js
|
2017-05-19 02:19:24 +07:00 |
|
|
Chi Vinh Le
|
0040bc4c01
|
Remove remaining debug msgs
|
2017-05-19 02:12:27 +07:00 |
|
|
Chi Vinh Le
|
0588a8ab66
|
Use async / await :-)
|
2017-05-19 02:07:38 +07:00 |
|
|
Chi Vinh Le
|
859a0b1fbe
|
Make until arg required
|
2017-05-19 02:03:36 +07:00 |
|
|
Chi Vinh Le
|
d995cdde07
|
Make email message required
|
2017-05-19 02:01:47 +07:00 |
|
|
Chi Vinh Le
|
f641a3ec40
|
Complete suspend user implementation
|
2017-05-19 01:52:03 +07:00 |
|
|
Kim Gardner
|
e80e79f267
|
Merge branch 'master' into edit-comment-settings
|
2017-05-18 14:23:14 -04:00 |
|
|
riley
|
ff75b9474a
|
merge master
|
2017-05-18 12:18:00 -06:00 |
|
|
riley
|
056ba9a04c
|
do the same thing for the Drawer
|
2017-05-18 12:11:11 -06:00 |
|
|
riley
|
d98ce38bf5
|
show config tab to admins. hide menu items from users that can't access admin
|
2017-05-18 12:06:07 -06:00 |
|
|
Benjamin Goering
|
1d322d8c70
|
Merge branch 'master' into fix-ignore-user
|
2017-05-18 10:50:00 -07:00 |
|
|
Benjamin Goering
|
aaa2da6c23
|
Stream container refetch then setCommentCountCache to asset.commentCount instead of silly zero
|
2017-05-18 10:43:38 -07:00 |
|
|
Wyatt Johnson
|
5a272413e6
|
Merge pull request #599 from coralproject/gzip
Added gzip compression to bundle assets
|
2017-05-18 11:34:05 -06:00 |
|
|
Wyatt Johnson
|
4dc83aaf63
|
added middleware wrap
|
2017-05-18 11:27:28 -06:00 |
|
|
Wyatt Johnson
|
12713dae86
|
Removed unused assets
|
2017-05-18 11:18:08 -06:00 |
|