autonomic-cooperative/ojuso-map
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
436 Commits 1 Branch 0 Tags
8247888ef07addb68ebff2d4ea35f2e5ea5d2a5b
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
takkaria 87ae3731d3 Remove unused bundle.js file 2018-10-13 01:39:32 -04:00
takkaria e9f9b6f20d Get docker working with new assets folder 2018-10-12 21:25:12 -04:00
takkaria ac9090788a Comment out non-working point of interest link 2018-10-12 20:29:31 -04:00
takkaria b5cc53acf9 Add scaled-down navicon 2018-10-12 20:25:14 -04:00
takkaria cca364d308 Move more shared CSS into the shared CSS file 2018-10-12 20:08:06 -04:00
takkaria a784ddad4f Move some utility classes into a shared location 2018-10-12 20:00:55 -04:00
takkaria b0aea72c12 Redesign form selector screen 2018-10-12 19:51:59 -04:00
takkaria c21a06d5c8 Get basic, admin-editable POI working 2018-10-12 18:56:27 -04:00
takkaria 4dc3acb1f9 Move some things around in prep for more than one form 2018-10-12 18:50:51 -04:00
takkaria 69e518240c Add point of interest model 2018-10-12 18:50:27 -04:00
takkaria 79dffadd14 Restore names of uploaded files on submit/draft restore (#65) 
This involved turning the list of file IDs stored in the hidden
text field into JSON.
 2018-10-12 18:34:39 -04:00
takkaria b5ccbf631d Fix bug where you couldn't upload files with spaces in the name 
As part of this, replace to the jquery-file-upload plugin with a simple
fetch() call.
 2018-10-12 18:31:20 -04:00
takkaria 579bb73574 Add script to get into postgres on production 2018-10-09 21:23:12 -04:00
takkaria 3dccff6eea Remove offending field that was stopping migration working 2018-10-09 21:10:27 -04:00
takkaria 190f63abf8 Attempt a different migration to remove null from text fields 2018-10-05 09:29:24 -04:00
takkaria 857714fb15 Fix failing test 2018-09-26 15:09:35 +01:00
takkaria de07e09b12 Try again 2018-09-26 15:09:35 +01:00
takkaria 0e141a31f8 Try to fix tests again 2018-09-26 15:09:35 +01:00
takkaria 7df7d7df5b Text fields shouldn't have null=True. (#94) 2018-09-26 15:09:35 +01:00
takkaria d1c3ca247a Upgrade to Django 1.11 compatible version of django-cas-server 2018-09-26 15:09:35 +01:00
takkaria f5fac0b6a0 Update draft deletion logic for new field 
And comment the delete-files-only-in-drafts logic.
 2018-09-26 15:09:35 +01:00
takkaria a900a146e2 Tweak failing test 
I've worked out this test is failing when FileDeleteView::post() calls
self.get_object() - that's when the 404 is being sent.  I can't work out
why though, because everything else looks fine.
 2018-09-26 15:09:35 +01:00
takkaria 4ddc6aeacf Add test bucket when testing, so we can nuke debug files 2018-09-26 15:09:35 +01:00
takkaria b42a9c7571 Fix failing test 2018-09-23 13:50:38 +01:00
takkaria 47236ac547 Try again 2018-09-23 12:09:42 +00:00
takkaria d0a4148b13 Try to fix tests again 2018-09-23 11:58:09 +00:00
takkaria ff445e166d Text fields shouldn't have null=True. (#94) 2018-09-22 19:09:05 +01:00