 Kim Gardner
|
66202d1fd6
|
Merge branch 'master' into fix-false-spinner
|
2018-01-22 10:51:49 -05:00 |
|
|
Kim Gardner
|
d98a76272c
|
Merge pull request #1280 from sanoma/master
Dutch translation
|
2018-01-22 10:51:00 -05:00 |
|
|
Chi Vinh Le
|
15d0ecbe51
|
Don't show spinner on fetchMore
|
2018-01-22 14:34:30 +01:00 |
|
|
Tibo Beijen
|
ca653fd5ff
|
Added missing translations, added since start of nl translations.
|
2018-01-22 14:13:44 +01:00 |
|
|
Tibo Beijen
|
468a1683ce
|
Small lintin fix.
|
2018-01-22 11:22:12 +01:00 |
|
|
Tibo Beijen
|
d827ebef72
|
Merge branch 'master' into sanoma-master
|
2018-01-22 09:29:22 +01:00 |
|
|
Wyatt Johnson
|
a9be049bf6
|
Merge pull request #1296 from coralproject/user-json
Auth Callback Rewrite
|
2018-01-19 11:27:19 -07:00 |
|
|
Wyatt Johnson
|
a402817cc9
|
Merge branch 'master' into user-json
|
2018-01-19 10:12:36 -07:00 |
|
|
daan944
|
02ca59638a
|
Merge branch 'master' into master
|
2018-01-19 11:29:47 +01:00 |
|
|
Wyatt Johnson
|
b2cf5efed6
|
Merge pull request #1297 from coralproject/webpack-performance
Webpack Build Performance Improvements
|
2018-01-18 18:03:52 -07:00 |
|
|
Wyatt Johnson
|
7258c3dd08
|
added performance updates to webpack build
|
2018-01-18 17:19:19 -07:00 |
|
|
Wyatt Johnson
|
4bbd561a1b
|
fix to cli
|
2018-01-18 16:54:27 -07:00 |
|
|
Wyatt Johnson
|
49d20db26f
|
replaced homegrown with package
|
2018-01-18 14:22:19 -07:00 |
|
|
Wyatt Johnson
|
14d035adb1
|
Merge branch 'master' into user-json
|
2018-01-18 14:16:49 -07:00 |
|
|
Wyatt Johnson
|
844ce5dbfe
|
fixed json parse error
|
2018-01-18 14:15:33 -07:00 |
|
|
Wyatt Johnson
|
8f1d9f051e
|
added encoding for the user data as json with proper encoding/escaping
|
2018-01-18 13:58:45 -07:00 |
|
|
Kim Gardner
|
6f55189658
|
Merge branch 'master' into master
|
2018-01-18 12:08:07 -05:00 |
|
|
Kim Gardner
|
3c9b4bd20e
|
Merge pull request #1294 from coralproject/close-asset-now
closeAsset Mutation
|
2018-01-18 12:07:47 -05:00 |
|
|
Wyatt Johnson
|
716a61aa5c
|
Merge branch 'master' into master
|
2018-01-18 09:38:42 -07:00 |
|
|
Wyatt Johnson
|
127f0c1e20
|
Merge branch 'master' into close-asset-now
|
2018-01-18 09:38:24 -07:00 |
|
|
Wyatt Johnson
|
fa83ba9556
|
Merge pull request #1292 from coralproject/locale-local-storage
Locale local storage
|
2018-01-18 09:38:12 -07:00 |
|
|
Kim Gardner
|
317541a63b
|
Merge branch 'master' into close-asset-now
|
2018-01-18 11:27:12 -05:00 |
|
|
Kim Gardner
|
fd5eb7d23d
|
Merge branch 'master' into locale-local-storage
|
2018-01-18 11:27:04 -05:00 |
|
|
Kim Gardner
|
06f308c182
|
Merge pull request #1290 from coralproject/asset-rewrite
Asset Rewriting
|
2018-01-18 11:26:02 -05:00 |
|
|
Kim Gardner
|
2345daf783
|
Merge branch 'master' into locale-local-storage
|
2018-01-18 11:21:20 -05:00 |
|
|
Kim Gardner
|
df2bce4d53
|
Merge branch 'master' into asset-rewrite
|
2018-01-18 11:19:23 -05:00 |
|
|
Kim Gardner
|
c99411b8fd
|
Merge pull request #1288 from coralproject/reply-on-hidden-comment
Replies to hidden/deleted comments
|
2018-01-18 11:18:53 -05:00 |
|
|
Kim Gardner
|
022a57479d
|
Merge branch 'master' into reply-on-hidden-comment
|
2018-01-18 11:02:08 -05:00 |
|
|
Kim Gardner
|
56001d7780
|
Merge pull request #1284 from coralproject/action-index
Action index
|
2018-01-18 11:01:43 -05:00 |
|
|
Kim Gardner
|
a010302242
|
Merge branch 'master' into reply-on-hidden-comment
|
2018-01-18 11:01:36 -05:00 |
|
|
Kim Gardner
|
f306d54924
|
Merge branch 'master' into action-index
|
2018-01-18 10:53:45 -05:00 |
|
|
Kim Gardner
|
c1ff7e9c84
|
Merge branch 'master' into asset-rewrite
|
2018-01-18 10:53:09 -05:00 |
|
|
Kim Gardner
|
3255b8d23b
|
Merge branch 'master' into close-asset-now
|
2018-01-18 10:52:37 -05:00 |
|
|
Kim Gardner
|
8ea3ab9c02
|
Merge pull request #1283 from coralproject/formatting
Adding format to admin comment - CommentFormatter
|
2018-01-18 10:51:50 -05:00 |
|
|
Kim Gardner
|
ec9a57bede
|
Merge branch 'master' into formatting
|
2018-01-18 10:42:56 -05:00 |
|
|
daan944
|
dbfd0fd25e
|
Merge branch 'master' into master
|
2018-01-18 14:13:57 +01:00 |
|
|
Wyatt Johnson
|
ac62cbf348
|
added new closeAsset mutation and support in UI
|
2018-01-17 16:04:32 -07:00 |
|
|
Wyatt Johnson
|
08b1cada7e
|
Merge pull request #1293 from coralproject/deploy-script
Fixed deploy script
v4.0.0
|
2018-01-17 15:01:57 -07:00 |
|
|
Wyatt Johnson
|
4960b34748
|
fixed deploy script
|
2018-01-17 14:56:36 -07:00 |
|
|
Wyatt Johnson
|
c612902779
|
fixed styles
|
2018-01-17 13:41:02 -07:00 |
|
|
Wyatt Johnson
|
3938b7883f
|
introduced some locale fixes
|
2018-01-17 13:24:54 -07:00 |
|
|
Wyatt Johnson
|
e048491221
|
Merge pull request #1291 from coralproject/webpack-sourcemaps
Webpack Sourcemap Configuration
|
2018-01-17 11:40:48 -07:00 |
|
|
Wyatt Johnson
|
68598d3c45
|
cleanup for logic
|
2018-01-17 11:34:09 -07:00 |
|
|
Wyatt Johnson
|
7ca89435c6
|
added configuration options for webpack
|
2018-01-17 11:24:36 -07:00 |
|
|
Kim Gardner
|
426d7dbfec
|
Merge branch 'master' into formatting
|
2018-01-17 10:06:47 -05:00 |
|
|
Wyatt Johnson
|
45d6800143
|
added dry mode
|
2018-01-16 17:10:59 -07:00 |
|
|
Wyatt Johnson
|
e3cdad1f2a
|
added asset re-write
|
2018-01-16 16:47:05 -07:00 |
|
|
Wyatt Johnson
|
66cfd20f7b
|
Merge branch 'master' into master
|
2018-01-16 16:00:37 -07:00 |
|
|
Wyatt Johnson
|
af40a85071
|
Merge branch 'master' into master
|
2018-01-16 15:58:58 -07:00 |
|
|
Wyatt Johnson
|
b11a730373
|
Merge branch 'master' into reply-on-hidden-comment
|
2018-01-16 14:13:13 -07:00 |
|