Commit Graph

5707 Commits

Author SHA1 Message Date
Kiwi 2d7d505913 Merge branch 'master' into banned-words 2017-08-24 13:49:31 +02: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 38469a7e69 Added message to Extendable Error's 2017-08-23 13:30:23 -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
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
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
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
Belen Curcio b6951488c4 Tokenizer is messing with escaped regexes 2017-08-22 16:37:24 -03: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
Kiwi 4eac739568 Merge branch 'master' into slot-username 2017-08-22 17:41:13 +02:00
Kim Gardner 8ecf243d2d Merge pull request #869 from coralproject/admin-reply
Reply Badge - Admin Side
2017-08-22 16:37:42 +01:00
Belen Curcio cb4d2998f6 Removing logic from ReplyBadge 2017-08-22 09:40:49 -03:00
Belen Curcio c402627280 Adding Reply Badge to User History 2017-08-21 17:27:32 -03:00
Belen Curcio 647b5ed745 Adding Reply Badge 2017-08-21 17:09:26 -03:00
Belen Curcio a540dfe8d4 Adding hasParent on Comment to the Graph 2017-08-21 16:21:39 -03:00
Belen Curcio 19dfe86118 Updates 2017-08-21 14:53:24 -03:00
Belen Curcio cea6f7b8e8 Deleting Reference to FakeComment 2017-08-21 14:26:22 -03:00
Belen Curcio 9bff90bd4d Adding Slot to Featured Comments 2017-08-21 13:18:46 -03:00
Belen Curcio 22f473a9ea Merge branch 'slot-username' of github.com:coralproject/talk into slot-username 2017-08-21 12:28:24 -03:00
Belen Curcio 663a46896e Merge branch 'master' of github.com:coralproject/talk into slot-username 2017-08-21 12:28:05 -03:00
Belén Curcio bfa195d7cb Merge branch 'master' into slot-username 2017-08-21 12:27:00 -03:00
Belen Curcio 9028c1b4eb Adding fragment Slot 2017-08-21 12:15:53 -03:00
Kim Gardner 8b044954d9 Merge pull request #865 from clintabrown/fix-routes-mount-path
Fix paths when TALK_ROOT_URL_MOUNT_PATH is set to true
v3.2.0
2017-08-21 15:43:02 +01:00
Wyatt Johnson 170ca044fe Merge branch 'master' into fix-routes-mount-path 2017-08-21 08:29:37 -06:00
Kim Gardner ccf978f87c Merge pull request #867 from coralproject/trust-defaults-change
Changed trust defaults
2017-08-21 15:29:18 +01:00
Wyatt Johnson 65e56d36a1 Merge branch 'master' into fix-routes-mount-path 2017-08-21 08:15:20 -06:00
Wyatt Johnson 1f813da68b changed trust defaults 2017-08-21 08:12:36 -06:00
Kim Gardner 7c7fe1b3cc Merge pull request #863 from coralproject/optimization
Front-End Optimizations
2017-08-21 14:44:49 +01:00
Belen Curcio 0ea2660c97 Adding new Slot: authorName - Deleting Old Code 2017-08-21 10:44:03 -03:00
Kim Gardner 262ec5b0f8 Merge branch 'master' into fix-routes-mount-path 2017-08-21 12:48:49 +01:00
Kim Gardner f7b06dc57c Merge branch 'master' into optimization 2017-08-21 12:21:55 +01:00
Kim Gardner c3884ed0ed Merge pull request #864 from coralproject/redis-changes
Redis Improvements
2017-08-21 12:21:09 +01:00
Kim Gardner f744598dfd Merge branch 'master' into redis-changes 2017-08-21 12:07:23 +01:00
Kim Gardner 64d760bffc Merge branch 'master' into fix-routes-mount-path 2017-08-21 12:02:57 +01:00
Kim Gardner c81a17ac25 Merge branch 'master' into optimization 2017-08-21 11:15:33 +01:00
Kim Gardner 7dfb2bded1 Merge pull request #866 from coralproject/quickfix-configure-state
Fix bug in configure
2017-08-21 11:15:14 +01:00
Chi Vinh Le 077bc5ad33 Fix typo 2017-08-21 17:09:15 +07:00
Chi Vinh Le 3b26e855bc Don't manipulate state directly... 2017-08-21 17:02:54 +07:00
Clint Brown 7a0e04ae56 Fix linting 2017-08-21 09:23:52 +10:00