wger-project/wger
1
0
Fork 0
mirror of https://github.com/wger-project/wger.git synced 2026-02-18 00:17:51 +01:00
Code Issues Packages Projects Releases Wiki Activity
4,208 Commits 19 Branches 20 Tags
de8fb4fb68e481f28d6273aee6ecef020cef8232
Commit Graph

4208 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Roland Geider
de8fb4fb68 Merge pull request #532 from wger-project/dependabot/npm_and_yarn/components-font-awesome-5.15.0 
Bump components-font-awesome from 5.14.0 to 5.15.0
 2020-10-03 18:16:06 +02:00
Roland Geider
9b57fec445 Merge pull request #535 from wger-project/dependabot/pip/reportlab-3.5.52 
Bump reportlab from 3.5.51 to 3.5.52
 2020-10-03 18:15:32 +02:00
Roland Geider
5bdcb7edb6 Install sass via npm again 2020-10-03 17:15:01 +02:00
dependabot[bot]
748eb7de46 Bump reportlab from 3.5.51 to 3.5.52 
Bumps [reportlab](http://www.reportlab.com/) from 3.5.51 to 3.5.52.

Signed-off-by: dependabot[bot] <support@github.com>
 2020-10-02 05:01:34 +00:00
Roland Geider
8840ef6ac1 Pin installed yarn version 2020-10-01 23:43:58 +02:00
Roland Geider
c745eaeba6 Merge pull request #530 from sztang/fstrings 
Convert /core to fstrings
 2020-10-01 22:48:59 +02:00
Roland Geider
bb5b00da79 Install yarn and sass via apt 
Yarn still has some installation problems when done via npm
 2020-10-01 22:46:12 +02:00
Roland Geider
bd49aa2ba1 Merge pull request #531 from wger-project/dependabot/npm_and_yarn/tinymce-5.5.1 
Bump tinymce from 5.5.0 to 5.5.1
 2020-10-01 18:33:01 +02:00
dependabot[bot]
7942ac0949 Bump components-font-awesome from 5.14.0 to 5.15.0 
Bumps [components-font-awesome](https://github.com/components/font-awesome) from 5.14.0 to 5.15.0.
- [Release notes](https://github.com/components/font-awesome/releases)
- [Commits](75afe9bc19...f1b1fe6b3c)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-10-01 05:38:24 +00:00
dependabot[bot]
0e23607f6e Bump tinymce from 5.5.0 to 5.5.1 
Bumps [tinymce](https://github.com/tinymce/tinymce-dist) from 5.5.0 to 5.5.1.
- [Release notes](https://github.com/tinymce/tinymce-dist/releases)
- [Changelog](https://github.com/tinymce/tinymce-dist/blob/master/changelog.txt)
- [Commits](https://github.com/tinymce/tinymce-dist/compare/5.5.0...5.5.1)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-10-01 05:38:17 +00:00
Simon Tang
3985dce626 Convert /core to fstrings 2020-09-30 17:41:31 -04:00
Roland Geider
7a6e226497 Go back to yarn 1.22.5 
It seems 1.22.10 has some problems with npm installed as root
 2020-09-30 12:44:01 +02:00
Roland Geider
593f5e2073 Merge pull request #526 from wger-project/dependabot/pip/django-filter-2.4.0 
Bump django-filter from 2.3.0 to 2.4.0
 2020-09-30 12:05:15 +02:00
dependabot[bot]
14e24880b7 Bump django-filter from 2.3.0 to 2.4.0 
Bumps [django-filter](https://github.com/carltongibson/django-filter) from 2.3.0 to 2.4.0.
- [Release notes](https://github.com/carltongibson/django-filter/releases)
- [Changelog](https://github.com/carltongibson/django-filter/blob/master/CHANGES.rst)
- [Commits](https://github.com/carltongibson/django-filter/compare/2.3.0...2.4.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-09-29 09:23:20 +00:00
Roland Geider
ee4792c6e9 Merge pull request #527 from wger-project/dependabot/pip/djangorestframework-approx-eq-3.12 
Update djangorestframework requirement from ~=3.11 to ~=3.12
 2020-09-29 11:22:34 +02:00
Roland Geider
b279346287 Merge pull request #528 from wger-project/dependabot/npm_and_yarn/yarn-1.22.10 
Bump yarn from 1.22.5 to 1.22.10
 2020-09-29 11:22:18 +02:00
Roland Geider
cef2510642 Merge pull request #529 from wger-project/dependabot/npm_and_yarn/tinymce-5.5.0 
Bump tinymce from 5.4.2 to 5.5.0
 2020-09-29 11:21:56 +02:00
dependabot[bot]
c0606006e4 Bump tinymce from 5.4.2 to 5.5.0 
Bumps [tinymce](https://github.com/tinymce/tinymce-dist) from 5.4.2 to 5.5.0.
- [Release notes](https://github.com/tinymce/tinymce-dist/releases)
- [Changelog](https://github.com/tinymce/tinymce-dist/blob/master/changelog.txt)
- [Commits](https://github.com/tinymce/tinymce-dist/compare/5.4.2...5.5.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-09-29 05:21:48 +00:00
dependabot[bot]
98c824503e Bump yarn from 1.22.5 to 1.22.10 
Bumps [yarn](https://github.com/yarnpkg/yarn) from 1.22.5 to 1.22.10.
- [Release notes](https://github.com/yarnpkg/yarn/releases)
- [Changelog](https://github.com/yarnpkg/yarn/blob/master/CHANGELOG.md)
- [Commits](https://github.com/yarnpkg/yarn/commits)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-09-29 05:21:37 +00:00
dependabot[bot]
4e15dc7b2c Update djangorestframework requirement from ~=3.11 to ~=3.12 
Updates the requirements on [djangorestframework](https://github.com/encode/django-rest-framework) to permit the latest version.
- [Release notes](https://github.com/encode/django-rest-framework/releases)
- [Commits](https://github.com/encode/django-rest-framework/compare/3.11.0...3.12.1)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-09-29 05:01:27 +00:00
Roland Geider
5014ce09fa Merge pull request #525 from wger-project/dependabot/pip/reportlab-3.5.51 
Bump reportlab from 3.5.50 to 3.5.51
 2020-09-25 10:28:11 +02:00
dependabot[bot]
31d08706cd Bump reportlab from 3.5.50 to 3.5.51 
Bumps [reportlab](http://www.reportlab.com/) from 3.5.50 to 3.5.51.

Signed-off-by: dependabot[bot] <support@github.com>
 2020-09-25 05:01:24 +00:00
Roland Geider
426a3e8436 Run setup.py develop as root 2020-09-22 00:45:46 +02:00
Roland Geider
d40821cdeb Fix issue with development mode 
Fixes #516
 2020-09-22 00:35:22 +02:00
Roland Geider
9ebe18c7a5 Of course I forgot the --no-input option 2020-09-21 21:57:05 +02:00
Roland Geider
74ca2198cb Merge remote-tracking branch 'origin/master' 2020-09-21 21:24:51 +02:00
Roland Geider
578ee51745 Remove code, was commited by mistake 2020-09-21 21:24:44 +02:00
Roland Geider
59cb8d48e0 Correctly set the authentication backend 2020-09-21 21:23:31 +02:00
Roland Geider
a427a255b5 Correctly set the form action 
Otherwise this does not work on a modal dialog

Fixes #522
 2020-09-21 21:05:12 +02:00
Roland Geider
79a2e10c22 Add a media volume 
This allows for uploaded images to persist across updates
 2020-09-21 20:33:43 +02:00
Roland Geider
5d486d52dc Fix markdown linting errors 2020-09-21 20:04:57 +02:00
Roland Geider
bbc63d2e6c Merge pull request #523 from wger-project/dependabot/pip/reportlab-3.5.50 
Bump reportlab from 3.5.49 to 3.5.50
 2020-09-21 19:56:01 +02:00
Roland Geider
b4591857a7 Make clearer what each docker image does and what not 2020-09-21 16:22:50 +02:00
Roland Geider
8ec92baff4 Fix command to download exercise images 2020-09-21 13:01:42 +02:00
dependabot[bot]
31af24ec27 Bump reportlab from 3.5.49 to 3.5.50 
Bumps [reportlab](http://www.reportlab.com/) from 3.5.49 to 3.5.50.

Signed-off-by: dependabot[bot] <support@github.com>
 2020-09-21 05:12:12 +00:00
Roland Geider
87cfc2a39c Merge branch 'master' of github.com:wger-project/wger 2020-09-20 20:01:53 +02:00
Roland Geider
d98e9bd7eb Return error message when logging in via API 2020-09-20 14:21:26 +02:00
Roland Geider
6f9fa034cd Update changelog 2020-09-20 14:14:31 +02:00
Roland Geider
5957be9e32 Merge pull request #497 from Svn-Sp/feature/bmi-on-graph 
Feature/bmi on graph at weight overview (Issue #462)
 2020-09-20 14:06:06 +02:00
Roland Geider
188194fffa Activate ecmascript6 2020-09-20 13:59:49 +02:00
Roland Geider
407a3111eb Merge branch 'master' into feature/bmi-on-graph 2020-09-20 13:44:02 +02:00
Roland Geider
cb20909c75 Make GET return an info message 2020-09-19 08:54:03 +02:00
Roland Geider
ff3f764d92 Fix typo 2020-09-19 08:46:55 +02:00
Roland Geider
c227835075 Merge pull request #521 from wger-project/dependabot/pip/bleach-approx-eq-3.2 
Update bleach requirement from ~=3.1 to ~=3.2
 2020-09-17 15:15:57 +02:00
dependabot[bot]
7004839686 Update bleach requirement from ~=3.1 to ~=3.2 
Updates the requirements on [bleach](https://github.com/mozilla/bleach) to permit the latest version.
- [Release notes](https://github.com/mozilla/bleach/releases)
- [Changelog](https://github.com/mozilla/bleach/blob/master/CHANGES)
- [Commits](https://github.com/mozilla/bleach/compare/v3.1.0...v3.2.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-09-17 05:01:25 +00:00
Roland Geider
4cececbcaa Fix token generation page 
Tokens are only generated when clicking on the create button, not directly
when visiting the page (as it was before)
 2020-09-15 15:33:33 +02:00
Roland Geider
43f1ef74a3 Add login endpoint in REST API 2020-09-15 14:28:11 +02:00
Roland Geider
c4c4f51041 Add links to discord server 2020-09-15 10:44:47 +02:00
Roland Geider
6193aca71a Correctly set form CSS class 
Fixes #511
 2020-09-12 21:46:47 +02:00
Roland Geider
96b1f50274 Cleanup requirements files 
And add requirements file for production
 2020-09-12 21:35:02 +02:00