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,336 Commits 19 Branches 20 Tags
groups
Commit Graph

4336 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Roland Geider
783371d3bd Migrate some of the group's CSS to bootstrap 4 2020-10-19 13:54:43 +02:00
Roland Geider
a5bd0a11e7 Merge branch 'master' into groups 
# Conflicts:
#	requirements.txt
 2020-10-18 20:33:32 +02:00
Roland Geider
aefad2bc5b Remove icon from dropdown, has too much weight 2020-10-17 14:33:31 +02:00
Roland Geider
9f2cd270a7 Update changelog 2020-10-17 14:33:03 +02:00
Roland Geider
063e9b41a2 Merge pull request #543 from beingbiplov/feature/edit-or-delete-weight-entry 
Feature/edit or delete weight entry
 2020-10-17 14:28:44 +02:00
beingbiplov
5c04646d59 add to AUTHORS.rst 2020-10-16 14:43:49 +05:45
beingbiplov
2912fca63e remove whitespace 2020-10-16 14:40:44 +05:45
beingbiplov
b09db07071 setup views and test for weigh-entry delete option 2020-10-16 14:12:37 +05:45
beingbiplov
657195477d fix typo 2020-10-16 12:27:04 +05:45
beingbiplov
52aa24ba43 setup edit option for weight entry 2020-10-16 12:06:48 +05:45
Roland Geider
1c59eb0236 Leave user wger as owner for db folder 
The apache process still has the group permissions to write the sqlite file
 2020-10-15 22:58:06 +02:00
Roland Geider
58bc182f0d Merge pull request #542 from wger-project/dependabot/pip/pillow-approx-eq-8.0 
Update pillow requirement from ~=7.2 to ~=8.0
 2020-10-15 18:07:37 +02:00
dependabot[bot]
0fdf1f9245 Update pillow requirement from ~=7.2 to ~=8.0 
Updates the requirements on [pillow](https://github.com/python-pillow/Pillow) to permit the latest version.
- [Release notes](https://github.com/python-pillow/Pillow/releases)
- [Changelog](https://github.com/python-pillow/Pillow/blob/master/CHANGES.rst)
- [Commits](https://github.com/python-pillow/Pillow/compare/7.2.0...8.0.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-10-15 05:01:48 +00:00
Roland Geider
2dd3b63eec Merge pull request #541 from PostponingCamel/master 
Spelling/grammar fixes in text docs/comments
 2020-10-14 12:46:35 +02:00
Rasmus Storm
c626b77341 Spelling/grammar fixes in text docs/comments 
Fixed typos and grammatical errors in comments and text documents. No code outside of comments has been altered.
 2020-10-14 11:37:38 +02:00
Roland Geider
e3a1fd0a5f Exercises are now filtered by default 2020-10-12 20:50:31 +02:00
Roland Geider
7366d99638 Fix pep8 formating 2020-10-12 20:49:45 +02:00
Roland Geider
0b8e526036 Remove urlize_quoted_links 
REST framework now uses django's own urlize filter
 2020-10-11 17:50:01 +02:00
Roland Geider
6735e3808e update changelog 2020-10-09 21:49:18 +02:00
Roland Geider
e3c7eec36d Merge remote-tracking branch 'origin/master' 2020-10-09 21:45:43 +02:00
Roland Geider
ed306b0a9e Merge pull request #540 from oconnelc/506 
506 Add option to log complete nutritional plan
 2020-10-09 21:45:12 +02:00
Christopher O'Connell
1e57172aa5 Updated test_nutrition_diary based on flake feedback 2020-10-07 22:37:23 -04:00
Christopher O'Connell
92bcb92e62 Updated log based on flake feedback 2020-10-07 22:35:21 -04:00
Christopher O'Connell
2ad80ac040 Added test for the new log_plan 2020-10-07 22:25:43 -04:00
Christopher O'Connell
e3d53b23e7 Created a log method to log plans 2020-10-07 22:22:21 -04:00
Christopher O'Connell
62011a9ce1 Added a new URL for the log nutrition plan 2020-10-07 22:17:02 -04:00
Christopher O'Connell
b3b661f350 Added a link to add the Nutrition Plan to the diary 2020-10-07 22:14:25 -04:00
Christopher O'Connell
9dc2c918f3 Added name to AUTHORS 2020-10-07 22:09:12 -04:00
Roland Geider
901f25054e Merge pull request #537 from wger-project/dependabot/npm_and_yarn/components-font-awesome-5.15.1 
Bump components-font-awesome from 5.15.0 to 5.15.1
 2020-10-07 09:46:26 +02:00
dependabot[bot]
92f38f7e87 Bump components-font-awesome from 5.15.0 to 5.15.1 
Bumps [components-font-awesome](https://github.com/components/font-awesome) from 5.15.0 to 5.15.1.
- [Release notes](https://github.com/components/font-awesome/releases)
- [Commits](f1b1fe6b3c...6943708eff)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-10-07 05:21:12 +00:00
Roland Geider
10fd2e5017 Use submission manager for ingredients 
This change also filters the API results
 2020-10-05 16:56:29 +02:00
Roland Geider
cab143fd3c Only return accepted exercises in the REST API 2020-10-05 16:40:31 +02:00
Roland Geider
346c295826 Merge pull request #536 from wger-project/dependabot/pip/reportlab-3.5.53 
Bump reportlab from 3.5.52 to 3.5.53
 2020-10-05 16:24:27 +02:00
dependabot[bot]
1fa339e9ff Bump reportlab from 3.5.52 to 3.5.53 
Bumps [reportlab](http://www.reportlab.com/) from 3.5.52 to 3.5.53.

Signed-off-by: dependabot[bot] <support@github.com>
 2020-10-05 05:06:23 +00:00
Roland Geider
8b089e4423 Update to docker/build-push-actions@v2 2020-10-04 19:44:56 +02:00
Roland Geider
88c28bfc45 Merge pull request #533 from wger-project/dependabot/npm_and_yarn/d3-5.16.0 
Bump d3 from 0.0.0 to 5.16.0
 2020-10-03 18:16:53 +02:00
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
32d6a2275c Don't manually set the template debug setting 
This is by default the value of DEBUG, which is what we were doing here anyway
 2020-10-03 17:42:57 +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]
db2d617582 Bump d3 from 0.0.0 to 5.16.0 
Bumps [d3](https://github.com/mbostock-bower/d3-bower) from 0.0.0 to 5.16.0.
- [Release notes](https://github.com/mbostock-bower/d3-bower/releases)
- [Commits](https://github.com/mbostock-bower/d3-bower/commits/v5.16.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-10-01 05:38:31 +00: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