wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-07-15 11:26:58 +08:00
Code Issues Packages Projects Releases Wiki Activity
1,237 Commits 10 Branches 125 Tags
168248f9752f796f4cb7d04547ea9e7016f75433
Commit Graph
580 Commits
Author SHA1 Message Date
Belen Curcio 168248f975 Presentational and Container Components added 2016-12-23 16:09:46 -03:00
Riley DavisandGitHub 6cca99e75e Merge branch 'master' into map-dispatch-mod-queue 2016-12-22 12:25:51 -07:00
Riley DavisandGitHub e37696e64f Merge branch 'master' into docs-add-reactions 2016-12-22 12:17:49 -07:00
David Jay 5e01fe4025 Fixing bug in text box display. 2016-12-22 11:01:59 -08:00
Riley DavisandGitHub 7c999e2cc8 Merge branch 'master' into add-flag-option 2016-12-22 11:20:05 -07:00
Riley DavisandGitHub b723d72254 Merge branch 'master' into font-size-docs 2016-12-22 10:40:30 -07:00
Riley DavisandGitHub c6170f558a Merge branch 'master' into add-flag-option 2016-12-22 10:38:34 -07:00
David Jay fdf5da56cf Merge branch 'admin-asset-list' of github.com:coralproject/talk into admin-asset-list 2016-12-21 18:11:51 -08:00
David Jay 0fc3e09c74 Removing unused log statement and combining setState functions. 2016-12-21 18:08:57 -08:00
Riley Davis b8b47e9c2c normalize constant names 2016-12-21 16:56:29 -07:00
Riley Davis 7fc3dffc77 reload assets after updating state 2016-12-21 16:49:53 -07:00
Riley Davis 7cbd06834f set defaults on fetchAssets 2016-12-21 16:39:29 -07:00
David Jay c867ae8eeb Removing Next and Prev from pager and updating tests. 2016-12-21 12:11:42 -08:00
David Jay cfed42be2c Correcting bug in fetchAssets. 2016-12-21 12:05:25 -08:00
David Jay 29fa26260c Handling undefined values in fetchAssets call. 2016-12-21 11:39:21 -08:00
Riley Davis 50112d3166 create mapStateToProps 2016-12-21 12:22:54 -07:00
David Jay a490aaeaf0 Merge branch 'master' of github.com:coralproject/talk into admin-asset-list 2016-12-20 17:02:24 -08:00
David Jay 0235d26295 Correcting accidentally moved pager files. 2016-12-20 16:34:27 -08:00
David Jay 7faa3eeecf Merge branch 'master' of github.com:coralproject/talk into add-flag-option 2016-12-20 16:23:39 -08:00
David JayandGitHub c85daa2ece Merge branch 'master' into docs-add-reactions 2016-12-20 13:53:49 -08:00
David Jay c4510c1abf Updating action documentation. 2016-12-20 13:43:38 -08:00
Riley Davis 7351aecade update user constants 2016-12-20 13:48:00 -07:00
Riley Davis 55c5f6d5be use spread operator. update action constants 2016-12-20 13:25:21 -07:00
Riley Davis 96141d8abc remove status from new comment 2016-12-20 13:23:36 -07:00
David Jay d7829232a3 Making font sizes relative. 2016-12-20 12:00:56 -08:00
Riley Davis 7a1c3e730b fix lint 2016-12-20 12:56:44 -07:00
Riley Davis 96ed008b96 remove some more string literals 2016-12-20 12:50:12 -07:00
Riley Davis 0a19a284ab simplify banUser dialog action creators 2016-12-20 12:47:23 -07:00
Riley Davis 268f6616a5 update the status correctly 2016-12-20 12:45:30 -07:00
Riley Davis 11d8b2cd91 update a comment's status 2016-12-20 12:39:57 -07:00
David Jay a3eb4f5c76 Merge branch 'add-flag-option' of github.com:coralproject/talk into add-flag-option 2016-12-20 11:31:57 -08:00
David JayandGitHub 889f29739c Merge branch 'master' into add-flag-option 2016-12-20 11:22:38 -08:00
Riley Davis b4b3420549 remove banUser and create fetchModerationQueueComments actions 2016-12-20 12:21:10 -07:00
David Jay be3d506459 Moving action metadata to nested object. 2016-12-19 20:10:42 -05:00
David Jay 4d508f6afa Merge branch 'master' of github.com:coralproject/talk into admin-asset-list 2016-12-19 13:41:43 -05:00
David JayandGitHub 3b17ae5313 Merge branch 'master' into add-flag-option 2016-12-19 12:37:24 -05:00
Belen Curcio 2d9ee1d9d7 Moderaion Queue updated to master 2016-12-19 13:34:42 -03:00
Belen Curcio 9950595245 Commenter likes a comment 2016-12-18 19:34:41 -03:00
Belen Curcio f52a1668b0 Test logouts and approves after commenting 2016-12-18 19:07:31 -03:00
Belen Curcio 428a62ffd4 tests 2016-12-18 11:31:27 -03:00
Belen Curcio 927a3fcd83 Updating package.json and nightwatch package 2016-12-17 10:50:47 -03:00
gaba ee6c4bb831 Merge branch 'master' into issue-186 2016-12-16 17:55:21 -08:00
Gabriela Rodríguez BerónandGitHub fcb3eeca9e Merge branch 'master' into add-flag-option 2016-12-16 17:53:22 -08:00
Gabriela Rodríguez BerónandGitHub 4f0c0d2e42 Merge branch 'master' into fix-config-warnings 2016-12-16 17:44:21 -08:00
Gabriela Rodríguez BerónandGitHub 0e0aafeb1c Merge branch 'master' into add-flag-option 2016-12-16 17:44:03 -08:00
gaba 3266934fc8 It needed to have the Moderation Modal inside a tab container too. 2016-12-16 17:39:22 -08:00
Wyatt Johnson 7f12741c13 added comments to linter 2016-12-16 16:46:15 -07:00
David Jay 5973560043 Updating translation. 2016-12-16 18:20:31 -05:00
David Jay 871836f636 Adding description field to flags. 2016-12-16 18:19:05 -05:00
David Jay 8f1a6a777c Merge branch 'master' of github.com:coralproject/talk into admin-asset-list 2016-12-16 17:22:32 -05:00