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
8,775 Commits 10 Branches 125 Tags
4fcdec92d8e68b60efa047b50cdc4ec8fe1ee2ce
Commit Graph
8775 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Belen Curcio 67aeb223d6 Login tests 2016-12-18 13:07:16 -03:00
Belen Curcio 428a62ffd4 tests 2016-12-18 11:31:27 -03:00
Belen Curcio 27ffb05454 Creating the test users before de e2e 2016-12-17 11:22:01 -03:00
Belen Curcio f32f300345 Nightwatch config 2016-12-17 10:53:42 -03:00
Belen Curcio 927a3fcd83 Updating package.json and nightwatch package 2016-12-17 10:50:47 -03:00
Belen Curcio 72d36713e9 Merge branch 'master' of github.com:coralproject/talk into e2e-tests 2016-12-17 10:48:37 -03:00
Belen Curcio 0548b5faf1 Adding Actions 2016-12-17 10:48:26 -03:00
Belen Curcio d36a471780 Updating package.json and nightwatch package 2016-12-17 10:45:53 -03:00
Belen Curcio 8eea656b96 Updated Nightwatch conf with Integration Enviroment 2016-12-17 10:45:24 -03:00
Belen Curcio e5620fb718 eslint update 2016-12-17 10:44:59 -03:00
gaba 4172066c94 Silly commit. 2016-12-16 19:44:01 -08:00
Kim GardnerandGitHub 2324ae2d20 Merge pull request #187 from coralproject/issue-186 
It needed to have the Moderation Modal inside a tab container too.
 2016-12-16 21:27:55 -05:00
gaba dd032521c0 Merge branch 'master' into csrf 2016-12-16 17:55:49 -08: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 d707110e17 Merge pull request #183 from coralproject/fix-config-warnings 
fix some config warnings
 2016-12-16 17:48:23 -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
Gabriela Rodríguez BerónandGitHub c824591c3b Merge pull request #185 from coralproject/linting 
Added comments to linter
 2016-12-16 17:43:51 -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 JohnsonandGitHub d9a595ff3d Merge branch 'master' into suspect-wordlist 2016-12-16 17:07:56 -07:00
Wyatt Johnson dc966afe8e adjusted query style 2016-12-16 17:06:56 -07:00
gaba d8d30e512b Only on POST check for CSRF. 2016-12-16 16:02:45 -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
David Jay c34bf5036e Updating page count. 2016-12-16 17:20:31 -05:00
Riley Davis 13994686e4 fix some config warnings 2016-12-16 15:20:02 -07:00
David Jay 0d2d6b52a5 Adding pagination. 2016-12-16 17:07:59 -05:00
Kim GardnerandGitHub f6a794f886 Merge pull request #181 from coralproject/fix-closed-at 
Fixed closing at
 2016-12-16 16:42:25 -05:00
Dan Zajdband ad084847e5 Lint 2016-12-16 16:35:39 -05:00
David Jay 979b54166b Updating search with delay. 2016-12-16 16:24:32 -05:00
Dan Zajdband 6ddece4717 Fixed closing at 2016-12-16 16:16:48 -05:00
Riley Davis bcfff516cc Merged branch master into suspect-wordlist 2016-12-16 13:57:34 -07:00
David Jay d4880ff183 Adding asset sorting to endpoint. 2016-12-16 15:35:15 -05:00
Kim GardnerandGitHub 0f36f1a5c4 Merge pull request #179 from coralproject/my-comments-designs 
my comments design tweaks
 2016-12-16 15:13:11 -05:00
Riley DavisandGitHub 5d96ff9d63 Merge branch 'master' into my-comments-designs 2016-12-16 12:29:38 -07:00
Riley Davis 0aa7a216be update tests 2016-12-16 12:29:27 -07:00
Riley Davis 647d62969d design tweaks per kim 2016-12-16 12:24:32 -07:00
Dan ZajdbandandGitHub decdfad39b Adding show shortcuts button and minor fixes (#177) 
* Adding show shortcuts button and minor fixes

* Lint

* Unwrapping the showComments method
 2016-12-16 12:32:09 -05:00
Dan Zajdband 9e9291ba64 Lint 2016-12-16 12:07:54 -05:00
Dan Zajdband 8631c3bd9b Adding show shortcuts button and minor fixes 2016-12-16 12:03:37 -05:00
riley 27116b84ce Merged master into suspect-wordlist 2016-12-15 16:12:19 -07:00
gaba b75408b067 Merge branch 'master' into csrf 2016-12-15 15:11:30 -08:00
Gabriela Rodríguez BerónandGitHub d6936cdf25 Merge pull request #172 from coralproject/login-fix 
The current user can see their own roles.
 2016-12-15 15:10:55 -08:00
gaba 670567b8b3 One more expect in the test. 2016-12-15 15:08:01 -08:00
Gabriela Rodríguez BerónandGitHub 1d652442d0 Merge branch 'master' into login-fix 2016-12-15 15:07:37 -08:00
gaba eb98a41bd5 Merge branch 'master' into csrf 2016-12-15 15:04:36 -08:00
Riley DavisandGitHub 4b746c1c32 Merge pull request #176 from coralproject/add-tests-for-comment-endpoint 
add tests for comment stream for non-admins
 2016-12-15 16:02:42 -07:00