Commit Graph

1350 Commits

Author SHA1 Message Date
David Jay d9147da8fc Making user action item_type 'users' for consistency. 2017-01-10 13:59:36 -05:00
Wyatt Johnson bf04034085 Merge pull request #213 from coralproject/issue-191
Banned users should not be able to report/flag anything from the Front End
2017-01-06 10:03:14 -07:00
Gabriela Rodríguez Berón 1e445efaec Merge branch 'master' into issue-191 2017-01-06 13:33:25 -03:00
Gabriela Rodríguez Berón 466cb289c3 Merge pull request #215 from coralproject/email-confirm
Email Confirmation and Fixes
2017-01-06 13:31:40 -03:00
Wyatt Johnson 4c5b85a2ae Fixed session bug 2017-01-05 19:02:06 -07:00
Wyatt Johnson 4eb7c72ae2 Merge branch 'master' into email-confirm 2017-01-05 18:45:06 -07:00
Wyatt Johnson cabe546ecf Added email send on new user if enabled for confirming 2017-01-05 17:19:38 -07:00
Wyatt Johnson be72ebf2a1 Added tests + model implementation. 2017-01-05 17:01:41 -07:00
gaba ac6fba2286 Clean user state on logout. Allow flagging only if not banned. 2017-01-05 15:34:27 -03:00
gaba ab825512b9 Adding missing translation. Not sure how to translate streams. 2017-01-04 16:46:19 -03:00
Riley Davis ce46b4dbe0 Merge pull request #212 from coralproject/add-csurf-and-cookie
Moves the packages to dependencies.
2017-01-04 13:32:37 -06:00
gaba 864b08135a Moves the packages to dependencies. 2017-01-04 16:24:17 -03:00
Gabriela Rodríguez Berón 7d5be04be3 Merge pull request #210 from coralproject/init-settings
fetch settings on mod queue load
2017-01-04 15:52:32 -03:00
Riley Davis 12f6bb1ffe fetch settings on mod queue load 2017-01-04 11:14:23 -07:00
Gabriela Rodríguez Berón 57f9fd8474 Merge pull request #204 from coralproject/csrf
CSRF
2017-01-04 14:32:12 -03:00
Wyatt Johnson 298e1e8d73 Updates to user cli + e2e + tests
- Updates to before + beforeEach for mongooose
- Removed reference to dotenv from cli in e2e, should use
  NODE_ENV=test instead.
- Changed test port from 30?? to 3000 to be consistent with what
  nightwatch was expecting
2017-01-04 10:16:51 -07:00
gaba 5f7d48a7f9 This was not needed. 2017-01-04 13:17:16 -03:00
gaba 3718efce1e Adds cookie parser 2017-01-04 12:47:19 -03:00
gaba ccb9fe3165 Adds DELETE and PUT. 2017-01-04 12:40:25 -03:00
gaba 7b9dbb5afd Review changes. 2017-01-04 12:24:01 -03:00
Gabriela Rodríguez Berón 2755cc61e4 Merge branch 'master' into csrf 2017-01-04 10:56:37 -03:00
Wyatt Johnson a7680ae5d9 Initial pass at email confirmation 2017-01-03 17:35:58 -07:00
gaba 0fd6f4b44e Working on the tests & sending CSRF 2017-01-03 18:01:21 -03:00
gaba e2a032d4a5 Merge branch 'master' into csrf 2017-01-03 16:25:05 -03:00
Riley Davis 7363fcc5dc Merge pull request #205 from coralproject/bug_203
Fixes Bug #203
2017-01-03 12:47:49 -06:00
Riley Davis d4dc381aca Merge branch 'master' into bug_203 2017-01-03 12:29:48 -06:00
Gabriela Rodríguez Berón 6e54ba7f4c Merge pull request #209 from coralproject/admin-not-loading
make the admin screen load
2017-01-03 15:29:17 -03:00
gaba 950340d5e7 Fix lint. 2017-01-03 15:18:39 -03:00
Gabriela Rodríguez Berón 43846651dd Merge branch 'master' into bug_203 2017-01-03 14:33:57 -03:00
Riley Davis a1def6f950 missing state for the wordlist. 2017-01-03 10:33:25 -07:00
Gabriela Rodríguez Berón b7380978f5 Merge pull request #206 from coralproject/open-source-docs
Open source docs
2017-01-03 12:47:06 -03:00
David Erwin 5e4564c7ea Merge branch 'master' into open-source-docs 2017-01-03 10:29:41 -05:00
Gabriela Rodríguez Berón f5374dc914 Merge pull request #207 from coralproject/fix-test
Fix test on Suspected words
2017-01-03 11:45:30 -03:00
Wyatt Johnson 0dde122e9b Merge branch 'master' into fix-test 2017-01-03 07:41:44 -07:00
Gabriela Rodríguez Berón fd2b01d5ed Merge pull request #208 from coralproject/fix/dialog-unmount
Check if dialog is present before removing listeners
2017-01-03 11:40:31 -03:00
Dan Zajdband 759e74a88d coral-admin: Fixed check for component unmount removing a listener when there is no object 2017-01-03 10:46:55 -03:00
gaba 5c6df6d481 Fix tests when flagging because suspect word. 2017-01-03 09:37:02 -03:00
gaba a02ad69568 Adds specific fields to the metadata in the action when flagging because suspect word. 2017-01-03 09:36:20 -03:00
gaba 111e83a1e6 Removes plugin csrf 2017-01-03 08:41:28 -03:00
gaba 036ed8ac78 Removes wrong csrf. 2017-01-03 08:41:28 -03:00
David Erwin f786daaec9 Merged branch open-source-docs into open-source-docs 2016-12-27 11:50:42 -05:00
David Erwin 9a608fd02e Spell stuff right and clean up 2016-12-27 11:50:34 -05:00
David Erwin 1ca6736146 Merge branch 'master' into open-source-docs 2016-12-27 11:46:54 -05:00
David Erwin 349f8003a7 Merge branch 'master' into csrf 2016-12-27 11:46:42 -05:00
David Erwin c86148c0f1 Add links to INSTALL.md 2016-12-27 11:39:54 -05:00
David Erwin b0e4b79a6a Merge pull request #197 from coralproject/addINSTALL
Adds a very simple INSTALL file for developers.
2016-12-27 11:33:58 -05:00
David Erwin da37bb32f1 Updating for style and completeness 2016-12-27 11:28:01 -05:00
David Erwin 0219f1916e Link contributing.md from readme.md 2016-12-27 10:59:08 -05:00
David Erwin ef40cf37fe Update contribution guide 2016-12-27 10:55:16 -05:00
gaba d35875145c Changes field for metadata. Needs to look at this test better. 2016-12-23 15:38:45 -08:00