 Kiwi
|
a56240675d
|
Merge branch 'master' into refactor-global-dependencies
|
2017-08-24 18:17:19 +02:00 |
|
|
Kim Gardner
|
1381395dde
|
Merge pull request #875 from coralproject/moderator-community
Moderator Community
|
2017-08-24 17:14:46 +01:00 |
|
|
Wyatt Johnson
|
9a1374070f
|
small fixes
|
2017-08-24 09:47:27 -06:00 |
|
|
Kim Gardner
|
1e8ff9de7e
|
Merge branch 'master' into moderator-community
|
2017-08-24 15:35:48 +01:00 |
|
|
Chi Vinh Le
|
ddb555e07f
|
Add new sorting variables
|
2017-08-24 21:30:16 +07:00 |
|
|
Chi Vinh Le
|
d1a3a67b35
|
Fix featured comments
|
2017-08-24 20:12:08 +07:00 |
|
|
Chi Vinh Le
|
df60ac4714
|
Merge branch 'master' into user-sort
|
2017-08-24 20:09:44 +07:00 |
|
|
Chi Vinh Le
|
ca31dedca8
|
Make comments query optional
|
2017-08-24 20:07:45 +07:00 |
|
|
Kiwi
|
cb7213ea58
|
Merge branch 'master' into refactor-global-dependencies
|
2017-08-24 13:49:46 +02:00 |
|
|
Kiwi
|
2d7d505913
|
Merge branch 'master' into banned-words
|
2017-08-24 13:49:31 +02:00 |
|
|
Chi Vinh Le
|
a42d668329
|
Merge branch 'refactor-global-dependencies' of ssh://github.com/coralproject/talk into refactor-global-dependencies
|
2017-08-24 18:47:09 +07:00 |
|
|
Chi Vinh Le
|
645aaa09ae
|
Add some docs
|
2017-08-24 18:40:38 +07:00 |
|
|
Kim Gardner
|
8b04da9cf4
|
Merge pull request #876 from coralproject/useful-errors
Added message to Extendable Errors
|
2017-08-24 12:24:42 +01:00 |
|
|
Wyatt Johnson
|
acf792089d
|
added more db optims
|
2017-08-23 15:42:30 -06:00 |
|
|
Wyatt Johnson
|
38469a7e69
|
Added message to Extendable Error's
|
2017-08-23 13:30:23 -06:00 |
|
|
Wyatt Johnson
|
763f753928
|
Merge branch 'master' into refactor-global-dependencies
|
2017-08-23 11:56:35 -06:00 |
|
|
Wyatt Johnson
|
1a27f0e00f
|
Merge branch 'master' into moderator-community
|
2017-08-23 11:56:06 -06:00 |
|
|
Wyatt Johnson
|
6d8185c33e
|
modified middleware to change AND -> OR, added mod to com pages
|
2017-08-23 11:52:02 -06:00 |
|
|
Belén Curcio
|
3f83a8f1a9
|
Merge pull request #868 from coralproject/slot-username
New Slot: commentAuthorName
|
2017-08-23 14:20:41 -03:00 |
|
|
Kiwi
|
f5eac91e0e
|
Merge branch 'master' into refactor-global-dependencies
|
2017-08-23 18:02:17 +02:00 |
|
|
Wyatt Johnson
|
a68513227a
|
adjusted tokenizer to use regex based tokenizer instead
|
2017-08-23 09:54:00 -06:00 |
|
|
Chi Vinh Le
|
ce360a47f8
|
Add slot to fragments in featured comments
|
2017-08-23 22:40:48 +07:00 |
|
|
Chi Vinh Le
|
1bcf31d22d
|
Merge branch 'slot-username' of ssh://github.com/coralproject/talk into slot-username
|
2017-08-23 20:15:44 +07:00 |
|
|
Chi Vinh Le
|
ceba418e28
|
created_at is a Date
|
2017-08-23 20:14:55 +07:00 |
|
|
Belén Curcio
|
0961797f8f
|
Merge branch 'master' into banned-words
|
2017-08-23 10:10:04 -03:00 |
|
|
Belen Curcio
|
0342b6c826
|
rolling back
|
2017-08-23 10:06:39 -03:00 |
|
|
Chi Vinh Le
|
c2b0a60d8a
|
Remove global dependency on router history
|
2017-08-23 20:02:36 +07:00 |
|
|
Chi Vinh Le
|
bf89409f60
|
Remove global dependency on Storage
|
2017-08-23 19:53:06 +07:00 |
|
|
Kim Gardner
|
994923cae0
|
Merge branch 'master' into user-sort
|
2017-08-23 13:00:12 +01:00 |
|
|
Kim Gardner
|
2a839250ed
|
Merge branch 'master' into slot-username
|
2017-08-23 13:00:06 +01:00 |
|
|
Kim Gardner
|
dcf09adc1c
|
Merge pull request #872 from coralproject/missing-fragment
Add missing fragment field to Comment
|
2017-08-23 12:59:38 +01:00 |
|
|
Kiwi
|
7ff4a2e75d
|
Merge branch 'master' into slot-username
|
2017-08-23 13:09:46 +02:00 |
|
|
Kim Gardner
|
2d1bf32464
|
Merge branch 'master' into missing-fragment
|
2017-08-23 12:04:24 +01:00 |
|
|
Chi Vinh Le
|
0811c9302d
|
Ignore access from react dev tools
|
2017-08-23 17:50:35 +07:00 |
|
|
Kim Gardner
|
a5f7a7cd75
|
Merge pull request #871 from coralproject/graphiql-fix
Template bug fix
|
2017-08-23 11:41:29 +01:00 |
|
|
Chi Vinh Le
|
4dd20260a8
|
Unprotect User.created_at
|
2017-08-23 17:32:29 +07:00 |
|
|
Chi Vinh Le
|
5eafb672ef
|
Add missing fragment field to Comment
|
2017-08-23 17:07:28 +07:00 |
|
|
Chi Vinh Le
|
61e601a2a5
|
Merge branch 'master' into refactor-global-dependencies
|
2017-08-23 04:05:56 +07:00 |
|
|
Chi Vinh Le
|
a9e3115bd9
|
Expose getErrorMessages in plugin-api
|
2017-08-23 03:53:37 +07:00 |
|
|
Chi Vinh Le
|
a23bad49c6
|
Remove global dependency on notification on admin
|
2017-08-23 03:48:20 +07:00 |
|
|
Chi Vinh Le
|
89037a2e05
|
Refactor notification
|
2017-08-23 03:22:56 +07:00 |
|
|
Chi Vinh Le
|
f428bfa6c9
|
WIP
|
2017-08-23 03:16:19 +07:00 |
|
|
Belen Curcio
|
b6951488c4
|
Tokenizer is messing with escaped regexes
|
2017-08-22 16:37:24 -03:00 |
|
|
Chi Vinh Le
|
1ee7c81675
|
Remove admin store impl
|
2017-08-23 02:24:26 +07:00 |
|
|
Chi Vinh Le
|
a934722672
|
Cleanup
|
2017-08-23 02:23:18 +07:00 |
|
|
Wyatt Johnson
|
35f8b0dc5f
|
Merge branch 'graphiql-fix' into user-sort
|
2017-08-22 13:22:35 -06:00 |
|
|
Chi Vinh Le
|
a882b36501
|
Fix connection bug
|
2017-08-23 02:20:43 +07:00 |
|
|
Wyatt Johnson
|
23f4724f99
|
fixed template bug
|
2017-08-22 13:18:48 -06:00 |
|
|
Belen Curcio
|
9fa1f3d958
|
Adding auto escape
|
2017-08-22 16:15:41 -03:00 |
|
|
Wyatt Johnson
|
f85480c0ae
|
Merge branch 'master' into user-sort
|
2017-08-22 13:04:32 -06:00 |
|