Commit Graph

163 Commits (d55bedd01db470a3bc30b3a2deebe2c8bc35c3a7)

Author SHA1 Message Date
unknown d55bedd01d add sails-postgresql to packages.json 2019-02-04 16:32:38 -05:00
unknown 4d03946f52 update base url 2019-02-04 16:22:17 -05:00
Theodore Kluge 09e98d01ad
Merge pull request #37 from EbookFoundation/feature/push-books
Feature/push books and manage user
2019-02-04 16:15:49 -05:00
unknown 8a0c56644c add user settings page 2019-02-04 16:08:45 -05:00
unknown 0fcafdc711 fix color of user email 2019-02-04 14:44:39 -05:00
unknown 9eae9a0215 add request package and post to target urls 2019-02-04 14:43:18 -05:00
unknown 0ce58283af merge changes 2019-02-04 14:22:20 -05:00
Theodore Kluge 6945fb0ff8
Merge pull request #34 from EbookFoundation/feature/oauth2
add google and github oauth2 login support
2019-02-03 14:14:56 -05:00
unknown 553a2505e6 add google and github oauth2 login support 2019-01-31 16:52:18 -05:00
unknown 7a18f7bed8 add scripts for migrations 2018-11-28 10:59:24 -05:00
unknown af1dde188d missed the dependency 2018-11-19 19:29:29 -05:00
unknown fb05c20df6 missed the jsx parser for standard 2018-11-19 19:26:30 -05:00
unknown 8025aa45ff fix things I fixed before and that were overwritten 2018-11-19 19:22:41 -05:00
unknown 42489ad574 still broken 2018-11-19 19:12:11 -05:00
unknown 508f11b76a it also broke the package tasks 2018-11-19 19:08:15 -05:00
unknown f40c1c34b9 resolving merge conflicts removed this file for some reason 2018-11-19 19:01:54 -05:00
Theodore Kluge e8af8f156b
Merge branch 'master' into staging 2018-11-19 18:58:07 -05:00
Theodore Kluge 6d8273b795
Merge pull request #32 from EbookFoundation/feature/push-filters
feature/push filters
2018-11-19 18:45:08 -05:00
unknown 0ccc92e700 remove test values 2018-11-19 18:42:33 -05:00
unknown 5e468e71e0 update models and controller for filters 2018-11-19 18:37:40 -05:00
unknown 5a6454a047 db migration for filters 2018-11-19 18:37:28 -05:00
unknown 793e6db286 ui functional, filters all added 2018-11-19 18:28:15 -05:00
unknown 7a9900d8ae ui to allow editing uri filters 2018-11-19 18:13:06 -05:00
Theodore Kluge 8128287ff7
Merge pull request #31 from EbookFoundation/migrations
add database migrations
2018-11-19 15:44:05 -05:00
unknown f0b5b763d4 models match db column name 2018-11-19 15:34:13 -05:00
unknown 0109bfd3c0 alter tables with alterTable 2018-11-19 15:31:44 -05:00
unknown 098f8f6b11 knex requires columns be dropped before changing 2018-11-19 15:27:37 -05:00
unknown 49c2997cda migrate dates to bigint 2018-11-19 15:26:11 -05:00
unknown 42ccd90272 update migration 2018-11-19 15:21:41 -05:00
unknown 70a4c3ade2 change createdAt col to created_at 2018-11-19 15:12:22 -05:00
unknown c3a225c963 remove knexfile 2018-11-19 15:05:59 -05:00
unknown 9ddc8ff271 add knex migration to create pg tables 2018-11-19 14:57:48 -05:00
Theodore Kluge 666cbccea0
Merge pull request #30 from EbookFoundation/add-push-address-page
Add push address page
2018-11-15 18:37:50 -05:00
unknown 19ec5f7dd7 fix linting issues 2018-11-15 18:34:54 -05:00
unknown 397ceff833 push uri list now works 2018-11-15 18:28:11 -05:00
unknown 852b44701d correct controller issues and add datapush 2018-11-15 18:27:53 -05:00
unknown 6d36276c53 fetch and add new target urls 2018-11-15 00:00:06 -05:00
unknown 9fc72a50ae try to convert ajax response to json object 2018-11-14 23:59:50 -05:00
unknown f54e4c2c8a user model referenced by id 2018-11-14 23:59:28 -05:00
unknown 935058df28 add targetcontroller and model 2018-11-14 22:51:29 -05:00
Theodore Kluge 56db388a06
Merge pull request #29 from EbookFoundation/staging
merge staging into dev branch
2018-11-14 22:49:58 -05:00
Michael Iacona 0b124f3870
Merge pull request #28 from miacona96/master
Package fix
2018-11-13 18:24:32 -05:00
miacona96 eb863f570b Fixed package
Merged into master by accident..
2018-11-13 18:20:42 -05:00
miacona96 6896e449f7 Package 2018-11-13 17:53:10 -05:00
Michael Iacona e0154cc279
Merge pull request #4 from EbookFoundation/master
sync
2018-11-13 17:44:07 -05:00
Michael Iacona e4a068712d
Merge branch 'master' into master 2018-11-13 17:43:45 -05:00
miacona96 353398bd29 Lint for Mocha/ Chai 2018-11-13 17:33:52 -05:00
unknown a6e6a49fa1 use pm2 start correctly 2018-11-12 17:39:29 -05:00
Theodore Kluge e49bf0b70e
Merge pull request #27 from EbookFoundation/forever-to-pm2
switch forever over to use pm2 instead
2018-11-12 17:28:52 -05:00
unknown ffb14c992d switch forever over to use pm2 instead 2018-11-12 17:28:20 -05:00