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
783371d3bd439fbddf6de6462a0a2bad10705e49
Commit Graph

190 Commits

Author SHA1 Message Date
Roland Geider
a5bd0a11e7 Merge branch 'master' into groups 
# Conflicts:
#	requirements.txt
 2020-10-18 20:33:32 +02:00
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
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
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
Roland Geider
8840ef6ac1 Pin installed yarn version 2020-10-01 23:43:58 +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
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
79a2e10c22 Add a media volume 
This allows for uploaded images to persist across updates
 2020-09-21 20:33:43 +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
c4c4f51041 Add links to discord server 2020-09-15 10:44:47 +02:00
Roland Geider
96b1f50274 Cleanup requirements files 
And add requirements file for production
 2020-09-12 21:35:02 +02:00
Roland Geider
cf68e5bda5 Update generator to create nutrition diary entries 2020-09-04 13:53:31 +02:00
Roland Geider
5cc7f57b1c Simplify create-settings tasks and others 
Create settings now uses the current path per default, which simplifies the
initial project setup
 2020-09-02 12:58:13 +02:00
Roland Geider
2d7c080a95 Merge branch 'master' into groups 
# Conflicts:
#	docs/install.rst
#	requirements.txt
#	wger/core/apps.py
#	wger/core/templates/navigation.html
#	wger/gym/views/gym.py
#	wger/manager/api/views.py
#	wger/manager/apps.py
#	wger/manager/fixtures/test-workout-data.json
#	wger/manager/models.py
#	wger/manager/tests/test_workout.py
#	wger/manager/views/workout.py
#	wger/settings_global.py
#	wger/urls.py
 2020-08-30 19:00:23 +02:00
Roland Geider
351deb9c35 Move filter to correct group 2020-08-30 18:47:50 +02:00
Roland Geider
c4476bc68c Bump invoke 
This has the effect, that the commands don't have an underscore anymore, but a
dash (as had the parameters), which does look nicer

Closes #482
 2020-08-26 00:07:26 +02:00
Roland Geider
cff54bc888 Merge branch 'master' into nutrition-diary 
# Conflicts:
#	wger/core/templates/index.html
#	wger/core/templates/misc/fragments/shariff_modal.html
#	wger/nutrition/api/views.py
#	wger/nutrition/models.py
#	wger/nutrition/templates/mobile/plan/view.html
#	wger/nutrition/templates/plan/view.html
#	wger/nutrition/urls.py
 2020-08-24 23:47:10 +02:00
Roland Geider
af231b4ca6 Use new twitter handle 2020-08-20 23:09:49 +02:00
Roland Geider
fd151b66eb Some more playing around with SASS 2020-08-16 22:45:03 +02:00
Roland Geider
8bb38f4b7b Merge branch 'feature/mobile-templates' 
# Conflicts:
#	requirements.txt
 2020-08-11 15:11:08 +02:00
Roland Geider
4c53198c6b Add missing DOCKER_DIR variable... 2020-08-10 14:30:19 +02:00
Roland Geider
7ebdb0b4f0 noqa all the files to be skipped 
Github's super linter seems to call each file individually. So instead of
flake --config foo . it does flake --config foo /path/to/file1.py and this
ignores the exclude values in the config.
 2020-08-09 23:17:32 +02:00
Roland Geider
c8889abf3d Use yarn to manage JS/CSS libraries 
Bower is deprecated and was also making some trouble under certain circumstances
such as Docker, where sometimes it would download the files to the wrong folder.
Hopefully this results in less headaches.
 2020-07-29 13:49:34 +02:00
Roland Geider
29278729c1 Correctly set database name 2020-07-28 23:27:32 +02:00
Roland Geider
bacbce7d37 Merge branch 'master' into feature/mobile-templates 2020-07-28 20:57:47 +02:00
Roland Geider
dfe6291de3 fix markdown linting errors 2020-07-28 19:18:45 +02:00
Roland Geider
4db2a66043 Merge branch 'docker-compose' 2020-07-28 19:13:06 +02:00
Roland Geider
65decd0b82 Change owner of static folder 
This is perhaps not the most elegant solution, but works
 2020-07-27 21:34:38 +02:00
Roland Geider
5f8b20e4dd Add README to docker-compose folder 2020-07-27 21:18:53 +02:00
Roland Geider
4e8a22e25d Use redis for cache and session storage 2020-07-27 19:57:57 +02:00
Roland Geider
afd81a321d Use a volume to store postgres' data 2020-07-27 11:58:27 +02:00
Roland Geider
d07d089334 Commit missing settings file 2020-07-27 11:57:55 +02:00
Roland Geider
1c3482ab50 Rename compose folder 2020-07-26 20:32:09 +02:00
Roland Geider
86c73cb0f9 Make docker-compose work (seemingly) 2020-07-26 20:19:06 +02:00
Roland Geider
b815c24716 More tinkering with the dockerfile for development 2020-07-24 00:46:40 +02:00
Roland Geider
eee03f9257 Run cronjobs as wger user 2020-07-23 08:15:15 +02:00
Roland Geider
2b3e06729a Remove vim and tmux 
They are not needed anyway and make the image smaller
 2020-07-22 23:57:07 +02:00
Roland Geider
6a8655d77c Replace single triple quotes 
This is consistent with PEP8 and wasn't done before due to a duty
to consistency
 2020-07-22 23:00:14 +02:00
Roland Geider
db954634af Some improvement to development Dockerfile 
Don't use a virtualenv insise the Dockerfile, not actually needed
 2020-07-22 22:25:45 +02:00
Roland Geider
d005a1678d Update docker compose file (WIP) 2020-07-21 11:53:05 +02:00
Roland Geider
9014e6c5df Some improvement to development Dockerfile 
Don't use a virtualenv insise the Dockerfile, not actually needed
 2020-07-16 20:42:05 +02:00
Roland Geider
ce2cd078ab Merge branch 'master' into docker-compose 2020-07-15 23:47:48 +02:00
Roland
eac3861f17 Re-add the apt-get update 
Was deleted by mistake
 2020-06-28 21:30:14 +02:00
Roland
07a72263f4 Optimizations/fixes for PyPI packaging 2020-06-28 18:46:24 +02:00
Roland
933452d5f3 Small documentation polishing 2020-06-25 15:47:24 +02:00
Roland
b0736f15ad Somewhat reduce the docker image size 2020-06-25 12:20:15 +02:00
Roland
739e38120c Fix formatting in markdown files 2020-06-24 21:35:31 +02:00