Commit Graph
100 Commits
Author SHA1 Message Date
takkaria dcb8f4beec Clean up imports 2019-08-20 00:10:20 +02:00
takkaria 3e5b41de1d Reorder all imports 2019-08-20 00:10:20 +02:00
takkaria 73fe51ba9c Get flake8 running OK 2019-08-20 00:10:20 +02:00
takkaria e3e3f6d5db Run black over entire codebase 2019-08-19 23:55:53 +02:00
takkaria fc7a9621a7 Rev dependencies, use only two requirements files (devel & base) 2019-08-19 23:55:53 +02:00
takkaria 1aea545ff7 Add some xtra dependencies 2019-08-19 23:20:06 +02:00
takkaria b7faf8a4a4 Split the API functions out into their own app 2019-08-19 23:14:57 +02:00
takkaria fc7eccb06c try localizing number inputs 2019-04-27 23:36:58 +01:00
takkaria 93db15b740 Fix some untranslatable text 2019-04-27 23:20:44 +01:00
takkaria a54c2574f0 Recompile messages 2019-04-21 13:31:29 +01:00
takkaria 399d815604 Text changes as per Tom's email 2019-04-21 13:31:24 +01:00
takkaria 04e1609c32 CI: Restore collectstatic 2019-04-07 19:10:36 +01:00
takkaria b8d54a2770 Try again to improve CI 2019-04-07 19:00:05 +01:00
takkaria 11e8270185 Try to speed up CI 2019-04-07 18:42:23 +01:00
takkaria 3b79d377ef Drafts: Fix urlconf bug introduced in 07f9bed0 2019-04-07 18:40:00 +01:00
takkaria edf62268aa Refactor CaseStudyDraft tests to make them more unit-y 2019-04-07 18:32:43 +01:00
takkaria 30b0a680aa Some test refactoring 2019-04-07 17:47:03 +01:00
takkaria f17834cd3b Reformat tests file 2019-04-07 17:21:50 +01:00
takkaria c84de45b10 Drafts: Fix logic in JS when no draft available 2019-04-07 17:18:55 +01:00
takkaria 58b18dd815 Run latest migrations 2019-04-07 17:05:09 +01:00
takkaria 87e9296007 Use lazy gettext in models and forms to allow things to be shown in Spanish. 2019-04-07 17:04:02 +01:00
takkaria 6e34abda84 Add migrations for form changes 2019-04-07 16:30:57 +01:00
takkaria df88d8d687 Update to django-cas-server 1.1 w Django 2.1 support 2019-04-07 16:24:46 +01:00
takkaria 795010f6c8 Generate new translation files 2019-04-07 16:14:27 +01:00
takkaria 54dbaf0ab2 Use more up-to-date version of multiselectfield 2019-04-07 16:11:35 +01:00
takkaria 5cc0b7cdc1 Use latest form text
* Take the opportunity to reformat the source to not have so many hugely long lines.
* Put a few things through gettext that weren't going through it before
* Move 'Hold down Ctrl to select multiple files at once.' text to widget, out of
  help text for each individual control.
2019-04-07 16:08:09 +01:00
takkaria dc84e1a09a Amend 'Solar power tower' label 2019-03-21 19:25:59 +00:00
takkaria 8247888ef0 Regenerate messages files 2019-03-18 17:30:15 +00:00
takkaria 0e7b9d696e Add some end tags for clarity when translating 2019-03-18 17:29:55 +00:00
takkaria 0042034919 Remove excessive spaces from long strings 2019-03-18 17:25:21 +00:00
takkaria ed399e8379 Some suggested translation updates 2019-03-18 17:07:15 +00:00
takkaria aafdd8db71 Merge branch 'patch-1' into 'master'
Update models.py - added full stops at end of 'etc'. [NOT SURE THIS IS THE RIGHT THING TO DO!]

