Kim Gardner
|
60b4909395
|
Merge pull request #732 from coralproject/update-lockfile
Update yarn.lock
v2.2.0
|
2017-06-30 17:53:57 +01:00 |
|
Kim Gardner
|
0973600e68
|
Update yarn.lock
|
2017-06-30 17:45:45 +01:00 |
|
Kim Gardner
|
e3ead31964
|
Merge pull request #731 from coralproject/button-states
Support post, reply, edit, load and view more loading states via global css classnames
|
2017-06-30 17:32:47 +01:00 |
|
Chi Vinh Le
|
7858ccc45d
|
Switch to prop-types
|
2017-06-30 23:25:11 +07:00 |
|
Chi Vinh Le
|
c1807daeaf
|
Correct spanish translation key
|
2017-06-30 21:10:19 +07:00 |
|
Chi Vinh Le
|
e244d4a286
|
Merge branch 'master' into button-states
Conflicts:
client/coral-embed-stream/src/components/Stream.js
|
2017-06-30 17:46:17 +07:00 |
|
Chi Vinh Le
|
9de99a9ef4
|
Support post, reply, edit, load and view more loading states via global css classnames
|
2017-06-30 17:00:42 +07:00 |
|
Belén Curcio
|
01883851ea
|
Merge pull request #729 from coralproject/permalink-id
Permalink by Query Param instead of Hash
|
2017-06-29 14:05:07 -03:00 |
|
Belen Curcio
|
c8d9447033
|
Adding the polifill to the package.json
|
2017-06-29 13:44:40 -03:00 |
|
Belen Curcio
|
9f8c8e9c83
|
Merge branch 'permalink-id' of github.com:coralproject/talk into permalink-id
|
2017-06-29 13:30:49 -03:00 |
|
Kim Gardner
|
997dffd326
|
Merge branch 'master' into permalink-id
|
2017-06-29 17:30:38 +01:00 |
|
Kim Gardner
|
f6d652df0d
|
Merge pull request #730 from coralproject/fix-build
Update dependencies to fix build
|
2017-06-29 17:30:20 +01:00 |
|
Belen Curcio
|
c3ee442775
|
Replacing moderation comment and history hashes
|
2017-06-29 13:30:12 -03:00 |
|
Belen Curcio
|
bad869bdfe
|
Merge branch 'permalink-id' of github.com:coralproject/talk into permalink-id
|
2017-06-29 13:27:08 -03:00 |
|
Belen Curcio
|
2289c405d1
|
Translatios
|
2017-06-29 13:25:50 -03:00 |
|
Belen Curcio
|
354295c0ae
|
Adding polyfill
|
2017-06-29 13:20:27 -03:00 |
|
Kim Gardner
|
737cea6e76
|
Reinstall modules
|
2017-06-29 16:59:00 +01:00 |
|
Kim Gardner
|
867f6966ba
|
Update dependencies to fix build
|
2017-06-29 16:52:01 +01:00 |
|
Belén Curcio
|
fbefd7fd20
|
Merge branch 'master' into permalink-id
|
2017-06-29 12:35:06 -03:00 |
|
Kim Gardner
|
a0a7971866
|
Merge pull request #725 from StephanieDClark/add-tab-classes
Updates to tab classes
|
2017-06-29 16:22:52 +01:00 |
|
Kim Gardner
|
16355169ce
|
Merge branch 'master' into add-tab-classes
|
2017-06-29 16:16:24 +01:00 |
|
Kim Gardner
|
a7f4dea74a
|
Merge branch 'master' into permalink-id
|
2017-06-29 15:58:23 +01:00 |
|
Kim Gardner
|
8aa0c16769
|
Merge pull request #728 from coralproject/bump-version-2-2-0
Bump version to 2.2.0
|
2017-06-29 15:57:20 +01:00 |
|
Belen Curcio
|
d31044f39e
|
linting
|
2017-06-29 11:25:52 -03:00 |
|
Belén Curcio
|
a804973990
|
Merge branch 'master' into permalink-id
|
2017-06-29 11:22:28 -03:00 |
|
Belen Curcio
|
db9c3b45c1
|
Stream Error
|
2017-06-29 11:06:52 -03:00 |
|
Belen Curcio
|
ddac5c2c85
|
Avoid Error due to invalid queries
|
2017-06-29 10:48:29 -03:00 |
|
Belen Curcio
|
0312530b86
|
Modifying permalink plugin
|
2017-06-29 10:20:33 -03:00 |
|
Belen Curcio
|
87f8ed401f
|
Using CommentId by queryParam
|
2017-06-29 10:18:40 -03:00 |
|
Kim Gardner
|
06ebd9ccc5
|
Bump version to 2.2.0
|
2017-06-29 12:15:00 +01:00 |
|
Kim Gardner
|
e615624b62
|
Merge branch 'master' into add-tab-classes
|
2017-06-29 11:06:33 +01:00 |
|
Kim Gardner
|
9803ccfaf5
|
Merge pull request #724 from coralproject/permalink-patch
Permalink plugin now enabled by default
|
2017-06-29 10:35:11 +01:00 |
|
Wyatt Johnson
|
ab84436a78
|
Update plugins.default.json
|
2017-06-28 15:32:53 -06:00 |
|
StephanieDClark
|
ccaa744a78
|
Updates to tab classes
|
2017-06-28 14:26:41 -07:00 |
|
Kim Gardner
|
32318567c9
|
Merge pull request #723 from coralproject/dont-alias-username-2
Don't alias username 2
|
2017-06-28 15:22:55 +01:00 |
|
Kiwi
|
6cf8c01d61
|
Merge branch 'master' into dont-alias-username-2
|
2017-06-28 21:17:41 +07:00 |
|
Chi Vinh Le
|
b92afff4e7
|
Don't alias username 2
|
2017-06-28 21:14:34 +07:00 |
|
Kim Gardner
|
089ed0f09b
|
Merge pull request #722 from coralproject/edit-name-fix
Allow editing to the same username in the "create username" flow
|
2017-06-28 14:43:17 +01:00 |
|
Belén Curcio
|
2258125789
|
Merge branch 'master' into edit-name-fix
|
2017-06-28 10:22:31 -03:00 |
|
Belén Curcio
|
8de4b475a1
|
Merge pull request #721 from coralproject/smooth-scroll
Smooth Scroll on Moderation
|
2017-06-28 10:21:56 -03:00 |
|
Belen Curcio
|
4691ee07de
|
Merge branch 'smooth-scroll' of github.com:coralproject/talk into smooth-scroll
|
2017-06-28 09:07:19 -03:00 |
|
Belen Curcio
|
f767b6a998
|
Removing old
|
2017-06-28 09:06:46 -03:00 |
|
Kiwi
|
9b26b0a434
|
Merge branch 'master' into edit-name-fix
|
2017-06-28 18:56:34 +07:00 |
|
Kim Gardner
|
7817804bae
|
Merge branch 'master' into smooth-scroll
|
2017-06-28 12:51:43 +01:00 |
|
Kim Gardner
|
b2738afdbe
|
Merge pull request #718 from coralproject/no-username-alias
Don't alias username
|
2017-06-28 12:51:27 +01:00 |
|
Kim Gardner
|
e0a32e5a70
|
Merge branch 'master' into smooth-scroll
|
2017-06-28 12:27:40 +01:00 |
|
Kiwi
|
b7a981e84b
|
Merge branch 'master' into no-username-alias
|
2017-06-28 16:37:01 +07:00 |
|
Kiwi
|
52431a4c4c
|
Merge branch 'master' into edit-name-fix
|
2017-06-28 16:36:20 +07:00 |
|
Kim Gardner
|
ca0431054b
|
Merge pull request #720 from coralproject/flag-reason
BUG: Flag Username - Offensive, doesn't show up in the Community Admin
|
2017-06-28 10:33:52 +01:00 |
|
Kim Gardner
|
3f03994a51
|
Merge branch 'master' into flag-reason
|
2017-06-28 10:27:48 +01:00 |
|