Commit Graph

7162 Commits

Author SHA1 Message Date
Riley Davis 37ac5157dd Merge branch 'master' into comment-status-display 2017-04-25 11:45:27 -06:00
Riley Davis 5db9ea6520 Merge pull request #520 from coralproject/shortcut-hint
add a little keyboard shortcut hint widget
2017-04-25 11:44:18 -06:00
Chi Vinh Le f79af56468 Better API for slot fragments 2017-04-26 00:44:02 +07:00
Belén Curcio a4b9f86e29 Merge branch 'master' into shortcut-hint 2017-04-25 14:38:47 -03:00
Riley Davis cee1c5bc1c have active state on action buttons depending on comment status 2017-04-25 11:21:28 -06:00
gaba 0f7b4ddaf6 Removes timeago from i18n module. 2017-04-25 11:43:04 -05:00
Chi Vinh Le 15d410ba12 Workaround weird Apollo bug 2017-04-25 23:20:23 +07:00
Chi Vinh Le 3a7b17750e Use unique name for fragment 2017-04-25 23:00:11 +07:00
Chi Vinh Le 4bacc2b0c2 Update Apollo 2017-04-25 22:31:59 +07:00
Chi Vinh Le 3d10534da1 RespectPlugin use fat query 2017-04-25 19:54:54 +07:00
Chi Vinh Le 54ea71bedf Support fragments in plugins 2017-04-25 18:24:25 +07:00
gaba 59e23ffd60 Moves into YAML and own module. 2017-04-24 18:09:13 -05:00
riley 19a83a902a Merge branch 'master' into all-comments-queue 2017-04-24 15:15:10 -06:00
Belén Curcio 7d56404e84 Merge branch 'master' into subscriptions 2017-04-24 18:09:34 -03:00
Kim Gardner c74de328f2 Merge pull request #529 from coralproject/undo-mobile-fix-attempt
reset the button css fixes
v1.5.2
2017-04-24 16:38:39 -04:00
Riley Davis 801ce13960 my fix did not work. 2017-04-24 14:19:01 -06:00
Riley Davis b71b7cc883 move the shortcuts note logic into redux state 2017-04-24 14:04:57 -06:00
Kim Gardner 78ef98bc8c Merge pull request #528 from coralproject/reply-char-count
enable character counting on replies
2017-04-24 15:52:35 -04:00
Riley Davis b2428371c7 enable character counting on replies 2017-04-24 13:09:41 -06:00
Kim Gardner bb4f660bb6 Merge pull request #527 from coralproject/quick-fix-permalinks
Quickfix permalinks
2017-04-24 14:40:13 -04:00
Riley Davis aaa5d17ca3 Merge branch 'master' into shortcut-hint 2017-04-24 12:34:44 -06:00
Kim Gardner f6938271f6 Merge branch 'master' into quick-fix-permalinks 2017-04-24 14:34:03 -04:00
Kim Gardner 54b5dcb244 Merge pull request #517 from coralproject/status-fix
Fixed bug with status changes in the graph
2017-04-24 14:33:37 -04:00
Kiwi 35938bbd38 Merge branch 'master' into quick-fix-permalinks 2017-04-25 01:10:12 +07:00
Chi Vinh Le ac2a636274 Quickfix permalinks 2017-04-25 01:04:26 +07:00
gaba 5aacdc3a74 Merge branch 'master' into i18n-refactor 2017-04-24 12:56:32 -05:00
Kim Gardner 56e2f70ebb Merge branch 'master' into status-fix 2017-04-24 13:52:39 -04:00
Kim Gardner 188db361ac Merge pull request #524 from coralproject/comment-box-mobilify
add some styles so mobile doesn't zoom the text box
2017-04-24 13:48:45 -04:00
Kim Gardner 860f434335 Merge branch 'master' into all-comments-queue 2017-04-24 13:45:02 -04:00
Kim Gardner 31c6e2f891 Merge branch 'master' into comment-box-mobilify 2017-04-24 13:44:31 -04:00
Kim Gardner a8a32ef36f Merge pull request #525 from coralproject/reply-length
reply box is squished on long comments in Firefox
2017-04-24 13:44:21 -04:00
Riley Davis 76e2066a51 reply box is squished on long comments in Firefox 2017-04-24 11:12:39 -06:00
Chi Vinh Le 027358913d Use container 2017-04-24 23:35:49 +07:00
Chi Vinh Le a91db35f91 Add comments for filter 2017-04-24 23:34:53 +07:00
Riley Davis c60cfebde7 add some styles so mobile doesn't zoom the text box 2017-04-24 10:19:36 -06:00
Chi Vinh Le c261cdc0c6 Compose comment fragments 2017-04-24 22:49:52 +07:00
gaba 05bf21fe09 Refactoring 2017-04-24 10:08:33 -05:00
Chi Vinh Le 11fb5421b5 Implement Stream Container 2017-04-24 19:27:54 +07:00
Chi Vinh Le 4dc3b0c2f4 Merge branch 'master' into query-composition-2
Conflicts:
	client/coral-embed-stream/src/Embed.js
	client/coral-embed-stream/src/components/Comment.js
	client/coral-embed-stream/src/index.js
	client/coral-framework/services/store.js
	client/coral-settings/containers/ProfileContainer.js
	graph/resolvers/root_query.js
2017-04-24 15:24:34 +07:00
Belen Curcio f18191793b fe plugins 2017-04-23 13:09:52 -03:00
Riley Davis 2743f6faf6 return all the known types 2017-04-21 16:44:42 -06:00
Gabriela Rodríguez Berón a41108a53c Merge branch 'master' into shortcut-hint 2017-04-21 15:10:42 -07:00
Gabriela Rodríguez Berón e337a0d18b Merge branch 'master' into subscriptions 2017-04-21 14:35:21 -07:00
Gabriela Rodríguez Berón e9c81f0639 Merge branch 'master' into all-comments-queue 2017-04-21 14:31:16 -07:00
gaba c4ffe58f58 Adds privacy type to the methods to add tags. 2017-04-21 14:30:41 -07:00
Wyatt Johnson 441ea12a65 Added user metadata 2017-04-21 15:22:52 -06:00
gaba 0a4fd15fa2 Merge branch 'master' into 142993479-tags 2017-04-21 12:51:05 -07:00
Riley Davis d1ab279f74 add a little keyboard shortcut widget 2017-04-21 13:26:32 -06:00
Riley Davis 387e52b510 Merge branch 'master' into more-fragment-matcher 2017-04-21 12:56:47 -06:00
Gabriela Rodríguez Berón c68afe9819 Merge branch 'master' into status-fix 2017-04-21 11:56:44 -07:00