TTMK/web2.0-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Commit Graph

  • f587c69435 Make model names translatable Jan Tuomi 2017-05-26 20:30:14 +03:00
  • 14ed32931b Fix sidebar transition and styling henu 2017-05-25 19:17:51 +03:00
  • 54612e31ca Add REST API support to members henu 2017-05-25 17:06:44 +03:00
  • 90177ab9fc Fix Member model method last_paid henu 2017-05-25 17:00:31 +03:00
  • bff2dd2b76 Fix hsl fetcher time minutes type error henu 2017-05-25 15:00:48 +03:00
  • 2834da0934 Email new member on request and accept Aarni 2017-05-24 20:26:35 +03:00
  • 2d95dbb0f1 Merge branch 'develop' into 'master' Jan Tuomi 2017-05-24 20:12:46 +03:00
  • 128342c678 Add about.html because Jopi forgot Jan Tuomi 2017-05-24 20:08:18 +03:00
  • 8f50a6e0bf Merge branch 'develop' into 'master' Jan Tuomi 2017-05-24 19:44:46 +03:00
  • 7f694e5257 Merge branch 'feature-gitversion' into 'develop' Jan Tuomi 2017-05-24 19:40:02 +03:00
  • 386107075c Fix requirements Joel Lavikainen 2017-05-24 18:42:45 +03:00
  • 66779c17f1 Add git revision hash to UI Joel Lavikainen 2017-05-24 18:40:01 +03:00
  • 13c3df6ee4 Fix sidebar animation Juhana Luomanen 2017-05-24 18:31:41 +03:00
  • 50fec558c2 Add "last paid" column to member list Jan Tuomi 2017-05-24 18:22:21 +03:00
  • 04293adcbd Merge branch 'feature-videoitem' into 'develop' Jan Tuomi 2017-05-24 18:16:50 +03:00
  • 00829f4fd5 Fix pep8 Joel Lavikainen 2017-05-24 18:11:28 +03:00
  • 3ce4f00746 Merge branch 'develop' into feature-videoitem Joel Lavikainen 2017-05-24 17:29:58 +03:00
  • a89d561803 Merge remote-tracking branch 'origin' into feature-videoitem Joel Lavikainen 2017-05-24 16:49:37 +03:00
  • bec498bfee Complete infoscreen video support Joel Lavikainen 2017-05-24 16:44:59 +03:00
  • bd94ab8e33 Write some stuff in the readme Jan Tuomi 2017-05-21 22:56:28 +03:00
  • 1410c2e2a5 Upgrade to Django 1.11 Jan Tuomi 2017-05-21 18:08:38 +03:00
  • a10ccec5f0 Housekeeping Jan Tuomi 2017-05-21 18:08:10 +03:00
  • a2fb923220 Fix all pep8 and eslint errors :0 Jan Tuomi 2017-05-21 16:28:47 +03:00
  • 4ab9c98b57 Fix requirements.txt syntax Jan Tuomi 2017-05-21 14:59:44 +03:00
  • 30ca4aafd3 Exclude migrations from nose and pep8 Jan Tuomi 2017-05-19 16:03:38 +03:00
  • bb70c101d6 Move libraries into their own directory Jan Tuomi 2017-05-19 15:39:50 +03:00
  • a34a44ed95 Write some tests and configs for testing Jan Tuomi 2017-05-18 23:21:05 +03:00
  • 63f0ffff5b Picking on readme Jan Tuomi 2017-05-18 22:18:31 +03:00
  • dd61231837 Fix file name problem in CI Jan Tuomi 2017-05-18 16:16:27 +03:00
  • babd20921f Update README.md with up to date info Jan Tuomi 2017-05-18 16:06:35 +03:00
  • 21f8a71fd7 Merge remote-tracking branch 'origin/develop' into develop Jan Tuomi 2017-05-18 15:49:14 +03:00
  • c64cf7a7cc Clean up repo and remove docker Jan Tuomi 2017-05-18 15:49:04 +03:00
  • 3aadd6eff2 Merge branch 'feature-init-command' into 'develop' Jan Tuomi 2017-05-18 13:49:33 +03:00
  • 4972ef87f1 Write translations Jan Tuomi 2017-05-18 13:46:56 +03:00
  • 80313a7765 Fix "add many" and csv import and export Jan Tuomi 2017-05-18 13:28:30 +03:00
  • da86c411a6 Fix typos in setup instructions vol2 henu 2017-05-17 18:43:42 +03:00
  • 59bc5aa4da Fix typos henu 2017-05-17 18:22:56 +03:00
  • 8d05eff035 Create updated setup instructions henu 2017-05-17 18:19:20 +03:00
  • e0a88cf20b Fix settings location henu 2017-05-17 18:04:53 +03:00
  • 7736c6397f Change psql to settings replacing mariadb okalintu 2017-05-17 17:35:08 +03:00
  • f3ffbf8c96 Missing argument from pep8 Jan Tuomi 2017-05-17 15:25:33 +03:00
  • 164a3562f7 Obviously node.js doesn't have pip Jan Tuomi 2017-05-17 15:23:44 +03:00
  • 224b5d87da Fix eslint dependency Jan Tuomi 2017-05-17 15:18:57 +03:00
  • 22e3727320 Remove outdated and failing test case Jan Tuomi 2017-05-17 15:01:04 +03:00
  • df25bebc81 Merge branch 'gitlab-ci-update' into develop Jan Tuomi 2017-05-17 14:52:57 +03:00
  • 866e665ff9 Fix brain fart in .gitlab-ci.yml Jan Tuomi 2017-05-17 14:50:12 +03:00
  • aeacbaa088 Setup postgres correctly for CI Jan Tuomi 2017-05-17 14:45:00 +03:00
  • ea0808fae0 Edit GitLab build sequence Jan Tuomi 2017-05-17 14:39:28 +03:00
  • afdb03e1c1 Add command 'initialize' to init a few defaults okalintu 2017-05-17 14:38:26 +03:00
  • 4518228d69 Edit GitLab CI Jan Tuomi 2017-05-17 14:33:08 +03:00
  • 3aa55ee7f2 Add stages to GitLab CI Jan Tuomi 2017-05-17 13:29:29 +03:00
  • cae57d973e Add payment edit and delete Jan Tuomi 2017-05-17 13:28:06 +03:00
  • 2b5101566c Mobile styles Jan Tuomi 2017-05-13 12:15:20 +03:00
  • 850ff0a74d Add notification system to replace noty Jan Tuomi 2017-05-13 11:19:39 +03:00
  • b798f62a6b Forgot to stage files :0 Jan Tuomi 2017-05-13 10:43:23 +03:00
  • fa13842e5f More general fixes, add error page Jan Tuomi 2017-05-13 10:40:38 +03:00
  • 44e8ffb57d Members style cleanup, starting to look good Jan Tuomi 2017-05-13 01:19:37 +03:00
  • 9a87ba56b5 Start using django_tables2 for table processing Jan Tuomi 2017-05-13 00:18:01 +03:00
  • 74746fc0de More members overhaul Jan Tuomi 2017-05-12 21:19:01 +03:00
  • 3a468b9c39 Add payment list view Jan Tuomi 2017-05-12 15:03:37 +03:00
  • c5443d25b4 Make application list work in a basic sense Jan Tuomi 2017-05-11 23:25:59 +03:00
  • 8707cda7bc Clean up and remove tommy :( Jan Tuomi 2017-05-11 22:43:23 +03:00
  • 7b178ab1f7 Purge Angular from member register, WIP Jan Tuomi 2017-05-11 22:25:37 +03:00
  • 189f0dd30d Use Django forms in members, WIP Jan Tuomi 2017-05-11 09:01:30 +03:00
  • 3b770343a0 Merge branch 'feature-payment' into develop Jan Tuomi 2017-05-10 20:37:29 +03:00
  • 56b6cf4893 Merge remote-tracking branch 'origin/feature-payment' into feature-payment Jan Tuomi 2017-05-10 19:54:42 +03:00
  • 7e2cf03ced Merge remote-tracking branch 'origin/feature-postgres' into develop Jan Tuomi 2017-05-10 19:37:18 +03:00
  • 1974af3723 Merge branch 'urls-makeover' into develop Jan Tuomi 2017-05-10 19:30:54 +03:00
  • b32f3d62c4 Merge branch 'develop' into 'master' Jan Tuomi 2017-05-10 17:20:15 +03:00
  • 33cf10c556 Change default email sender to comply with django okalintu 2017-05-10 17:10:54 +03:00
  • fbd5d637a8 Tune autoinstall script and settings to postgres okalintu 2017-04-07 20:39:18 +03:00
  • 473a3d5cef Modify docker files from mariadb to postgreSQL okalintu 2017-04-07 15:37:58 +03:00
  • 1cb8010f1f Add psycopg2 as requirement okalintu 2017-04-07 13:32:59 +03:00
  • 94f3c94a14 Remove obsolete requirements from requirements.txt okalintu 2017-04-07 13:28:32 +03:00
  • d09bc9d6d7 Add --noinput flag to migrate in autoinstall.sh Jan Tuomi 2017-04-07 10:07:44 +03:00
  • 3f73a94b83 Separate urls.py into modular pieces Jan Tuomi 2017-04-06 21:03:43 +03:00
  • f5dd72c6c4 Fix CSV separator stripping bug in csv import Jan Tuomi 2017-04-06 20:32:09 +03:00
  • a65a099fc3 Merge branch 'develop' into 'master' Jan Tuomi 2017-04-06 19:16:41 +03:00
  • d028612d55 Minor script fixes Jan Tuomi 2017-04-06 19:13:18 +03:00
  • c37aca50bd Do not attempt to start docker daemon Jan Tuomi 2017-04-06 19:04:59 +03:00
  • 3f406b0f05 Fix DOCKER_OPTS Jan Tuomi 2017-04-06 18:22:03 +03:00
  • 56f8a17b67 Refine automation scripts Jan Tuomi 2017-04-06 18:18:23 +03:00
  • 3855fb5179 Fix add_many_member footer problem Juhana Luomanen 2017-03-31 00:19:20 +03:00
  • 8a6c274834 Merge branch 'cleanup' into 'develop' Jan Tuomi 2017-03-30 18:18:57 +03:00
  • 274ab6ec5b Fix createdefaultadmin.py output Jan Tuomi 2017-03-30 18:17:36 +03:00
  • f93cb5aad5 Remove boilerplate from infoadmin controllers okalintu 2017-03-30 15:24:08 +03:00
  • d093a9167c Fix create_dummydata script models henu 2017-03-29 19:38:33 +03:00
  • a947f21652 Change memberRequest model to Request model henu 2017-03-29 19:37:56 +03:00
  • 8249819e27 Merge branch 'develop' into feature-payment henu 2017-03-29 19:15:48 +03:00
  • ea36d4b193 Fix member serializers, add own requirements to gitignore henu 2017-03-29 19:12:46 +03:00
  • 39e1d66574 Merge branch 'develop' into 'master' Jan Tuomi 2017-03-29 19:11:50 +03:00
  • 842930b24e Merge branch 'feature-addmigrations' into 'develop' Jan Tuomi 2017-03-29 19:10:28 +03:00
  • 63a28e872e Add migrations back to the repo Sika Production 2017-03-29 19:01:55 +03:00
  • 6c74ef0ea4 Merge branch 'develop' into 'master' Jan Tuomi 2017-03-29 18:54:55 +03:00
  • a9d7b0629e Merge branch 'feature-apyscreen' into 'develop' Jan Tuomi 2017-03-29 18:53:36 +03:00
  • 1f032aec88 Refuctor apy dimensions okalintu 2017-03-29 18:50:55 +03:00
  • 84b46ecd44 Prettify apy deal site Joel Lavikainen 2017-03-29 18:44:35 +03:00
  • 80c50cb1de Add apy top dealers site Joel Lavikainen 2017-03-29 18:05:02 +03:00
  • 375e861d55 Merge backend and frontend for apy Joel Lavikainen 2017-03-29 17:46:27 +03:00
  • ae75dc3834 Add frontend controllers for apy deals Joel Lavikainen 2017-03-29 17:45:42 +03:00