See merge request autonomic-cooperative/ojuso-map!5
2019-03-18 16:24:48 +00:00
takkaria f86cd40410 Try removing an unused string 2019-03-14 21:15:23 +00:00
takkaria cc1e8464e9 Regenerate messages 2019-03-14 21:14:16 +00:00
takkaria 0656eee87a Put case study editing behind a feature flag 2019-03-07 09:15:18 +00:00
takkaria f346356239 Upgrade weblate 2019-03-07 08:34:11 +00:00
takkaria cf9a3c3362 Re-add Ximena's translations 2019-03-07 08:04:05 +00:00
takkaria 34874bc557 Re-add in Tom's localisations 2019-03-07 07:59:15 +00:00
takkaria f8d4cfe755 Save the form type (long, short) with the case study 2019-03-04 20:41:15 +00:00
takkaria 3c45e38fd5 Tag new case studies with their language 2019-03-04 20:37:39 +00:00
takkaria 0c594487a9 Add language field to case studies 2019-03-04 20:17:06 +00:00
takkaria ab99c1c19c Make sure users can only edit their own case studies 2019-03-04 20:03:43 +00:00
takkaria 07f9bed096 Rename view classes to have more descriptive names 2019-03-04 19:57:47 +00:00
takkaria c41141fea6 Add basic editing functionality 2019-03-04 19:48:29 +00:00
takkaria eb7eabb7c7 Add user-based case study listing 2019-03-04 23:39:27 +11:00
takkaria 57ac8eab86 Don't die if sending email fails 2019-03-04 23:39:10 +11:00
takkaria 2e4b09fecd Start reworking user page 2019-03-04 23:17:12 +11:00
takkaria 179ff9d7d4 Regenerate locale files 2019-02-23 12:41:05 +11:00
takkaria 5fde6f59fe Add MIT license to shut Weblate up 2019-02-20 02:30:36 +00:00
takkaria 892f6e6f75 fix weblate_static volume path 2019-02-08 23:42:19 +00:00
takkaria c59516a35b Specify weblate version to avoid getting scrwed by updates 2019-02-08 23:42:10 +00:00
takkaria 1e437d43e4 Make minor text corrections as suggested by workshop participants 2018-12-20 22:12:20 +01:00
takkaria 6fd3dfa825 Make the Ojuso logo look OK on high-dpi screens 2018-12-02 04:01:37 +00:00
takkaria f98b4b99f7 Exclude multiselectfield from testing, not just from coverage (doh) 2018-12-02 03:50:23 +00:00
takkaria 5ab0cb4ab9 fix tests after including multiselectfield using -e 2018-12-02 03:34:50 +00:00
takkaria e4e47a5cb3 Remove FORCE_IMAGE_PATH setting 2018-12-02 03:24:37 +00:00
takkaria 71a223ccf3 Try again with image URL 2018-12-02 03:22:55 +00:00
takkaria 12ef9ed774 Get map markers working again 2018-12-02 03:13:38 +00:00
takkaria 02193ea772 Fix webdriver warning 2018-12-02 02:47:54 +00:00
takkaria 47fc9a34ea Use version of MultiSelectField that doesn't have 7000 warnings (closes #104) 2018-12-02 02:46:00 +00:00
takkaria 53d3bd3658 Add templates to coverage 2018-12-02 02:36:20 +00:00
takkaria 0fb3fe02c8 Upgrade to psycopg2-binary to supress warnings 2018-12-02 02:27:01 +00:00
takkaria 5e49de16d0 Remove unused fields 2018-12-02 02:23:58 +00:00
takkaria b7b07aa180 Add DELETE markers for fields to be nuked 2018-12-02 02:10:35 +00:00
takkaria 144ae63eab Add gevent for deployment 2018-12-02 02:04:07 +00:00
takkaria e5fcc9eb77 Add cas-server requirement 2018-12-02 02:01:39 +00:00
takkaria dccdf71118 Try again 2018-12-02 01:59:23 +00:00
takkaria 377edb0412 Fix dockerfile requirements 2018-12-02 01:58:33 +00:00
takkaria e8e1d2cff6 Merge branch 'feature/new-form' into 'master'
Closes #42

See merge request autonomic-cooperative/ojuso-map!4
2018-12-02 01:37:58 +00:00
takkaria 73a746d83e Tests pass, woohoo 2018-12-02 01:10:12 +00:00
takkaria 0a47ea3724 Nuke no longer needed tests, add youtube one 2018-12-02 00:39:12 +00:00
takkaria 23c1279f61 Update case study display 2018-12-02 00:31:26 +00:00
takkaria 5c7d4005f0 Add migration 2018-12-02 00:31:04 +00:00
takkaria b240a110b3 Fix many-to-many field saving for Django 2.1 2018-12-02 00:30:38 +00:00
takkaria e1ff5b64cf Make conditional form logic more terse 2018-11-26 23:56:58 +00:00
takkaria dd54a7a2f9 Ask for start and completion years 2018-11-26 23:56:36 +00:00
takkaria 8745800af6 Add note about writing policy/technology analysis 2018-11-26 23:35:29 +00:00
takkaria 4e86794a6c Some design improvements 2018-11-26 23:32:31 +00:00
takkaria 04b8ae7bf9 Implement Tom's emailed suggestions 2018-11-26 22:34:06 +00:00
takkaria aac22da18c Make better use of horizontal space 2018-11-26 21:14:18 +00:00
takkaria d914ffab49 Clean up form hiding/showing logic 2018-11-26 18:10:25 +00:00
takkaria d6bae3b941 Add back in previously removed fields for backward-compat 2018-11-26 18:10:25 +00:00
takkaria 7fd961f511 Put 'other platforms' checkbox in a smarter place 2018-11-25 14:58:16 +00:00
takkaria 9384b6c9cb Through to the end 2018-11-25 13:48:52 +00:00
takkaria d87604c6bd Through row 140 2018-11-24 21:09:35 +00:00
takkaria 2fb4f8771c Through row 116 2018-11-24 18:30:58 +00:00
takkaria 857634d1f1 Through to row 101 2018-11-24 17:58:08 +00:00
takkaria 5c4e9c330d Through to row 87 2018-11-24 16:54:39 +00:00
takkaria 90f05fc92a Add cas-server to CI install instructions 2018-11-24 14:12:47 +00:00
takkaria 21c1ce4b1f Add MacOS install packages 2018-11-24 14:08:05 +00:00
takkaria 3a71ad5129 Install base requirements in GitLab CI 2018-11-24 13:53:36 +00:00
takkaria ad64b646b1 Make local.yml just run a postgres + mailhog instance 2018-11-24 13:39:21 +00:00
takkaria a0c7846704 Remove unused environment.sh file 2018-11-24 13:34:42 +00:00
takkaria b12b92b90d Remove unused nginx config files 2018-11-24 13:34:26 +00:00
takkaria bb7eff7648 Move requirements files to requirements/ 2018-11-24 13:33:41 +00:00
takkaria 501fcabfb6 Remote unused files in bin/ 2018-11-24 13:31:38 +00:00
takkaria 0e886181e2 Move things to slightly more sensible locations 2018-11-24 12:58:16 +00:00
takkaria 59e68ae771 Attempt using async workers to fix #72 2018-10-13 14:28:38 -04:00
takkaria acfbb513de Add points of interest
Do a bunch of refactoring in the process.  Current display on homepage
is a little shonky but that can be improved when there is something
using it.
2018-10-13 01:44:03 -04:00
takkaria f2823445a4 Comment out unused user list API 2018-10-13 01:39:32 -04:00