 Chi Vinh Le
|
0a602b79c3
|
Enable optimization for more slots
|
2017-08-18 22:21:51 +07:00 |
|
|
Kim GardnerandGitHub
|
d947e103fc
|
Merge branch 'master' into pre-responsive-admin-cleanup
|
2017-08-10 10:57:40 +01:00 |
|
|
IAmSamHankins
|
c62e7328c5
|
adjustments to top navigation and logo
|
2017-08-09 10:15:52 -05:00 |
|
|
KiwiandGitHub
|
528c2a9491
|
Merge branch 'master' into view-more-history
|
2017-08-08 17:55:17 +02:00 |
|
|
IAmSamHankins
|
ddadd6c5d3
|
adjustments/fixes to approved rejected widths
|
2017-08-07 10:26:42 -05:00 |
|
|
Chi Vinh Le
|
c2f8f41e59
|
Support rendering system flags
|
2017-08-07 18:12:07 +07:00 |
|
|
IAmSamHankins
|
11b2bc265a
|
comment tag/marker updates for size
|
2017-08-04 13:50:14 -04:00 |
|
|
Chi Vinh Le
|
0df4fd1e37
|
Adjust styling
|
2017-08-04 23:24:40 +07:00 |
|
|
Chi Vinh Le
|
12d3273d3d
|
Support load more in user history
|
2017-08-04 22:02:44 +07:00 |
|
|
Belen Curcio
|
145910c4a6
|
Merge branch 'master' of github.com:coralproject/talk into featured-adm
|
2017-08-01 18:27:12 -03:00 |
|
|
Chi Vinh Le
|
cb874f8670
|
Change moderate link in user detail
|
2017-08-01 17:29:36 +07:00 |
|
|
Belen Curcio
|
78e74336db
|
Moderator Featured Tag/Button
|
2017-07-31 18:07:37 -03:00 |
|
|
Chi Vinh Le
|
389ff0ca0d
|
Change reducer property names
|
2017-07-28 03:03:19 +07:00 |
|
|
Chi Vinh Le
|
ce2f8f97e8
|
Move userDetail out of Moderation route
|
2017-07-27 23:23:40 +07:00 |
|
|
Chi Vinh Le
|
57fb77008a
|
Make UserDetail work independently
|
2017-07-27 21:44:29 +07:00 |
|
|
Chi Vinh Le
|
eb4d85fb86
|
Refactor TagsInput and Improve UX
|
2017-06-26 17:34:15 +07:00 |
|
|
KiwiandGitHub
|
18a767b8a4
|
Merge branch 'master' into refactor-ban-suspend-actions
|
2017-06-23 22:24:01 +07:00 |
|
|
Belen Curcio
|
ea030af440
|
missing keys
|
2017-06-23 09:59:05 -03:00 |
|
|
Chi Vinh Le
|
8bb38c5ee5
|
Refactor and reuse "Actions" in "Moderate" and "Community"
|
2017-06-22 21:50:19 +07:00 |
|
|
KiwiandGitHub
|
4a354f0b9a
|
Merge branch 'master' into bug-sweep
|
2017-06-21 21:48:35 +07:00 |
|
|
Kim GardnerandGitHub
|
e2f94aa141
|
Merge branch 'master' into show-version-in-nav
|
2017-06-21 14:29:49 +01:00 |
|
|
Chi Vinh Le
|
91fa7b2d8d
|
Show correct login error messages in admin
|
2017-06-21 20:24:54 +07:00 |
|
|
Chi Vinh Le
|
14311dc298
|
Merge branch 'master' into subscribe-mod-actions
Conflicts:
client/coral-admin/src/routes/Moderation/components/Comment.js
|
2017-06-20 19:34:56 +07:00 |
|
|
Kim Gardner
|
646b5be8c8
|
Show version in nav
|
2017-06-20 10:48:01 +01:00 |
|
|
Kim GardnerandGitHub
|
fc15bcae4e
|
Merge branch 'master' into keyboard-shortcuts
|
2017-06-20 09:46:04 +01:00 |
|
|
Belen Curcio
|
99bb4b7198
|
New Links
|
2017-06-19 18:09:38 -03:00 |
|
|
Belen Curcio
|
c36a0bc9e9
|
d approve and f reject
|
2017-06-19 17:23:57 -03:00 |
|
|
Chi Vinh Le
|
523f23269b
|
Translate, pep up notifications
|
2017-06-20 01:38:38 +07:00 |
|
|
Chi Vinh Le
|
fbbd0fa027
|
Merge branch 'master' into subscribe-mod-actions
Conflicts:
client/coral-admin/src/routes/Moderation/components/Moderation.js
client/coral-admin/src/routes/Moderation/components/styles.css
client/coral-admin/src/routes/Moderation/containers/Moderation.js
|
2017-06-19 23:52:10 +07:00 |
|
|
Belen Curcio
|
77fddba841
|
removing overflow hidden
|
2017-06-19 11:05:16 -03:00 |
|
|
Belen Curcio
|
18061e3e1c
|
new func and style
|
2017-06-15 17:32:14 -03:00 |
|
|
Chi Vinh Le
|
3658a804b0
|
Implement live updates for mod actions
|
2017-06-15 01:08:25 +07:00 |
|
|
IAmSamHankins
|
cc4c943a21
|
hover states, link styling, alignment fixes
|
2017-06-09 17:27:35 -04:00 |
|
|
Riley Davis
|
d8cb560755
|
add a tab for All/Rejected user detail comments
|
2017-06-02 13:02:22 -06:00 |
|
|
Riley Davis
|
259ce9c9fb
|
merge master
|
2017-05-31 10:36:01 -06:00 |
|
|
Riley Davis
|
29753a958b
|
show comments on the UserDetail drawer
|
2017-05-30 15:50:56 -06:00 |
|
|
Chi Vinh Le
|
1acf58182f
|
Merge branch 'master' into integrate-admin-graphql-framework
Conflicts:
client/coral-admin/src/containers/Community/Loading.js
client/coral-admin/src/containers/Community/Table.js
client/coral-admin/src/containers/Streams/Stories.js
client/coral-admin/src/index.js
client/coral-admin/src/routes/Community/components/FlaggedAccounts.js
client/coral-admin/src/routes/Community/components/People.js
client/coral-admin/src/routes/Configure/components/Configure.js
client/coral-admin/src/routes/Configure/components/Domainlist.js
client/coral-admin/src/routes/Configure/components/EmbedLink.js
client/coral-admin/src/routes/Configure/components/ModerationSettings.js
client/coral-admin/src/routes/Configure/components/StreamSettings.js
client/coral-admin/src/routes/Configure/components/TechSettings.js
client/coral-admin/src/routes/Configure/components/Wordlist.js
client/coral-admin/src/routes/Dashboard/components/CountdownTimer.js
client/coral-admin/src/routes/Install/components/Steps/AddOrganizationName.js
client/coral-admin/src/routes/Install/components/Steps/CreateYourAccount.js
client/coral-admin/src/routes/Install/components/Steps/FinalStep.js
client/coral-admin/src/routes/Install/components/Steps/InitialStep.js
client/coral-admin/src/routes/Install/components/Steps/PermittedDomainsStep.js
client/coral-admin/src/routes/Install/components/translations.json
client/coral-admin/src/routes/Moderation/components/Moderation.js
client/coral-admin/src/routes/Moderation/components/ModerationQueue.js
client/coral-admin/src/routes/Stories/components/Stories.js
client/coral-embed-stream/src/index.js
|
2017-05-29 23:06:40 +07:00 |
|
|
Chi Vinh Le
|
0b7432b75e
|
Merge branch 'master' into i18n-refactor
Conflicts:
client/coral-sign-in/components/FakeComment.js
client/coral-sign-in/components/UserBox.js
|
2017-05-29 20:23:27 +07:00 |
|
|
Chi Vinh Le
|
9a6532ecea
|
Merge branch 'master' into integrate-admin-graphql-framework
Conflicts:
client/coral-embed-stream/src/index.js
|
2017-05-29 20:09:03 +07:00 |
|
|
IAmSamHankins
|
05e5200e79
|
moderation panel design cleanup PT 144120491
|
2017-05-26 12:48:15 -04:00 |
|
|
Chi Vinh Le
|
a39fcee3f8
|
More error handling fixes
|
2017-05-26 03:04:06 +07:00 |
|
|
Chi Vinh Le
|
8ab7047cfa
|
Refactor admin
|
2017-05-24 17:09:21 +07:00 |
|
|
gaba
|
8da7df353c
|
Adds a bunch of missing strings.
|
2017-05-23 16:06:04 -04: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
|
2c620c868d
|
merge master
|
2017-05-19 11:05:46 -06:00 |
|
|
riley
|
17ceadd8c9
|
move client-side perms to services
|
2017-05-19 09:18:24 -06:00 |
|
|
gaba
|
3ca22bd101
|
Fix translation keys.
|
2017-05-18 15:14:37 -07:00 |
|
|
riley
|
056ba9a04c
|
do the same thing for the Drawer
|
2017-05-18 12:11:11 -06:00 |
|