 Tomas
|
77c7bb3cab
|
Update setting.js
|
2018-02-24 03:08:03 -05:00 |
|
|
Kim Gardner
|
eb0265bbb3
|
Merge pull request #1400 from coralproject/pregit
pre-commit linting
|
2018-02-23 15:55:19 -05:00 |
|
|
Wyatt Johnson
|
36438c7f38
|
Merge branch 'master' into pregit
|
2018-02-23 13:17:20 -07:00 |
|
|
Wyatt Johnson
|
bd08debb40
|
Merge pull request #1401 from coralproject/account-history-patches
Account history
|
2018-02-23 13:17:07 -07:00 |
|
|
Kim Gardner
|
7e41619732
|
Update new translation keys
|
2018-02-23 14:54:45 -05:00 |
|
|
Wyatt Johnson
|
c869869436
|
Merge branch 'master' into account-history-patches
|
2018-02-23 12:33:05 -07:00 |
|
|
Wyatt Johnson
|
8b4fe46120
|
added support for new system icon
|
2018-02-23 12:32:49 -07:00 |
|
|
Kim Gardner
|
1707cd7d98
|
Merge branch 'master' into pregit
|
2018-02-23 14:30:57 -05:00 |
|
|
Wyatt Johnson
|
c12b3ca2b2
|
Merge pull request #1395 from nikoferro/quiet-logs
issue #1022 - quiet logs on production mode
|
2018-02-23 12:17:24 -07:00 |
|
|
Wyatt Johnson
|
ecf040ebf7
|
Merge branch 'master' into quiet-logs
|
2018-02-23 11:55:25 -07:00 |
|
|
Wyatt Johnson
|
025c82a6cc
|
migrated pregit linting
|
2018-02-23 11:48:44 -07:00 |
|
|
Kim Gardner
|
3a04e492c2
|
Merge pull request #1398 from mkonikov/patch-2
Fix typos
|
2018-02-23 12:53:03 -05:00 |
|
|
Kim Gardner
|
8571fdc957
|
Merge branch 'master' into patch-2
|
2018-02-23 12:27:32 -05:00 |
|
|
Kim Gardner
|
25f4f8c1c8
|
Merge pull request #1397 from mkonikov/patch-1
Typos in comments
|
2018-02-23 12:17:33 -05:00 |
|
|
Mendel Konikov
|
69117f2fa5
|
Fixed one more typo
And once we're going all out, capitalized ;)
|
2018-02-23 12:01:56 -05:00 |
|
|
Mendel Konikov
|
820087f49c
|
Fix typos
|
2018-02-23 11:12:34 -05:00 |
|
|
Mendel Konikov
|
898e28fe1b
|
Typos in comments
|
2018-02-23 08:27:21 -05:00 |
|
|
Wyatt Johnson
|
139d036b42
|
changed styles + added translations
|
2018-02-22 17:32:37 -07:00 |
|
|
Nicolas Ferro
|
e33ccb57b6
|
invoke console warning through window to prevent from being discarded on prod
|
2018-02-22 21:00:55 -03:00 |
|
|
Nicolas Ferro
|
a3e2448f25
|
Merge branch 'quiet-logs' of https://github.com/nikoferro/talk into quiet-logs
|
2018-02-22 19:34:53 -03:00 |
|
|
Nicolas Ferro
|
855e972bec
|
fix pre-commit errors
|
2018-02-22 19:34:33 -03:00 |
|
|
Nicolas Ferro
|
361dc6c441
|
Merge branch 'master' into quiet-logs
|
2018-02-22 19:25:51 -03:00 |
|
|
Nicolas Ferro
|
083b8638e8
|
issue #1022 - quiet logs on production mode
|
2018-02-22 19:17:26 -03:00 |
|
|
Wyatt Johnson
|
011a6e6465
|
Merge pull request #1390 from coralproject/workspaces
Yarn Workspaces
|
2018-02-22 15:09:32 -07:00 |
|
|
Wyatt Johnson
|
2485386b45
|
moved lock file
|
2018-02-22 14:29:56 -07:00 |
|
|
Wyatt Johnson
|
5bba2ea0ae
|
updated plugin reconciler, replaced docker commands
|
2018-02-22 14:27:14 -07:00 |
|
|
Wyatt Johnson
|
8c9bf5d4c8
|
Merge branch 'master' into workspaces
|
2018-02-22 14:10:33 -07:00 |
|
|
Wyatt Johnson
|
fa96531eab
|
Merge pull request #1373 from kitwestneat/plugin-google-auth
add Google auth plugin
|
2018-02-22 14:05:43 -07:00 |
|
|
Wyatt Johnson
|
2aa043d39a
|
Merge branch 'master' into plugin-google-auth
|
2018-02-22 10:09:35 -07:00 |
|
|
Kim Gardner
|
03fe54c68e
|
Merge branch 'master' into workspaces
|
2018-02-22 12:06:00 -05:00 |
|
|
Kim Gardner
|
24b3980423
|
Merge pull request #1383 from coralproject/refactor-profile
Profile Tab Pane and Profile Settings
|
2018-02-22 10:12:54 -05:00 |
|
|
Chi Vinh Le
|
4d943629d9
|
Rm accident added file
|
2018-02-22 10:47:13 +01:00 |
|
|
Chi Vinh Le
|
7dd63dc812
|
Fix CI
|
2018-02-22 10:38:18 +01:00 |
|
|
Wyatt Johnson
|
60af5135ca
|
Merge branch 'master' into plugin-google-auth
|
2018-02-21 09:50:30 -07:00 |
|
|
Wyatt Johnson
|
85f3598e99
|
added advisory excemption
|
2018-02-20 21:45:35 -07:00 |
|
|
Wyatt Johnson
|
e5f6188bd2
|
replaced custom loading with yarn workspaces
|
2018-02-20 21:39:32 -07:00 |
|
|
Kim Gardner
|
8080994975
|
Merge branch 'master' into refactor-profile
|
2018-02-20 15:14:12 -05:00 |
|
|
Kim Gardner
|
e8e8b007e3
|
Merge pull request #1382 from coralproject/account-h-until
Adding suspension and ban support for duration in hours and days
|
2018-02-20 15:13:48 -05:00 |
|
|
Kiwi
|
6a5c643ef2
|
Merge branch 'master' into refactor-profile
|
2018-02-20 19:57:59 +01:00 |
|
|
Kim Gardner
|
234c705f35
|
Merge branch 'master' into account-h-until
|
2018-02-20 12:47:16 -05:00 |
|
|
Wyatt Johnson
|
74d38f16ed
|
Merge pull request #1388 from coralproject/bump-version-4-2-2
Update version to 4.2.2
v4.2.2
|
2018-02-20 10:27:14 -07:00 |
|
|
Kiwi
|
a7e9936671
|
Merge branch 'master' into refactor-profile
|
2018-02-20 18:24:18 +01:00 |
|
|
Belén Curcio
|
9617948493
|
Merge branch 'master' into account-h-until
|
2018-02-20 14:03:22 -03:00 |
|
|
Wyatt Johnson
|
7129896bd6
|
Merge branch 'master' into bump-version-4-2-2
|
2018-02-20 09:57:12 -07:00 |
|
|
Wyatt Johnson
|
e2e718494c
|
Merge pull request #1387 from coralproject/action-fixes
Action Count Fixes
|
2018-02-20 09:57:05 -07:00 |
|
|
Kim Gardner
|
f918bbea20
|
Update version to 4.2.2
|
2018-02-20 11:45:36 -05:00 |
|
|
Wyatt Johnson
|
4467f6110f
|
Merge branch 'master' into action-fixes
|
2018-02-20 09:44:00 -07:00 |
|
|
Wyatt Johnson
|
a166404347
|
fix for action count null
|
2018-02-20 09:31:08 -07:00 |
|
|
Kim Gardner
|
34922a6d42
|
Merge branch 'master' into account-h-until
|
2018-02-20 10:56:40 -05:00 |
|
|
Kim Gardner
|
3d2f3ebc59
|
Merge pull request #1384 from coralproject/user-tooltip-style
Making the User Info Tooltip more readable and friendly
|
2018-02-20 10:56:04 -05:00 |
|