 Chi Vinh Le
|
b402f70f38
|
Hide comment box during perm view
|
2017-06-01 01:34:32 +07:00 |
|
|
KiwiandGitHub
|
4f8ef88bd0
|
Merge branch 'master' into integrate-admin-graphql-framework
|
2017-05-31 00:24:06 +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 |
|
|
KiwiandGitHub
|
c314054143
|
Merge branch 'master' into graphql-errors-handling
|
2017-05-29 22:00:49 +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 |
|
|
KiwiandGitHub
|
f3f6633e99
|
Merge branch 'master' into graphql-errors-handling
|
2017-05-29 19:42:26 +07:00 |
|
|
Kim GardnerandGitHub
|
82d442d95b
|
Merge branch 'master' into minor-stream-style-changes
|
2017-05-26 16:53:55 -04:00 |
|
|
Kim GardnerandGitHub
|
37262ad9f6
|
Merge branch 'master' into graphql-errors-handling
|
2017-05-26 16:53:13 -04:00 |
|
|
IAmSamHankins
|
05e5200e79
|
moderation panel design cleanup PT 144120491
|
2017-05-26 12:48:15 -04:00 |
|
|
Chi Vinh Le
|
bab47c9d44
|
Separate store
|
2017-05-26 20:37:06 +07:00 |
|
|
IAmSamHankins
|
32715d3903
|
initial style updates on comment stream for PT 142803055 ~ copy translations still needed
|
2017-05-25 17:21:32 -04:00 |
|
|
Chi Vinh Le
|
841735b787
|
Restore error functionality
|
2017-05-26 02:55:09 +07:00 |
|
|
Chi Vinh Le
|
0107aa67cd
|
Correct keys and translations
|
2017-05-26 01:59:34 +07:00 |
|
|
gaba
|
96985b4780
|
More strings.
|
2017-05-25 14:05:17 -04:00 |
|
|
gaba
|
492f4a674c
|
OMG. Strings.
|
2017-05-25 12:02:26 -04:00 |
|
|
Chi Vinh Le
|
4fe89257c2
|
Support store in withMutation
|
2017-05-25 22:19:16 +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 |
|
|
Chi Vinh Le
|
b2798fd35f
|
Merge branch 'i18n-refactor' of ssh://github.com/coralproject/talk into i18n-refactor
|
2017-05-24 01:39:09 +07:00 |
|
|
Chi Vinh Le
|
37b8fd8fe3
|
Simplify i18n + fallback to default language
|
2017-05-24 01:38:50 +07:00 |
|
|
gaba
|
2991af67f4
|
Adds more translation strings.
|
2017-05-23 14:03:34 -04:00 |
|
|
gaba
|
adacafb586
|
Removed extra string.
|
2017-05-23 12:59:06 -04:00 |
|
|
Chi Vinh Le
|
947ea66a77
|
Remove obsolete errors checking
|
2017-05-22 20:25:24 +07:00 |
|
|
Belen Curcio
|
8266c65043
|
Merge Conflicts
|
2017-05-22 09:39:04 -03:00 |
|
|
Belen Curcio
|
317f7134f2
|
linting
|
2017-05-22 09:03:10 -03:00 |
|
|
Belen Curcio
|
9936b6ec47
|
Prettier
|
2017-05-22 08:59:34 -03:00 |
|
|
Belen Curcio
|
1d96f67db6
|
Merge branch 'master' of github.com:coralproject/talk into coral-plugin-auth
|
2017-05-22 08:58:33 -03:00 |
|
|
Belen Curcio
|
1aacb565d4
|
linting
|
2017-05-19 20:10:49 -03:00 |
|
|
Belen Curcio
|
801a6f8a53
|
External plugin auth fully working, now refactor
|
2017-05-19 20:00:33 -03:00 |
|
|
gaba
|
f525af4c6e
|
Added a few more translations that were missing.
|
2017-05-19 15:42:56 -07:00 |
|
|
Belen Curcio
|
dbfd2aff7c
|
SignInButton
|
2017-05-19 19:29:50 -03:00 |
|
|
Belen Curcio
|
3af49de0ce
|
New login slots and auth plugins
|
2017-05-19 18:04:54 -03:00 |
|
|
gaba
|
97e9419f02
|
Missing translations.
|
2017-05-19 13:34:56 -07:00 |
|
|
Belen Curcio
|
87ada30eff
|
Ádding Stream Slot
|
2017-05-19 17:32:16 -03: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 |
|
|
gaba
|
88b5a4169d
|
Remove promise
|
2017-05-19 10:48:47 -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 |
|
|
Kim GardnerandGitHub
|
12ec058588
|
Merge branch 'master' into edit-comment-settings
|
2017-05-18 17:07:37 -04: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
|
f641a3ec40
|
Complete suspend user implementation
|
2017-05-19 01:52:03 +07:00 |
|
|
Kim GardnerandGitHub
|
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 |
|
|
Benjamin GoeringandGitHub
|
1d322d8c70
|
Merge branch 'master' into fix-ignore-user
|
2017-05-18 10:50:00 -07:00 |
|