 gaba
|
96985b4780
|
More strings.
|
2017-05-25 14:05:17 -04:00 |
|
|
gaba
|
492f4a674c
|
OMG. Strings.
|
2017-05-25 12:02:26 -04: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 |
|
|
gaba
|
f525af4c6e
|
Added a few more translations that were missing.
|
2017-05-19 15:42:56 -07:00 |
|
|
gaba
|
97e9419f02
|
Missing translations.
|
2017-05-19 13:34:56 -07: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 |
|
|
riley
|
2c620c868d
|
merge master
|
2017-05-19 11:05:46 -06:00 |
|
|
Kiwi
|
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 |
|
|
Chi Vinh Le
|
f641a3ec40
|
Complete suspend user implementation
|
2017-05-19 01:52:03 +07:00 |
|
|
Benjamin Goering
|
9eac05c8fb
|
Ignored user tombstones work again
|
2017-05-17 13:18:59 -07:00 |
|
|
gaba
|
5bd9bc992b
|
Move i18n into a service
|
2017-05-17 12:53:36 -07:00 |
|
|
Chi Vinh Le
|
2bdf413b88
|
Integrate into embed stream
|
2017-05-18 02:28:01 +07:00 |
|
|
Riley Davis
|
c66e3141e0
|
actually check permissions
|
2017-05-17 11:38:43 -06:00 |
|
|
riley
|
03ce044c53
|
merge master
|
2017-05-16 16:33:41 -06:00 |
|
|
gaba
|
c0c6dd6252
|
The merge got back some code to the coral-framework.
|
2017-05-15 14:23:56 -07:00 |
|
|
gaba
|
423cb3cade
|
Merge branch 'master' into i18n-refactor
|
2017-05-15 14:02:34 -07:00 |
|
|
gaba
|
54e103b55a
|
Change a few translations that had wrong key.
|
2017-05-15 13:44:46 -07:00 |
|
|
Chi Vinh Le
|
74e1436ae4
|
Use correct error key
|
2017-05-16 01:09:33 +07:00 |
|
|
gaba
|
633086cfa3
|
Fix a few more strings and translations.
|
2017-05-15 07:11:11 -07:00 |
|
|
Wyatt Johnson
|
9403280c56
|
Merge branch 'master' into edit-changes
|
2017-05-12 15:44:19 -06:00 |
|
|
Chi Vinh Le
|
7857cadef5
|
Merge branch 'master' into query-mutation-api
Conflicts:
client/coral-embed-stream/src/components/Comment.js
client/coral-embed-stream/src/containers/Embed.js
client/coral-embed-stream/src/containers/Stream.js
client/coral-embed-stream/src/index.js
client/coral-framework/graphql/fragments/commentView.graphql
client/coral-framework/graphql/mutations/index.js
client/coral-framework/hocs/index.js
client/coral-framework/hocs/withFragments.js
|
2017-05-12 19:50:36 +07:00 |
|
|
Wyatt Johnson
|
ae5da93730
|
linting fixes
|
2017-05-11 17:44:51 -06:00 |
|
|
Wyatt Johnson
|
a65d045c65
|
lint fixes
|
2017-05-11 17:38:49 -06:00 |
|
|
Wyatt Johnson
|
08e7a90d69
|
lint fixes
|
2017-05-11 17:34:47 -06:00 |
|
|
gaba
|
3b80ee8b13
|
Add YAML loader. Fix i18n module to get YAML files.
|
2017-05-11 15:05:09 -07:00 |
|
|
Riley Davis
|
14b483d089
|
create roles helper
|
2017-05-11 14:23:02 -06:00 |
|
|
Benjamin Goering
|
cd7b1f2b2b
|
editComment mutation doesn't refetch streamQuery. Instead a reducer updates streamQuery client-side
|
2017-05-11 10:38:48 -07:00 |
|
|
gaba
|
653091fdf9
|
Merge branch 'master' into i18n-refactor
|
2017-05-11 09:02:21 -07:00 |
|
|
Benjamin Goering
|
096025b72a
|
Add asset_id to editComment mutation to allow mongo query happy path to be atomic
|
2017-05-08 09:57:52 -07:00 |
|
|
Chi Vinh Le
|
7f0b3c2ddd
|
Merge branch 'master' into query-mutation-api
Conflicts:
client/coral-embed-stream/src/components/Comment.js
client/coral-embed-stream/src/containers/Stream.js
|
2017-05-08 21:44:35 +07:00 |
|
|
Benjamin Goering
|
81879c9bb9
|
Move getEditableUntilDate into util file
|
2017-05-08 00:05:14 -07:00 |
|
|
Benjamin Goering
|
a7099295d6
|
CountdownSeconds component has its own file
|
2017-05-07 23:47:59 -07:00 |
|
|
Benjamin Goering
|
3d8c521928
|
CommentForm component is in its own file
|
2017-05-07 23:44:41 -07:00 |
|
|
Chi Vinh Le
|
1b7eedfd8d
|
Implement extendable GraphQL framework
|
2017-05-05 22:51:19 +07:00 |
|
|
Benjamin Goering
|
b97fa228b1
|
merge with master after huge coral-embed-stream refactor
|
2017-05-03 19:19:03 -07:00 |
|
|
gaba
|
c0fc87ea21
|
Merge branch 'master' into i18n-refactor
|
2017-05-01 11:28:06 -07:00 |
|
|
Belen Curcio
|
1a50b6cc85
|
Ádding like as a reaction
|
2017-05-01 12:00:44 -03:00 |
|
|
Belen Curcio
|
f1bebaa627
|
Merge
|
2017-05-01 11:54:00 -03:00 |
|
|
Belen Curcio
|
8bed64373e
|
Removing LIKE from talk
|
2017-05-01 11:15:53 -03:00 |
|
|
Belen Curcio
|
322434f751
|
Removing LIKE from talk
|
2017-05-01 11:13:35 -03:00 |
|
|
Belen Curcio
|
c58813cf48
|
merge
|
2017-05-01 10:47:56 -03:00 |
|
|
Chi Vinh Le
|
7b16a71e9b
|
Remove embed stream logic from UserBox
|
2017-04-27 18:20:55 +07:00 |
|
|
Belen Curcio
|
37e093f60a
|
Linting
|
2017-04-26 23:15:40 -03:00 |
|
|
Belen Curcio
|
de6492a26d
|
Ádding reactions, commentContent and updating current Slot
|
2017-04-26 23:06:09 -03:00 |
|