Merge pull request #397 from coders4help/develop

Merge develop into master branch

.editorconfig

@@ -0,0 +1,18 @@
+# http://editorconfig.org
+root = true
+
+[**]
+end_of_line = lf
+charset = utf-8
+insert_final_newline = true
+indent_style = space
+
+[**.py]
+indent_size = 4
+trim_trailing_whitespace = true
+
+[Dockerfile]
+indent_size = 4
+
+[**.{yml,yaml}]
+indent_size = 2

.gitignore

@@ -13,8 +13,5 @@ db.sqlite3
 /.coverage
 *.log
 .cache
-<<<<<<< Updated upstream
-=======
 fabfile.py
 /var
->>>>>>> Stashed changes

.travis.yml

@@ -4,7 +4,9 @@ python: "2.7"
 
 env: DJANGO_SETTINGS_MODULE=volunteer_planner.settings.tests
 
-install: "pip install -r requirements/dev.txt"
+install:
+  - travis_retry make sys_reqs
+  - travis_retry pip install -U -r requirements/dev.txt
 
 # Fire up a webserver for Selenium
 before_script:

CHANGELOG.md

@@ -0,0 +1,118 @@
+# Change Log
+All notable changes to this project will be documented in this file.
+
+## [Unreleased]
+### Added
+- [UI] Display a warning when joining overlapping shifts #395
+- [UI] shift managers can see the e-mail address of approved and pending facility members to contact them
+- enhancements to the excel document that is sent to shift managers
+- Some javascript files from different CDN are now included in Volunteer Planner distribution. 
+- [development] .editorconfig (PEP8 style)
+- [development] new docstrings to source code
+- [development] support for Docker containers for the test/development environment
+- [development] makefile for base and mysql installations
+- [development] travis badge added for readme.md
+
+### Changed
+- [UI] better alignment of page
+- [UI] Additional information - if shifts span over midnight there is need of additional information to differentiate between shifts that start today and shifts that started yesterday. In these cases the date is shown in the field where the time is shown. 
+- fixed issue 360: From field of emails is now DEFAULT_FROM_EMAIL and not anymore the fake from email of the shift manager.
+- All used CSS and Javascript files are delivered by Volunteer Planner (instead of using some CDNs)
+- text of HTTP 500 error was shortened.
+- [development] CHANGELOG is now Markdown
+- [development] Refactoring of the shiftmailer and Excelgenerator
+- [development] Refactor: only one repository for static files (both repositories have been merged)
+- [development] better README
+
+### Fixed
+- UI: corrected wrong email for onboarding
+- fixed issue 373: Shifts in shift history/future shifts are now shown correctly
+- [development] some PEP8 fixes of the source code
+- [development] removed hardcoded email from the source code, use settings file instead
+- [development] removed one hardcoded link on image
+- [development] .travis.yml fixups
+
+### Removed
+- static repository in non-logged-in-area was removed
+- [development] application api removed (not used and no plans for usage)
+- [development] application registration_history removed (since 03.10.15 not in use and no function anymore)
+- [development] application stats removed (since 01.10.15 not in use and no function anymore)
+
+## [3.0.1] - 2016-01-09
+### Added
+- [UI] User can her history of work shifts
+- [UI] User can see upcoming shifts (the shifts she signed up for)
+- Delete user: User can delete her account - the data is anonymized
+- Social Impact Lab was added as supporter
+
+### Changed
+- updated translations and wording
+- [UI] Account creation: There is now an explicit message on account creation form explaining what happens here. (users often mistake the creation form for the login form)
+- [UI] Account creation: The help texts have been improved
+- Maps: Google Maps links have been removed, Openstreetmap links have been added
+- several static information webpages (e.g FAQ) have been migrated from static html sites to django-flatpages
+- Do not throw away user entered data during registration (It is fairly frustrating for new users to have te re-enter e-mail
+addresses and passwords etc.)
+
+### Fixed
+- default PostgreSQL settings have been fixed
+- several PEP8 fixes of the source code (whitespaces, empty lines, lowercase variables)
+- fix of registration form
+- small fix of README.md
+- ordering of facilities at landing page fixed
+- add psycopg2 to requirements.txt
+
+### Removed
+- Google maps (see Changed)
+- several static webpages (see Changed)
+
+## [3.0.0] - 2015-11-08
+### Added / Changed / Fixed / Removed
+- see git log
+
+## [2.2.0] - 2015-10-22
+### Added / Changed / Fixed / Removed
+- see git log
+
+## [2.1.0] - 2015-10-09
+### Added / Changed / Fixed / Removed
+- see git log
+
+## [2.0.0] - 2015-10-04
+### Added / Changed / Fixed / Removed
+- see git log
+
+## [1.4.0] - 2015-09-16
+### Added / Changed / Fixed / Removed
+- Bug fix: creating new volunteer resulted in too long action and HTTP 502 error
+- Some UI cleanup (navigation bar and admin area).
+- Localization
+- Data model clean up
+- Facebook integration (preview image) improved
+- fix email privacy in email notification
+- fix UI problems
+
+## [1.3.0] - 2015-09-14
+### Added / Changed / Fixed / Removed
+- Add pretty admin theme
+- Prevent volunteers from subscribing to shifts if their time is conflicting with already
+  subscribed-to shifts.
+- Add py.test, factory-boy and basic factories.
+- Add Travis CI integration for pull requests.
+- Add django-extensions for dev, for ./manage.py shell_plus and graphing models.
+- Simplify views, remove statistics app, move registration app.
+- Subscribe button is hidden when already subscribed to shift.
+- Add a basic i18n workflow and mark some strings.
+- Email notifications for deleted shifts.
+
+## [1.2.0] - 2015-09-13
+### Added / Changed / Fixed / Removed
+- see git log
+
+## [1.1.0] - 2015-09-12
+### Added / Changed / Fixed / Removed
+- see git log
+
+## [1.0.0] - 2015-09-08
+### Added / Changed / Fixed / Removed
+- see git log

Dockerfile

@@ -0,0 +1,21 @@
+FROM python:2.7-alpine
+ENV PYTHONUNBUFFERED=1 user=vp vpbasedir=/opt/vpcode/
+
+WORKDIR ${vpbasedir}
+
+RUN addgroup -g 1000 ${user} && \
+    adduser -G vp -u 1000 -D -h ${vpbasedir} ${user} && \
+    chown ${user}:${user} ${vpbasedir}
+
+ADD requirements/*.txt ${vpbasedir}
+
+RUN apk update && apk add musl-dev mariadb mariadb-client-libs mariadb-libs mariadb-dev postgresql postgresql-dev gcc && \
+    pip install -r dev_mysql.txt -r dev_postgres.txt && \
+    apk del --purge gcc mariadb-dev mariadb musl-dev && \
+    /bin/rm -rf /var/cache/apk/*
+
+ADD django-entrypoint.sh /
+RUN chmod 0755 /django-entrypoint.sh
+
+USER ${user}
+CMD ["/bin/sh"]

Makefile

@@ -0,0 +1,13 @@
+SYS_REQ_DIR:=system_requirements
+
+WHICH_REQS?=
+_install_reqs:
+	for pk in $$(cat ${WHICH_REQS}); do sudo apt-get install -yq "$$pk"; done
+
+sys_base: WHICH_REQS=$(SYS_REQ_DIR)/base.txt
+sys_base: _install_reqs
+
+sys_mysql: WHICH_REQS=$(SYS_REQ_DIR)/mysql.txt
+sys_mysql: _install_reqs
+
+.PHONY: sys_reqs mysql_reqs