 Chi Vinh Le
|
7b76450eb5
|
Merge branch 'master' into refactor-configure
Conflicts:
client/coral-admin/src/routes/Configure/components/Configure.css
client/coral-admin/src/routes/Moderation/components/Moderation.js
|
2017-10-11 14:17:36 +07:00 |
|
|
Kiwi
|
b25fa9c7f3
|
Merge branch 'master' into danish-lang-config
|
2017-10-11 08:51:07 +02:00 |
|
|
Chi Vinh Le
|
1d2f7b5298
|
Use correct import path
|
2017-10-11 13:34:27 +07:00 |
|
|
Wyatt Johnson
|
29d7494385
|
fixed more yaml issues, added lint step
|
2017-10-10 14:04:37 -06:00 |
|
|
Jose Franco
|
14d2b63f2e
|
Merge branch 'master' into ReadersNotifications
|
2017-10-10 12:58:43 -05:00 |
|
|
PepeFranco
|
cf59bb213c
|
Changed FlagButton to use getErrorMessages util for failed flagging instead of custom messages
|
2017-10-10 12:55:32 -05:00 |
|
|
Wyatt Johnson
|
98ee3c7b55
|
Merge branch 'master' into danish-lang-config
|
2017-10-10 11:44:05 -06:00 |
|
|
Kim Gardner
|
764d562497
|
Merge branch 'master' into ReadersNotifications
|
2017-10-10 18:18:58 +01:00 |
|
|
Kim Gardner
|
48af316380
|
Merge branch 'master' into ie11-issues
|
2017-10-10 18:13:28 +01:00 |
|
|
Kim Gardner
|
e40a30d200
|
Fixes and cleanup
|
2017-10-10 17:17:04 +01:00 |
|
|
Belen Curcio
|
0d66e42313
|
Merge branch 'viewing-options' of github.com:coralproject/talk into viewing-options
|
2017-10-10 13:16:37 -03:00 |
|
|
Belen Curcio
|
154949ff47
|
Update
|
2017-10-10 13:12:55 -03:00 |
|
|
Kim Gardner
|
569260a4b9
|
Fix configuration and alphabetize languages
|
2017-10-10 16:47:33 +01:00 |
|
|
Kim Gardner
|
2063c4a90e
|
Fixes per code review
|
2017-10-10 16:24:49 +01:00 |
|
|
Kim Gardner
|
f1e81575cb
|
Update i18n config to support Danish
|
2017-10-10 13:56:47 +01:00 |
|
|
Kim Gardner
|
6a2b6bb845
|
Merge branch 'master' into ReadersNotifications
|
2017-10-10 13:07:37 +01:00 |
|
|
Kim Gardner
|
78857e8de0
|
Merge branch 'master' into ie11-issues
|
2017-10-10 13:07:03 +01:00 |
|
|
Kim Gardner
|
c0a54b6538
|
Merge branch 'master' into viewing-options
|
2017-10-10 13:06:18 +01:00 |
|
|
Chi Vinh Le
|
61604a7d07
|
Export ConfigureCard in plugin-api
|
2017-10-10 17:06:45 +07:00 |
|
|
Chi Vinh Le
|
dfcb9e24df
|
Refactor components
|
2017-10-10 17:00:25 +07:00 |
|
|
Belén Curcio
|
29c7c9e810
|
Merge branch 'master' into viewing-options
|
2017-10-10 00:18:03 -03:00 |
|
|
PepeFranco
|
c81d9c0bd1
|
Added notifications when flagging failed
|
2017-10-09 21:59:47 -05:00 |
|
|
Facu
|
0519b1d1ff
|
fix 1071
|
2017-10-09 15:41:06 -03:00 |
|
|
Chi Vinh Le
|
21342b8b81
|
Fix title styling
|
2017-10-09 23:56:16 +07:00 |
|
|
Chi Vinh Le
|
ec436bcb39
|
Refactor Configure styles
|
2017-10-09 23:50:43 +07:00 |
|
|
Chi Vinh Le
|
59eff3e29e
|
Refactor moderationSettings styles
|
2017-10-09 23:37:37 +07:00 |
|
|
Chi Vinh Le
|
574cbf8e79
|
Refactor TechSettings styles
|
2017-10-09 23:28:32 +07:00 |
|
|
Chi Vinh Le
|
b3fc920919
|
Refactor EmbedLink styles
|
2017-10-09 23:26:15 +07:00 |
|
|
Chi Vinh Le
|
1d089ee151
|
Refactor Domainlist styles
|
2017-10-09 23:00:21 +07:00 |
|
|
Chi Vinh Le
|
0434ecf755
|
Refactor Wordlist styles
|
2017-10-09 22:58:58 +07:00 |
|
|
Tyler Brewer
|
48c291a9c3
|
Merge branch 'master' into fix-shortcut-icon
|
2017-10-09 11:01:26 -04:00 |
|
|
Chi Vinh Le
|
c0ff9c1beb
|
Merge branch 'master' into refactor-configure
Conflicts:
client/coral-admin/src/routes/Moderation/components/Moderation.js
|
2017-10-09 21:30:03 +07:00 |
|
|
Chi Vinh Le
|
c52e42c644
|
Allow changing wordlist and domains using the updateSettings mutation
|
2017-10-09 16:51:27 +07:00 |
|
|
Gerardo Galvez
|
e4ff48ea88
|
Merge branch 'moderate-shortcuts' of https://github.com/gerardogalvez/talk into moderate-shortcuts
|
2017-10-06 20:20:48 -05:00 |
|
|
Gerardo Galvez
|
cbd7337dbc
|
Add spanish translations and cleaner way to get the activeTabIndex
|
2017-10-06 20:19:30 -05:00 |
|
|
Belén Curcio
|
c7bf3c1a3c
|
Merge branch 'master' into moderate-shortcuts
|
2017-10-06 18:07:30 -03:00 |
|
|
Tyler Brewer
|
bb78ba9b0b
|
Merge branch 'master' into fix-shortcut-icon
|
2017-10-06 16:09:59 -04:00 |
|
|
kamos1
|
e95e0381c2
|
remove removeNewLine and add .trim to length variable
|
2017-10-06 13:25:32 -06:00 |
|
|
kamos1
|
8ab31d7009
|
add trim to prevent empty spaces, tabs and other whitespace characters
|
2017-10-06 13:19:37 -06:00 |
|
|
kamos1
|
57f8a64cf4
|
fix issue 1037
|
2017-10-06 12:24:58 -06:00 |
|
|
Chi Vinh Le
|
0a190a9838
|
Add slots
|
2017-10-07 01:01:14 +07:00 |
|
|
Chi Vinh Le
|
6ff2e38003
|
Little Optimization
|
2017-10-07 00:54:46 +07:00 |
|
|
Chi Vinh Le
|
3a28eae384
|
Move activeSection to redux
|
2017-10-07 00:47:50 +07:00 |
|
|
Chi Vinh Le
|
5fbabcaa1b
|
Simplify Configure
|
2017-10-07 00:31:44 +07:00 |
|
|
Kim Gardner
|
387316849a
|
Merge branch 'master' into moderate-shortcuts
|
2017-10-06 17:34:46 +01:00 |
|
|
Kim Gardner
|
26c1d22ec3
|
Merge branch 'master' into fix-shortcut-icon
|
2017-10-06 17:30:28 +01:00 |
|
|
Chi Vinh Le
|
eae5b85d1a
|
Turn ModerationSettings into container
|
2017-10-06 23:08:56 +07:00 |
|
|
Belen Curcio
|
dbe6e675c9
|
Modal Keys should show on tablet
|
2017-10-06 13:02:18 -03:00 |
|
|
Chi Vinh Le
|
2c8366d6b7
|
Turn TechSettings to container
|
2017-10-06 22:32:02 +07:00 |
|
|
Chi Vinh Le
|
ae3d1c1819
|
Turn StreamSettings to container
|
2017-10-06 22:17:51 +07:00 |
|