 Chi Vinh Le
|
30d4562383
|
Refactor pagination
|
2017-06-01 01:18:41 +07:00 |
|
|
Chi Vinh Le
|
109f4b2c0f
|
Handle mutation errors
|
2017-05-31 00:44:16 +07: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 |
|
|
Kim GardnerandGitHub
|
82d442d95b
|
Merge branch 'master' into minor-stream-style-changes
|
2017-05-26 16:53:55 -04:00 |
|
|
Chi Vinh Le
|
ee2068f5f1
|
Merge branch 'master' into auth-flow
Conflicts:
client/coral-admin/src/actions/auth.js
|
2017-05-27 01:07:19 +07:00 |
|
|
Chi Vinh Le
|
a7cdcb0bf7
|
Fix request options and use better filename
|
2017-05-27 00:54:36 +07:00 |
|
|
IAmSamHankins
|
05e5200e79
|
moderation panel design cleanup PT 144120491
|
2017-05-26 12:48:15 -04:00 |
|
|
Chi Vinh Le
|
6a1befc3f0
|
Detect mobile safari & desktop safari
|
2017-05-26 20:48:24 +07:00 |
|
|
Chi Vinh Le
|
a39fcee3f8
|
More error handling fixes
|
2017-05-26 03:04:06 +07:00 |
|
|
Chi Vinh Le
|
841735b787
|
Restore error functionality
|
2017-05-26 02:55:09 +07:00 |
|
|
Belen Curcio
|
21644bda8a
|
Linting
|
2017-05-25 16:24:39 -03:00 |
|
|
Belen Curcio
|
75080cfe30
|
Password reset and valid locations
|
2017-05-25 16:19:19 -03:00 |
|
|
Chi Vinh Le
|
209005aff5
|
More key misspellings
|
2017-05-26 02:10:00 +07:00 |
|
|
Chi Vinh Le
|
0107aa67cd
|
Correct keys and translations
|
2017-05-26 01:59:34 +07:00 |
|
|
Belen Curcio
|
e510553d9a
|
Sending cookies if safari
|
2017-05-25 13:55:03 -03:00 |
|
|
Chi Vinh Le
|
4fe89257c2
|
Support store in withMutation
|
2017-05-25 22:19:16 +07:00 |
|
|
Chi Vinh Le
|
246ca117be
|
Little cleanup for admin services
|
2017-05-25 19:22:59 +07:00 |
|
|
Chi Vinh Le
|
b43a0f533b
|
Harmonize naming in admin and embed-stream
|
2017-05-25 18:37:23 +07:00 |
|
|
Chi Vinh Le
|
512767e023
|
Use default response fragments
|
2017-05-25 17:49:30 +07:00 |
|
|
Belen Curcio
|
bd21719ea5
|
Handling non safari browsers
|
2017-05-24 17:20:23 -03:00 |
|
|
gaba
|
4ff7da864e
|
Still more strings.
|
2017-05-24 14:54:52 -04:00 |
|
|
Chi Vinh Le
|
48a8e394ef
|
Use framework for mutations
|
2017-05-25 01:18:33 +07:00 |
|
|
Chi Vinh Le
|
d9ee215d66
|
Remove obsolete fragment
|
2017-05-24 23:22:03 +07:00 |
|
|
gaba
|
03f70bcab9
|
Adds more missing translation.
|
2017-05-24 11:59:21 -04:00 |
|
|
Chi Vinh Le
|
a3755b7505
|
Use unique names
|
2017-05-24 22:24:01 +07:00 |
|
|
Chi Vinh Le
|
5e2fa72466
|
Support extendable queries
|
2017-05-24 22:05:41 +07:00 |
|
|
Chi Vinh Le
|
a9b4de1f5c
|
Wrap queries with hocs
|
2017-05-24 21:00:17 +07:00 |
|
|
Chi Vinh Le
|
c35ce979f5
|
Move query logic to containers
|
2017-05-24 19:04:05 +07:00 |
|
|
Chi Vinh Le
|
3cde313ab4
|
Pass correct props to install step
|
2017-05-24 17:38:19 +07:00 |
|
|
Chi Vinh Le
|
8ab7047cfa
|
Refactor admin
|
2017-05-24 17:09:21 +07:00 |
|
|
gaba
|
86258ba0c3
|
One more string to translate.
|
2017-05-23 16:06:07 -04:00 |
|
|
gaba
|
8da7df353c
|
Adds a bunch of missing strings.
|
2017-05-23 16:06:04 -04:00 |
|
|
gaba
|
259b24faaa
|
A few strings where using -.
|
2017-05-23 12:53:48 -04:00 |
|
|
gaba
|
f525af4c6e
|
Added a few more translations that were missing.
|
2017-05-19 15:42: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
|
2c620c868d
|
merge master
|
2017-05-19 11:05:46 -06:00 |
|
|
KiwiandGitHub
|
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
|
1374217680
|
Merge branch 'master' into suspend-user
|
2017-05-19 17:46:06 +07:00 |
|
|
gaba
|
12cb59ce30
|
Merge branch 'master' into i18n-refactor
|
2017-05-18 15:44:14 -07:00 |
|
|
gaba
|
3ca22bd101
|
Fix translation keys.
|
2017-05-18 15:14:37 -07:00 |
|
|
Kim GardnerandGitHub
|
b3e494d279
|
Merge branch 'master' into read-only-inputs
|
2017-05-18 17:14:48 -04: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 |
|