 Kiwi
|
b8a12aef2f
|
Merge branch 'master' into reject-username
|
2018-06-04 17:49:18 -03:00 |
|
|
Kim Gardner
|
8feb67f2ea
|
Merge pull request #1676 from coralproject/nvmrc
Added .nvmrc file
|
2018-06-04 21:41:31 +01:00 |
|
|
Chi Vinh Le
|
773eb34c3e
|
Merge branch 'reject-username' of ssh://github.com/coralproject/talk into reject-username
|
2018-06-04 22:38:21 +02:00 |
|
|
Chi Vinh Le
|
5835845092
|
Fix write fragment
|
2018-06-04 22:37:31 +02:00 |
|
|
Kiwi
|
7627d37e22
|
Merge branch 'master' into reject-username
|
2018-06-04 17:32:44 -03:00 |
|
|
Chi Vinh Le
|
6674b657ab
|
Move helper out of class
|
2018-06-04 22:32:23 +02:00 |
|
|
Chi Vinh Le
|
9c3d9e5943
|
Merge branch 'reject-username' of ssh://github.com/coralproject/talk into reject-username
|
2018-06-04 22:30:49 +02:00 |
|
|
Chi Vinh Le
|
636bc9efa4
|
Manage cache
|
2018-06-04 22:30:12 +02:00 |
|
|
Kim Gardner
|
6f66ff6ccf
|
Merge branch 'master' into nvmrc
|
2018-06-04 21:21:55 +01:00 |
|
|
Kim Gardner
|
bdf5b0c6a1
|
Merge pull request #1677 from coralproject/version-bump
Version Bump
|
2018-06-04 21:21:25 +01:00 |
|
|
Wyatt Johnson
|
ef86938a0e
|
Update package.json
|
2018-06-04 13:45:49 -06:00 |
|
|
Wyatt Johnson
|
01f7aa52a0
|
Merge branch 'master' into nvmrc
|
2018-06-04 13:44:39 -06:00 |
|
|
Cristian Dean
|
6c73e5b818
|
Add scraper proxy support (#1674)
* Add scraper proxy support
* review: doc updates
|
2018-06-04 13:43:00 -06:00 |
|
|
Wyatt Johnson
|
3ac392e358
|
locked node version at 8 via nvmrc
|
2018-06-04 13:32:40 -06:00 |
|
|
Kim Gardner
|
18d58e4ea8
|
Remove pell from plugin directory (#1675)
* Remove pell from plugin directory
* review: removed pell refernce
|
2018-06-04 12:58:26 -06:00 |
|
|
okbel
|
2d343029a1
|
updated - getUserStatusArray
|
2018-06-04 15:25:30 -03:00 |
|
|
Kim Gardner
|
56d9fee486
|
Merge pull request #1673 from conversario/markdown-asset-closed-message-master
Use Markdown for the "asset is closed" message.
|
2018-06-04 17:31:51 +01:00 |
|
|
Kim Gardner
|
cf98232109
|
Merge branch 'master' into markdown-asset-closed-message-master
|
2018-06-04 15:54:13 +01:00 |
|
|
Kim Gardner
|
01c19a9995
|
Merge pull request #1672 from coralproject/human-karma
Humanized Karma
|
2018-06-04 15:42:13 +01:00 |
|
|
Chi Vinh Le
|
f142150b3e
|
Fix unexpected error
|
2018-06-04 16:04:37 +02:00 |
|
|
Chi Vinh Le
|
b783ee8c0b
|
Ignore already exists error
|
2018-06-04 15:45:31 +02:00 |
|
|
Fabian Neumann
|
2f4dfa080b
|
Use Markdown for the "asset is closed" message.
|
2018-06-04 15:25:20 +02:00 |
|
|
Wyatt Johnson
|
54b0ce27fb
|
Merge branch 'master' into human-karma
|
2018-06-01 15:19:31 -06:00 |
|
|
Kim Gardner
|
0e8d410c98
|
Merge branch 'master' into reject-username
|
2018-06-01 22:19:18 +01:00 |
|
|
Wyatt Johnson
|
d3158f5c7e
|
GraphiQL Fixes (#1671)
* bug: fixed graphiql style, upgraded
|
2018-06-01 15:14:49 -06:00 |
|
|
Wyatt Johnson
|
f580608a31
|
feat: humanize karma number
|
2018-06-01 15:13:58 -06:00 |
|
|
Kim Gardner
|
fefd4d281a
|
Merge branch 'master' into reject-username
|
2018-06-01 17:11:56 +01:00 |
|
|
okbel
|
ed539d2ee1
|
Merge branch 'reject-username' of github.com:coralproject/talk into reject-username
* 'reject-username' of github.com:coralproject/talk:
Small tweaks
Small typo
resolved custom css loading issue
Update copy
Update copy
Translation Fixes
Fix DropDown display bug
Fixed double encoding
fix to target handler
Added missing translation pt_BR
remove unused method
|
2018-06-01 12:34:50 -03:00 |
|
|
okbel
|
25852d68bd
|
updated styles
|
2018-06-01 12:06:53 -03:00 |
|
|
Wyatt Johnson
|
795389c0c8
|
Merge pull request #1528 from cristiandean/master
Check if token is in localStorage before logout
|
2018-05-31 15:03:17 -06:00 |
|
|
Wyatt Johnson
|
66f2d41033
|
always call the rest logout command, don't vomit on the error
|
2018-05-31 14:56:18 -06:00 |
|
|
Wyatt Johnson
|
01a0d0d587
|
Merge branch 'master' into master
|
2018-05-31 14:12:00 -06:00 |
|
|
Belén Curcio
|
7262a9ab50
|
Merge branch 'master' into reject-username
|
2018-05-31 16:25:53 -03:00 |
|
|
Wyatt Johnson
|
189d27c13f
|
Merge pull request #1668 from coralproject/translations
Translation Fixes
|
2018-05-31 13:00:33 -06:00 |
|
|
Kim Gardner
|
eb7f2abd97
|
Small tweaks
|
2018-05-31 14:37:53 -04:00 |
|
|
Wyatt Johnson
|
250a8ec2f1
|
Merge branch 'master' into translations
|
2018-05-31 12:26:26 -06:00 |
|
|
Wyatt Johnson
|
375ef09d78
|
Merge pull request #1670 from coralproject/templates
Custom CSS Fix
v4.4.3
|
2018-05-31 11:50:41 -06:00 |
|
|
Kim Gardner
|
135f0e300f
|
Small typo
|
2018-05-31 13:33:34 -04:00 |
|
|
Wyatt Johnson
|
9d752685cd
|
resolved custom css loading issue
|
2018-05-31 11:27:02 -06:00 |
|
|
Kim Gardner
|
c5a6f8a0b3
|
Merge branch 'master' into reject-username
|
2018-05-31 11:23:21 -04:00 |
|
|
Kim Gardner
|
b7768ccaf6
|
Update copy
|
2018-05-31 11:07:12 -04:00 |
|
|
Kim Gardner
|
e68d5c8a14
|
Update copy
|
2018-05-31 11:03:17 -04:00 |
|
|
Kim Gardner
|
a638dafd85
|
Merge pull request #1667 from coralproject/fix-dropdown-display
Fix DropDown display bug
v4.4.2
|
2018-05-30 16:58:10 -04:00 |
|
|
Kim Gardner
|
93436a2eb5
|
Merge branch 'master' into fix-dropdown-display
|
2018-05-30 16:49:47 -04:00 |
|
|
Kim Gardner
|
a16233484c
|
Merge pull request #1666 from coralproject/auth
Fixed double encoding
|
2018-05-30 16:45:57 -04:00 |
|
|
Wyatt Johnson
|
f7899bc670
|
Translation Fixes
- Removed duplicated translations
- Fixed redundant text
|
2018-05-30 14:41:55 -06:00 |
|
|
Chi Vinh Le
|
c98830aa63
|
Fix DropDown display bug
|
2018-05-30 22:23:52 +02:00 |
|
|
Wyatt Johnson
|
c24251e8f2
|
Fixed double encoding
|
2018-05-30 14:22:13 -06:00 |
|
|
Wyatt Johnson
|
5f74c827f5
|
Merge branch 'master' into reject-username
|
2018-05-30 10:15:35 -06:00 |
|
|
Wyatt Johnson
|
9ed991936e
|
Merge pull request #1664 from conversario/ban-user-message
remove unused method
|
2018-05-30 10:08:20 -06:00 |
|