Commit Graph

75 Commits

Author SHA1 Message Date
riley fa8036ac3f merge master 2016-11-16 11:58:01 -07:00
Riley Davis 7df7279323 endpoints for updating password 2016-11-16 11:49:58 -07:00
Riley Davis c86e1e8d47 create and decode jwt 2016-11-15 16:21:25 -07:00
gaba 4137758bfd Merge branch 'master' into comment-box 2016-11-15 15:21:08 -08:00
riley e5898118e1 Merged master into password-reset 2016-11-15 13:11:02 -07:00
David Jay a886123c62 Merge branch 'like-button' of https://github.com/coralproject/talk into like-button 2016-11-15 14:39:58 -05:00
Riley Davis eabce87f99 Merged branch master into password-reset 2016-11-15 12:34:43 -07:00
David Jay fbf27a9d75 Resolving 500 error when deleting an action. 2016-11-15 14:24:38 -05:00
Riley Davis 7ecd60fbf7 Merge branch 'master' into like-button 2016-11-15 12:15:13 -07:00
gaba 08d672ed46 Changes model and add admin. 2016-11-15 10:11:37 -08:00
Belen Curcio 366e072280 Linting Issues 2016-11-14 23:35:33 -03:00
Dan Zajdband 9c41adf224 Added enum check for the user model 2016-11-14 16:44:21 -05:00
David Jay 6fa40c3f9b Adding model tests for assets. 2016-11-14 15:11:25 -05:00
Riley Davis 7d9b24c5b9 start adding mail settings 2016-11-14 10:44:33 -07:00
David Jay 4bea5e5914 Adding route to delete actions. 2016-11-11 17:06:29 -05:00
Belén Curcio 5b74beabd6 Community Section - Search Commenters (#60)
* Table

* úsers api

* Ádding envs and version

* Community Table Added

* Ádding redux

* Adding loading data state

* Community Actions

* Adding Inmutable

* Fetching commenters

* Search commenters

* Linting and translations

* Ádding Sort

* sortBuilder

* pagr

* request per page, pager and mor

* package.json

* new Page actiokn

* éslint

* Changes and cleaner comps

* removed console.log
2016-11-11 11:14:26 -05:00
gaba ce2b21b805 Merge branch 'master' into lint-newlines 2016-11-10 15:09:49 -08:00
David Erwin 95f3b86f3b cleaning up nested objects 2016-11-10 15:24:34 -05:00
David Erwin f7249c4016 More linting and commenting 2016-11-10 15:12:56 -05:00
Riley Davis c698ae78a7 initialize settings in an init file before app accepts requests 2016-11-10 13:02:52 -07:00
David Erwin d9dc198d46 Moved chained funcitons to multiple lines 2016-11-10 14:52:05 -05:00
David Erwin e632632754 Merging and updating tests 2016-11-10 12:16:58 -05:00
David Erwin 822f586888 Merge master and lint 2016-11-10 11:37:14 -05:00
David Erwin b6a0a99d91 Update method name for clarity 2016-11-10 10:12:47 -05:00
David Jay b50c22a414 Merge branch 'master' of https://github.com/coralproject/talk into reader-flags 2016-11-09 22:44:12 -05:00
David Jay 6ef0d3ef41 Posting flags correctly and displaying flags when clicked. 2016-11-09 18:30:01 -05:00
Wyatt Johnson 42a7eee1a2 Merge branch 'master' into auth 2016-11-09 16:28:39 -07:00
Wyatt Johnson c203bf16eb Improved tests and fixed them for new users model 2016-11-09 16:26:23 -07:00
gaba eae2a0285b More tests and move settings stuff to routes and out of models. 2016-11-09 12:35:59 -08:00
Wyatt Johnson 0646645686 Added new cli interface + users model 2016-11-09 12:51:32 -07:00
gaba 9ff2613ab4 Comment stream with new and approved when post-moderated. 2016-11-09 11:40:57 -08:00
David Jay 07db6b3f9c Merge branch 'master' of https://github.com/coralproject/talk into reader-flags 2016-11-09 13:22:45 -05:00
gaba ab68b81f21 Add tests to stream on moderated comments. 2016-11-09 09:33:15 -08:00
gaba b19f936e64 Adds tests 2016-11-08 15:59:35 -08:00
gaba 0968b02c3a Moderation queue depending on moderation settings. 2016-11-08 15:26:05 -08:00
David Jay e8584b499b Returning actions, items, and comments as seperate arrays. 2016-11-08 15:32:52 -05:00
David Jay eb00e63a41 Adding action summaries function to actions model. 2016-11-08 15:21:52 -05:00
gaba c8c82fd03b Move all DB functions into models. Clean up tests. 2016-11-07 18:10:17 -08:00
David Jay c8bdecbd1b Merge branch 'master' of https://github.com/coralproject/talk into post-comment 2016-11-07 16:29:06 -05:00
David Jay 0e1e04d2a9 Returning usernames. 2016-11-07 16:19:20 -05:00
gaba 03e5242dcf Merge branch 'master' into comment-api-implementation 2016-11-07 12:22:31 -08:00
gaba 6f0698b950 More endpoints 2016-11-07 11:27:05 -08:00
Wyatt Johnson 4a9c1775f1 Updated linting rules + fixed test layout to standardize 2016-11-07 11:51:45 -07:00
David Erwin d3213dd33e More review updates 2016-11-07 13:18:46 -05:00
David Erwin c84fc24f78 Update based on review 2016-11-07 13:07:25 -05:00
gaba cffee1ec18 Merge branch 'master' of github.com:coralproject/talk into comment-api-implementation 2016-11-07 09:18:51 -08:00
David Erwin 2ff6bcf85d Merging master into asset 2016-11-07 12:00:28 -05:00
David Erwin c1359a9af9 Move url route into general asset search 2016-11-05 14:44:42 -04:00
David Erwin 712841679d Linting and clarifying tests 2016-11-05 11:18:18 -04:00
David Erwin a6b2215a4b Implement asset tests 2016-11-05 11:14:21 -04:00