 Kim Gardner
|
0f6cc20478
|
Update error message
|
2018-01-22 13:08:28 -05:00 |
|
|
Wyatt Johnson
|
26c109e8ae
|
Removed cwd in place of __dirname
|
2018-01-22 11:06:49 -07:00 |
|
|
Chi Vinh Le
|
1e34af6aa3
|
Fixes for report dialog
|
2018-01-22 18:20:36 +01:00 |
|
|
Kiwi
|
60c62e4f1a
|
Merge branch 'master' into live-reported
|
2018-01-22 17:46:49 +01:00 |
|
|
Kim Gardner
|
30dddf387c
|
Merge pull request #1299 from coralproject/fix-modqueue-counts
Fix modqueue count bugs
|
2018-01-22 11:31:42 -05:00 |
|
|
Kiwi
|
0528106fdf
|
Merge branch 'master' into live-reported
|
2018-01-22 17:16:08 +01:00 |
|
|
Kim Gardner
|
bdd207524c
|
Merge branch 'master' into fix-modqueue-counts
|
2018-01-22 11:09:40 -05:00 |
|
|
Kim Gardner
|
4be19fd028
|
Merge pull request #1300 from coralproject/fix-false-spinner
Don't show spinner on fetchMore
|
2018-01-22 11:08:59 -05:00 |
|
|
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 |
|
|
Kiwi
|
65588f234a
|
Merge branch 'master' into live-reported
|
2018-01-19 22:07:20 +01:00 |
|
|
Kiwi
|
bb2ea77008
|
Merge branch 'master' into fix-modqueue-counts
|
2018-01-19 21:52:13 +01:00 |
|
|
Chi Vinh Le
|
392c5511eb
|
Fix modqueue counts
|
2018-01-19 21:15:44 +01:00 |
|
|
Wyatt Johnson
|
a9be049bf6
|
Merge pull request #1296 from coralproject/user-json
Auth Callback Rewrite
|
2018-01-19 11:27:19 -07:00 |
|
|
Chi Vinh Le
|
bf752a50ca
|
Don't decrease count twice
|
2018-01-19 18:19:34 +01:00 |
|
|
Wyatt Johnson
|
a402817cc9
|
Merge branch 'master' into user-json
|
2018-01-19 10:12:36 -07:00 |
|
|
Chi Vinh Le
|
669eb360df
|
Merge branch 'live-reported' of ssh://github.com/coralproject/talk into live-reported
|
2018-01-19 17:04:49 +01:00 |
|
|
Chi Vinh Le
|
25dd979a37
|
Naming
|
2018-01-19 16:06:25 +01:00 |
|
|
Kiwi
|
e653a5f9c0
|
Merge branch 'master' into live-reported
|
2018-01-19 16:04:43 +01:00 |
|
|
Chi Vinh Le
|
5d26f23b7b
|
Prevent simulaneouse mutations (of the same one)
|
2018-01-19 15:51:51 +01:00 |
|
|
Chi Vinh Le
|
e2a361276b
|
show notification on errors
|
2018-01-19 15:33:34 +01:00 |
|
|
Chi Vinh Le
|
319bca3ba8
|
Refactor indicator
|
2018-01-19 14:55:53 +01: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 |
|
|
Chi Vinh Le
|
a111439541
|
Only increme once
|
2018-01-18 20:31:51 +01:00 |
|
|
Chi Vinh Le
|
72331699b5
|
Refactor
|
2018-01-18 20:28:12 +01:00 |
|
|
Chi Vinh Le
|
544ef081dc
|
Add previous username to notification
|
2018-01-18 20:09:47 +01:00 |
|
|
Chi Vinh Le
|
ddf3816f5a
|
Better notifications
|
2018-01-18 20:00:31 +01:00 |
|
|
Chi Vinh Le
|
7d022ed380
|
Refactor Community
|
2018-01-18 19:10:32 +01:00 |
|
|
Chi Vinh Le
|
40539bf3b7
|
Set limit to 10 when searching for people
|
2018-01-18 18:35:29 +01:00 |
|
|
Chi Vinh Le
|
c1a26d2e71
|
Split community queries
|
2018-01-18 18:32:49 +01: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 |
|
|
Chi Vinh Le
|
2a6543bcea
|
don't query username count twice
|
2018-01-18 17:43:46 +01: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 |
|