Commit graph

185 commits

Author SHA1 Message Date
Samuel Clay
a1517b6266 Adding paypal sub id and paypalrestsdk library. Paypal has what it needs, now to hook up the API which is still unauthorized. 2022-02-08 12:49:40 -05:00
Samuel Clay
88d07b143c Merge branch 'master' into pro
* master: (31 commits)
  Adding postgres backup log.
  Handling operation failures in flask metrics.
  Locking consul to a working version. Also changing flask status code response to handle custom status codes.
  Explicitly uploading mongo backups
  Only need date once in filename
  Rotating mongo backups
  Using full path for progress.
  Showing full path of postgres backup.
  Separating out restoring backups and storing backups.
  Moving to postgres backup directory.
  Executable postgres backup script.
  Compressing Postgres db sql backup.
  Adding date to tarball to allow for versioning.
  Correcting permissions on mongo backup
  Fixing mongo upload to s3 by using host networking mode.
  Removing unused backup code.
  Forgot import
  Adding progress bar to mongo backup.
  Refactoring aws keys for mongo backups.
  Moving mongo backups
  ...
2022-02-04 13:55:38 -05:00
Samuel Clay
22feba4443 Moving to S3 compatible backup bucket name. 2022-02-02 16:35:48 -05:00
Samuel Clay
4df9858eb0 Adding /reader/river_stories_widget which downloads the first image in each story and adds it inline as base64 encoded. 2022-02-02 15:11:50 -05:00
Samuel Clay
7889fe4cf0 Fixing bookmarklet and saved story tags. 2022-01-28 17:05:23 -05:00
Samuel Clay
d7cdc47016 Adjusting to new Paypal API, although the subscription is not yet relayed through, but it's captured client-side. 2022-01-28 12:08:05 -05:00
Samuel Clay
02cb4cf2b4 Cleaning up docker compose 2022-01-26 13:35:06 -05:00
Samuel Clay
18aeafffa2 Cleaning up docker compose 2022-01-26 13:33:59 -05:00
Samuel Clay
07fe59cb57 Upgrading subscriptions with stripe now works, even pro-rated. Need to hook up Paypal and fix all billing inconsistencies. 2022-01-25 17:26:24 -05:00
Samuel Clay
39047ee938 Merge branch 'master' into pro
* master:
  Task deploy needs single sentry update.
  Turning off PuSH for standalone installs.
2022-01-25 15:46:25 -05:00
Samuel Clay
6a61620d32 Turning off PuSH for standalone installs. 2022-01-25 15:27:29 -05:00
Samuel Clay
e47eb575e5 Merge branch 'master' into pro
* master:
  Adding zebra logger.
  Using correct logger.
  Logging stripe webhooks.
  Adding Apple MerchantID for Apple Pay.
2022-01-24 16:38:09 -05:00
Samuel Clay
4e67deaa5c Adding zebra logger. 2022-01-24 16:31:16 -05:00
Samuel Clay
dc130ed3ec Adding Apple MerchantID for Apple Pay. 2022-01-21 16:44:03 -05:00
Samuel Clay
ee63184075 Restyling premium upgrade dialog. Needs stripe/paypal hookup and billing integration. 2022-01-21 12:55:12 -05:00
Samuel Clay
8164767a59 Merge branch 'master' into pro
* master:
  Cleaning up django collection pipeline.
  Upgrading jQuery and jQuery UI, fixing closure compiler language output to work in older browser.
  Fixing scope of webmanifest.
  Changing webmanifest scope.
  Adding Web App Manifest for PWA.
2022-01-20 16:56:51 -05:00
Samuel Clay
ced2e7d6a6 Upgrading jQuery and jQuery UI, fixing closure compiler language output to work in older browser. 2022-01-20 13:19:35 -05:00
Samuel Clay
81516fd93b Fixing scope of webmanifest. 2022-01-20 12:16:12 -05:00
Samuel Clay
e2ea1dc8d3 Changing webmanifest scope. 2022-01-20 11:48:07 -05:00
Samuel Clay
2554984717 Merge branch 'pipeline' into pro
* pipeline:
  Installing Java in deploy image to get closure compiler working. Also updating closure binary path.
  Ensuring dependencies met for deployment on local.
  Updating to docker buildx for multi-arch builds (amd64 + arm64)
