 Chi Vinh Le
|
b79a07275f
|
Rename fragment
|
2018-02-22 10:24:44 +01:00 |
|
|
Chi Vinh Le
|
9ca237f49d
|
Merge branch 'events' of ssh://github.com/coralproject/talk into events
|
2018-02-21 18:06:02 +01:00 |
|
|
Chi Vinh Le
|
6935330536
|
Implemented notification frontend functionality
|
2018-02-21 18:03:46 +01:00 |
|
|
Wyatt Johnson
|
cb266e651b
|
spelling
|
2018-02-20 21:47:16 -07:00 |
|
|
Wyatt JohnsonandGitHub
|
b6fa8b92a1
|
Merge branch 'master' into events
|
2018-02-20 21:46:41 -07:00 |
|
|
Kim GardnerandGitHub
|
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 |
|
|
Wyatt JohnsonandGitHub
|
9426f280cc
|
Update router.js
|
2018-02-20 12:27:47 -07:00 |
|
|
Kim GardnerandGitHub
|
234c705f35
|
Merge branch 'master' into account-h-until
|
2018-02-20 12:47:16 -05:00 |
|
|
Wyatt JohnsonandGitHub
|
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 |
|
|
Belén CurcioandGitHub
|
9617948493
|
Merge branch 'master' into account-h-until
|
2018-02-20 14:03:22 -03:00 |
|
|
Wyatt JohnsonandGitHub
|
7129896bd6
|
Merge branch 'master' into bump-version-4-2-2
|
2018-02-20 09:57:12 -07:00 |
|
|
Wyatt JohnsonandGitHub
|
e2e718494c
|
Merge pull request #1387 from coralproject/action-fixes
Action Count Fixes
|
2018-02-20 09:57:05 -07:00 |
|
|
Chi Vinh Le
|
284009df55
|
WIP
|
2018-02-20 17:54:44 +01:00 |
|
|
Kim Gardner
|
f918bbea20
|
Update version to 4.2.2
|
2018-02-20 11:45:36 -05:00 |
|
|
Wyatt JohnsonandGitHub
|
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 GardnerandGitHub
|
34922a6d42
|
Merge branch 'master' into account-h-until
|
2018-02-20 10:56:40 -05:00 |
|
|
Kim GardnerandGitHub
|
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 |
|
|
Kim GardnerandGitHub
|
c4cdc672b7
|
Merge branch 'master' into user-tooltip-style
|
2018-02-20 10:44:15 -05:00 |
|
|
Kim GardnerandGitHub
|
b84a488518
|
Merge pull request #1380 from leeeandroo/facebook-translations
Fix translations keys and add german translations to facebook plugin
|
2018-02-20 10:44:05 -05:00 |
|
|
Kim GardnerandGitHub
|
8b4b1728bc
|
Merge branch 'master' into account-h-until
|
2018-02-20 10:38:14 -05:00 |
|
|
Kim Gardner
|
233c514251
|
Fix small typo
|
2018-02-20 10:37:36 -05:00 |
|
|
Kim GardnerandGitHub
|
4b134cbfc2
|
Merge branch 'master' into facebook-translations
|
2018-02-20 10:34:22 -05:00 |
|
|
Kim GardnerandGitHub
|
c446098a1e
|
Merge branch 'master' into user-tooltip-style
|
2018-02-20 10:24:00 -05:00 |
|
|
Kim GardnerandGitHub
|
b26e938ac5
|
Merge pull request #1381 from leeeandroo/package-version421
set a right last release 4.2.1 to package.json
|
2018-02-20 10:22:09 -05:00 |
|
|
Chi Vinh Le
|
ee04d9a848
|
Merge branch 'refactor-profile' into events
|
2018-02-20 15:12:43 +01:00 |
|
|
Chi Vinh Le
|
0ca8b978a1
|
Implement profile settings
|
2018-02-20 13:21:02 +01:00 |
|
|
okbel
|
846df0a5e0
|
trim dates, style tooltip
|
2018-02-19 12:27:55 -03:00 |
|
|
okbel
|
e7934d9468
|
trim dates, style tooltip
|
2018-02-19 12:23:36 -03:00 |
|
|
Chi Vinh Le
|
3deb56750f
|
Merge branch 'refactor-profile' into events
|
2018-02-19 16:20:02 +01:00 |
|
|
okbel
|
12497a1331
|
Adding duration asHours and asDays
|
2018-02-19 12:07:57 -03:00 |
|
|
Chi Vinh Le
|
45dde4636d
|
Merge branch 'master' into refactor-profile
|
2018-02-19 16:06:42 +01:00 |
|
|
Chi Vinh Le
|
8c2070e345
|
Refactor Profile
|
2018-02-19 16:04:43 +01:00 |
|
|
Leandro
|
606d5734f9
|
set a right last release 4.2.1 to package.json
|
2018-02-19 11:18:56 +01:00 |
|
|
Leandro
|
87ff631eed
|
fix translations keys and add germna translations to facebook plugin
|
2018-02-19 09:50:07 +01:00 |
|
|
Wyatt Johnson
|
b600172380
|
fixed import cycle
|
2018-02-16 17:11:02 -07:00 |
|
|
Wyatt Johnson
|
0b547b173a
|
Merge branch 'master' into events
|
2018-02-16 16:43:03 -07:00 |
|
|
Kim GardnerandGitHub
|
950efba3fe
|
Merge pull request #1378 from coralproject/suspension-fix
Suspension Button Fix
v4.2.1
|
2018-02-16 18:27:48 -05:00 |
|
|
Wyatt JohnsonandGitHub
|
af592e326f
|
Merge branch 'master' into suspension-fix
|
2018-02-16 16:18:02 -07:00 |
|
|
Wyatt Johnson
|
c2aa2077f4
|
Show suspension status on button
|
2018-02-16 16:14:49 -07:00 |
|
|
Wyatt Johnson
|
91aeb9dbae
|
fixes based on feedback
|
2018-02-16 16:08:05 -07:00 |
|
|
Kim GardnerandGitHub
|
26476f42f7
|
Merge pull request #1377 from coralproject/template-fixes
Template bugs
|
2018-02-16 18:06:28 -05:00 |
|
|
Wyatt Johnson
|
9a89dfaa29
|
fixed test
|
2018-02-16 15:48:38 -07:00 |
|
|
Wyatt Johnson
|
634da8012f
|
Merge branch 'master' into events
|
2018-02-16 15:47:37 -07:00 |
|
|
Wyatt JohnsonandGitHub
|
3434fb4fed
|
Merge branch 'master' into template-fixes
|
2018-02-16 15:45:14 -07:00 |
|
|
Wyatt JohnsonandGitHub
|
a6bc29af9a
|
Merge pull request #1368 from coralproject/snyk-fix-946937f7
[Snyk Update] New fixes for 4 vulnerable dependency paths
|
2018-02-16 15:34:54 -07:00 |
|
|
Wyatt Johnson
|
d86ff8418d
|
fixed changes to api
|
2018-02-16 15:26:33 -07:00 |
|
|
Kim Gardner
|
e71bcbe58d
|
Yarn install
|
2018-02-16 17:14:54 -05:00 |
|
|
Kim GardnerandGitHub
|
77c838ea22
|
Merge branch 'master' into snyk-fix-946937f7
|
2018-02-16 17:03:50 -05:00 |
|
|
Kim GardnerandGitHub
|
39313a20fa
|
Merge pull request #1374 from coralproject/spam-fixes
Fixes for Spam Plugin
|
2018-02-16 16:51:37 -05:00 |
|