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

Merge branch 'feature/mobile-templates'

Browse Source 
# Conflicts:
#	requirements.txt
This commit is contained in:
Roland Geider
2020-08-11 15:11:08 +02:00
parent a834b0bdaa 7968ea6350
commit 8bb38f4b7b
192 changed files with 2349 additions and 5819 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
docs/changelog.rst
View File

@@ -2,14 +2,13 @@ Changelog
=========
2.0 - IN DEVELOPMENT
====================
**2020-xx-xx**
Upgrade steps from 1.9:
* Install ``yarn`` (e.g. ``sudo npm install -g yarn``)
* Update python libraries ``pip install -r requirements.txt``
* Update CSS and JS libraries ``python manage.py bower install``
* Update CSS and JS libraries ``yarn install``
* Update static files (only production): ``python manage.py collectstatic``
@@ -27,6 +26,7 @@ Upgrade steps from 1.9:
* Improved docker and docker-compose images `#340`_
* Updated many libraries to last version (bootstrap, font awesome, etc.)
* Use yarn to download CSS/JS libraries
.. _#340: https://github.com/wger-project/wger/issues/340

2
docs/development.rst
View File

@@ -28,7 +28,7 @@ Install Requirements
::
$ pip install -r requirements_devel.txt
$ npm install bower
$ npm install yarn
$ python setup.py develop
Install application

25
docs/tips_and_tricks.rst
View File

@@ -17,28 +17,15 @@ come from new versions of django or the installed dependencies). If you start
the development server and see a message that there are unapplied migrations,
just do ``python manage.py migrate --all``.
Downloading dependencies with Bower
```````````````````````````````````
Downloading JS and CSS libraries
````````````````````````````````
Bower is used to download different JS and CSS libraries. If you update master
it is recommended that you first delete the existing libraries
(``rm wger/core/static/bower_components``) and then download the new versions
with::
We use yarn to download the JS and CSS libraries. To update them just go to
the source and do ::
$ python manage.py bower install
Some info about bower, during the bootstrap process bower is installed locally
to src/wger. If this didn't work and you get an error saying that bower is not
installed, you can manually install it by going to the project's root directory
and performing the step manually::
$ cd src/wger
$ npm install bower
Alternatively, you can manually set the path to the bower binary by editing
``BOWER_PATH`` (see ``wger/settings_global.py``).
$ yarn install
This happens automatically during the bootstrap process.
Clearing the cache
``````````````````