2022-01-19 13:01:38 -05:00
Samuel Clay
fc8f3cb03e Installing Java in deploy image to get closure compiler working. Also updating closure binary path. 2022-01-19 13:01:31 -05:00
Samuel Clay
d0fdbde96b Ensuring dependencies met for deployment on local. 2022-01-19 10:48:11 -05:00
Samuel Clay
fdeca57412 Changing cutoff dates when fetching stories, fixing issues around Oldest first for both unreads and all stories. 2022-01-18 15:25:15 -05:00
Samuel Clay
0baaa951b9 Adding preference for changing days of unreads. Need to kick off a re-counter on preference change. 2022-01-18 12:40:49 -05:00
Samuel Clay
2792e7305a Syncing redis on premium upgrade to sync new unread date possibilities for archive users. 2022-01-13 16:56:30 -05:00
Samuel Clay
1dd921fa61 Adding DAYS_OF_UNREAD_ARCHIVE and updating all the upread_cutoff's I could find. Doesn't seem to work yet when marking an older story as unread, but there's probably a line somewhere that's preventing the unread from working. 2022-01-13 14:55:44 -05:00
Samuel Clay
3ef72e6f83 Fixing feed fetch status screen to better show how subs are being fetched. 2022-01-12 11:58:28 -05:00
Samuel Clay
f615fccdad Coutning archive and pro premiums correctly. 2022-01-11 15:56:19 -05:00
Samuel Clay
5414b4c414 Integrating admin without gziping, as that's causing issues. Ready to go. 2022-01-06 13:32:40 -05:00
Samuel Clay
a8d73f3685 Fixing static files so that at least newsblur is packaged correctly. Admin static is still not able to be processed. 2022-01-06 12:42:13 -05:00
Samuel Clay
ddeaf55be0 Cleaning up pipeline and adding admin static assets, but now certain admin static assets are being post-processed multiple times but with different cache manifests, resulting in a file not found error. This needs work. 2022-01-06 11:01:35 -05:00
Samuel Clay
76ffe7bb8a Fixing bookmarklet, moving endlne fleuron, adding load-line, archviing Jammit. 2022-01-05 11:18:31 -05:00
Samuel Clay
04c62b11c7 Cleaning up static assets. Needs to run on first make nb or DEBUG_ASSETS needs to always be set to True. 2022-01-04 15:54:37 -05:00
Samuel Clay
9432e9a5b8 Merge branch 'master' into pipeline
* master:
  Pruning docker, updating sentry release webhook only on local.
  Delete .github directory
  Adding Sentry release webhook to deployment of web, task, monitor, and node.
  Add Sentry action workflow for actions
  Moving from hosted Sentry to self-hosted sentry.
  Flask transactions are way too often.
  Cleanup
  Seems redundant with newsblur_web/docker_local_settings.py
  Using new repo password for postgres.
  Moving around postgres config
  Moving directories.
  Adding postgresql backup restoration. Working on config.
  Using user log for db times.
  Last 5 minutes is actually last minute.
  Adding 5min loadtime to prometheus graphs.
  Switching back to nbanalytics with user auth.
  Mongo auth
2022-01-03 18:04:40 -05:00
Samuel Clay
d19a4f7545 Cleanup 2021-12-18 15:00:32 -05:00
Samuel Clay
7ebce0bcdd Switching back to nbanalytics with user auth. 2021-12-16 20:50:23 -05:00
Samuel Clay
8be0192702 Cleaning up pipeline 2021-12-16 20:06:15 -05:00
Samuel Clay
cf948c725a Renaming css files and fixing debug assets pipeline collector by forcing it to munge the static url with the media, non-cached, name. nginx should do the caching, not the url. 2021-12-16 17:30:05 -05:00
Samuel Clay
3d59e59636 Turning on DEBUG_ASSETS so developers dont need to compress their own assets. 2021-12-16 16:07:45 -05:00
Samuel Clay
9ced4ccadd Merge branch 'master' into pipeline
* master: (84 commits)
  Deploying new analytics server.
  Create mongodb database user. Only runs on analytics, but should work fine on main mongo.
  Adding second mongo analytics db, cleaning up mongo analytics auth.
  Adding RSS autodiscovery to blog. Thanks https://forum.newsblur.com/t/irony-newsblur-cant-auto-extract-rss-feed-from-blog-newsblur-com/8849.
  Revert "Merge branch 'state_timeline'"
  Fixing syntax error
  Solving docker networking container issues by turning iptables back on but using ufw after.rules that allow ufw to retain blocking ability. Works on Redis, now to move to mongo.
  fix flask_metrics ansible role
  add state timeline dashboard to grafana
  move state timeline to one single flask that gets astate for all services
  Mongo analytics monitor not reayd yet
  Turning consul monitor back on.
  Turning on analytics
  Need to strip csv values.
  Binding redis to public interface.
  Restore postgres backup. Needs work.
  Prepping postgres backup
  Prepping postgres transition, writing redis db maintenance.
  Prepping redis for moving back to primary.
  Updating redis backup to include percentage progress and access to the correct data dump.
  ...
2021-12-16 15:41:57 -05:00
Samuel Clay
ea6103bc8f Adding second mongo analytics db, cleaning up mongo analytics auth. 2021-12-16 13:48:20 -05:00
Samuel Clay
01974e2706 Thanks to @jeff-tyrrill for helping find and secure these vulnerabilities having to do with the Story view and auth cookie. 2021-12-10 17:24:04 -05:00
Samuel Clay
678662de8f Bumping celery concurrency 2021-12-06 11:23:34 -05:00
Samuel Clay
b71f383122 Fixing remaining broken js files. Collect static command now works as expected. 2021-11-26 16:44:11 -05:00
Samuel Clay
fd31c534e8 Cleaning up pipeline dirs. 2021-11-22 13:17:12 -05:00
Samuel Clay
45b3cfdecf Switching from yuglify to the original closure compiler. Everything's working well, although deployment needs to be rearranged a bit. 2021-11-17 13:41:22 -05:00
Jonathan Math
f26ae11707 add collectstatic make command and newsblur_deploy dockerfile 2021-11-16 12:41:09 -05:00
Samuel Clay
c4bbd3a7a8 New file system finder, finds static assets. 2021-11-16 11:27:09 -05:00
Samuel Clay
b6db14dacd Switching from Jammit to django-pipeline. Doesn't work yet, needs compressor hooked up and assets checked. 2021-11-14 13:42:06 -05:00
Samuel Clay
5f77322e4f
Merge pull request #1548 from louis-pre/fix/youtube-docker-settings
fix(docker): Remove duplicate YouTube API key setting
2021-09-30 16:18:43 -04:00