wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-07-01 17:11:59 +08:00
Code Issues Packages Projects Releases Wiki Activity
1,040 Commits 10 Branches 125 Tags
61795fa110fa66f424bb2d832404846bc2abd2ce
Commit Graph

471 Commits

Author SHA1 Message Date
Riley Davis 52771fc82c pluralize asset endpoints 2016-12-13 12:45:58 -07:00
David Jay 72226f6fe8 Merge branch 'master' into asset-status 2016-12-13 14:00:58 -05:00
gaba 387e20309a We already have the default for closedMessage to be null in the model. Removing the passing of a blank closedMEssage. 2016-12-13 10:42:30 -08:00
gaba 020452684f Merge branch 'master' into asset-status 2016-12-13 10:10:21 -08:00
David Jay 5cb1a15273 Merge branch 'master' into use-js-while-rendering 2016-12-13 13:06:47 -05:00
Gabriela Rodríguez Berón b895dbc8cd Update translations.json 2016-12-12 22:38:53 -08:00
gaba 270e6ba70c Merge branch 'master' into asset-status 2016-12-12 22:20:45 -08:00
gaba 9043ae9f20 We are using asset and not article. 2016-12-12 22:19:09 -08:00
gaba 475c84dfbc Fix date comparision and change article for asset. 2016-12-12 22:18:11 -08:00
David Jay 24cc86b130 Merge branch 'master' into use-js-while-rendering 2016-12-12 20:36:10 -05:00
David Jay e88e8212f4 Updating translations. 2016-12-12 20:33:55 -05:00
David Jay ff62c9c14d Merge branch 'master' of github.com:coralproject/talk into set-char-count 2016-12-12 20:30:32 -05:00
David Jay 426e0a02bd Raising error if no count is entered. 2016-12-12 19:12:53 -05:00
David Jay bd240923cc Updating default charcount setting. 2016-12-12 19:10:54 -05:00
David Jay cd63f49a5e Disabling save button on error and updating translations. 2016-12-12 19:08:35 -05:00
gaba 0648b2b1c8 More tests. 2016-12-12 15:38:28 -08:00
David Jay ba8a845741 Making character input field green to match designs. 2016-12-12 18:14:03 -05:00
David Jay 4a4b92299c Adding error message. 2016-12-12 18:10:47 -05:00
David Jay 48b1f7fc2b Moving text to translations file. 2016-12-12 17:45:20 -05:00
David Jay 182c504edb Updating settings box style. 2016-12-12 17:35:33 -05:00
David Jay f58ede45d9 Merge branch 'master' into wordlist 2016-12-12 17:20:33 -05:00
David Jay 39479fd9ad Add character count field. 2016-12-12 17:07:43 -05:00
gaba 83a7ffee6f Merge branch 'master' into asset-status 2016-12-12 13:03:58 -08:00
gaba 3b131ce315 Removes status field for Asset. Now closedAt and closedMessage are in the settings field. 2016-12-12 13:02:39 -08:00
Wyatt Johnson f7b4aed620 Merge branch 'master' into wordlist 2016-12-12 15:58:40 -05:00
David Jay 409c9c3eb5 Merge branch 'master' into fix-signup-bug 2016-12-12 15:56:26 -05:00
David Jay cb576dca8f Updating signup endpoint to reflect current api. 2016-12-12 15:52:34 -05:00
David Jay 7b113c1931 Merge branch 'master' of github.com:coralproject/talk into wordlist 2016-12-12 13:37:43 -05:00
Riley Davis 749a5d9853 Merge branch 'master' into use-js-while-rendering 2016-12-12 07:34:36 -10:00
Belén Curcio 55df0f3036 Merge branch 'master' into configure-bug 2016-12-12 14:08:32 -03:00
Belen Curcio 42ff3ae4a2 filter restricted tabs 2016-12-11 23:10:25 -03:00
Belen Curcio a872128a55 logOut Stae 2016-12-11 22:52:47 -03:00
Riley Davis c18f885277 Merge branch 'master' into use-js-while-rendering 2016-12-09 15:06:51 -10:00
Riley Davis 9e353eaae8 Merge branch 'master' into simplify-community-page 2016-12-09 15:06:43 -10:00
Riley Davis 84453ef7bd Merge branch 'master' into use-js-while-rendering 2016-12-09 14:53:56 -10:00
Riley Davis 0f7e4bd239 simplify Community page 2016-12-09 14:52:17 -10:00
Riley Davis 7bfd9e2e71 remove lodash implementation 2016-12-09 14:48:29 -10:00
Riley Davis 74c4d812cd less changes 2016-12-09 14:39:16 -10:00
Riley Davis 7186c2b060 have moderation queue use proper mapStateToProps 2016-12-09 14:38:29 -10:00
David Jay faca09dbd2 Merge branch 'master' of github.com:coralproject/talk into update-users-api 2016-12-09 19:35:09 -05:00
David Jay d229d5a96f Updating route to davidjay. 2016-12-09 19:28:19 -05:00
Gabriela Rodríguez Berón 02015bc5c3 Merge branch 'master' into flag-bio 2016-12-09 14:26:28 -10:00
Riley Davis b05f4cfb16 remove logs 2016-12-09 14:25:24 -10:00
Riley Davis 7732aa4abe typo 2016-12-09 14:20:46 -10:00
gaba ffc2d0c86a Spanish translations. 2016-12-09 14:16:27 -10:00
Riley Davis a80dd953c8 update ModerationQueue and CommentStream to not use immutable.js deep in the stack 2016-12-09 14:13:48 -10:00
Kim Gardner 5279ad3305 Typo 2016-12-09 13:01:54 -10:00
David Jay 787486bccf Posting bio flags to backend. 2016-12-09 17:46:45 -05:00
David Jay 9375d8b47d Merge branch 'flag-username' into flag-bio 2016-12-09 16:46:56 -05:00
Riley Davis 1c2ef760ef remove cruft by pulling out some immutable.js stuff 2016-12-09 11:46:04 -10:00