mg/breccia-mapper
1
0
Fork 0
mirror of https://github.com/Southampton-RSG/breccia-mapper.git synced 2026-08-23 20:55:39 +01:00
Code Issues Packages Projects Releases Wiki Activity
118 Commits 3 Branches 3 Tags
8689c1a2045f05902f8ea9cc4063456c985d73bf
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
James Graham 8689c1a204 style: Fix some autoformatting issues 2020-06-26 11:45:21 +01:00
James Graham 387cebd0d4 fix: Improve clarity of network form time filter 
Resolves #34
 2020-06-26 10:54:40 +01:00
James Graham 0e4234cb35 fix: Hide person details from non-admin users 
See #35
 2020-06-25 11:38:26 +01:00
James Graham aafb6c0a21 fix: Remove Person.name from CSV export 
See #35
 2020-06-25 11:11:14 +01:00
James Graham b84076ec3b refactor: Make Person.discipline free text 
See #33
 2020-06-24 16:29:50 +01:00
James Graham 57349a6007 fix: Add changes to detail page missing 
See #33
 2020-06-24 15:10:00 +01:00
James Graham ab37139429 feat: Add date started at organisation 
See #33
 2020-06-24 15:09:23 +01:00
James Graham 26bf55b4b4 fix: Remove Person.core_member field 
See #33
 2020-06-24 13:47:12 +01:00
James Graham 9a84f77ec4 fix: Don't insert form CSS/JS when no form 2020-06-24 13:40:02 +01:00
James Graham 62d7a1e48c fix: Set defaults if customisation app not loaded 2020-06-24 12:01:45 +01:00
James Graham 0cceb604dd fix: Fix welcome email bugs 
Send only when new user is created
Require email address when user created

Resolves #32
 2020-05-28 16:24:44 +01:00
James Graham c6eda514ca fix: Fix time filtering of relationships on MySQL 
Resolves #31
 2020-05-28 13:51:00 +01:00
James Graham 8bc82b2a15 temp fix: Temporarily disable welcome emails 2020-05-27 14:47:10 +01:00
James Graham c364db4f16 fix: Add DEFAULT_FROM_EMAIL 2020-05-27 14:42:28 +01:00
James Graham 82fbdd2ca1 deploy: Add allowed hosts to Ansible variables 
Move DB credentials to inventory file
 2020-05-27 11:26:52 +01:00
James Graham 567322c0af feat: Send welcome email from template 2020-04-28 15:17:58 +01:00
James Graham a39cf0e7ca Merge branch 'dev' 2020-04-24 15:23:54 +01:00
James Graham b99aa77d7b security: Remove TLSv1.3 
Required version of openssl not available on RHEL
 2020-04-24 15:14:31 +01:00
James Graham efee146044 security: Disable TLS < 1.2 2020-04-24 15:01:40 +01:00
James Graham a382d93b00 Merge branch 'dev' 2020-04-24 13:00:30 +01:00
James Graham aaafdef7e1 deploy: Add email config to settings.ini template 2020-04-24 13:00:09 +01:00
James Graham 17e6255d62 feat: Add config for email sending 2020-04-21 15:02:13 +01:00
James Graham 1ca3c4e6c4 Merge branch 'dev' 2020-04-21 09:39:55 +01:00
James Graham 5dcfbb6052 feat!: Add answer sets to CSV export 
BREAKING CHANGE: Change format of Relationship CSV export
BREAKING CHANGE: Use 'id' for id field in CSV exports
Add RelationshipAnswerSet CSV export
 2020-04-20 15:12:34 +01:00
James Graham d6763a760e fix: Separate date field from relationship questions 2020-04-20 13:56:06 +01:00
James Graham 3b3cec02be feat: Add date field to network view 
Filters relationships to only those valid at date
 2020-04-20 13:32:07 +01:00
James Graham 719b11e79e fix: Fix broken relationship update form 
Did not get values from fields correctly
Incorrectly marked answersets as expired immediately
 2020-04-20 13:30:15 +01:00
James Graham bf472a69fd refactor: Reverse relationship query in network view 2020-04-17 16:03:11 +01:00
James Graham 75fc169630 fix: Fix filters on network view 
Filters now use OR for multiple choices in the same field
 2020-04-17 15:04:48 +01:00
James Graham 19735e9771 fix: Fix network JS to use new serialized relationship format 2020-04-17 11:38:59 +01:00
James Graham 2b0ba8d12e deploy: Add deployment keyfile variables to inventory 2020-04-17 11:38:10 +01:00
James Graham fa07b13fbd fix: Minor changes to style of masthead image 2020-04-16 14:07:43 +01:00
James Graham 57c29bf01d refactor: Begin import of customisation app 2020-04-16 14:07:14 +01:00
James Graham 4a1e33064c Merge branch 'dev' 2020-04-02 19:45:33 +01:00
James Graham 224a92f42e style: Fix a few minor style issues 2020-04-02 19:09:28 +01:00
James Graham 63e06d812d refactor: Simplify User person test 2020-04-02 18:40:11 +01:00
James Graham eea4342455 fix: Add heading to all pages 2020-04-02 18:35:24 +01:00
James Graham c7a6c72219 fix: Fix broken activity signup 2020-04-02 17:15:27 +01:00
James Graham fef6e9d459 feat: Users can create Activities 
Resolves #22
 2020-04-02 17:02:27 +01:00
James Graham 216e6b06fa fix: Make activity attendees optional 2020-04-02 16:59:54 +01:00
James Graham dc69c51ac9 Merge branch 'dev' 2020-04-02 16:39:50 +01:00
James Graham ada72c24f8 feat: Export activity attendance 
Resolves #23
 2020-04-02 16:27:29 +01:00
James Graham 8f494e1be5 fix: Use underscores in export column headers 
Resolves #30
 2020-04-02 15:42:48 +01:00
James Graham e5bb530214 Merge branch 'dev' 2020-04-02 11:10:00 +01:00
James Graham 6418c8c96a fix: Fix broken Activity export 
Unexpected Series field no longer added when Activity does
not belong to a series
 2020-04-02 10:56:29 +01:00
James Graham db96e65485 fix: Type annotation not available in py36 2020-04-01 17:05:04 +01:00
James Graham 15aab2eb33 feat: Add Activity export 
See #27
See #29
Resolves #24
 2020-04-01 16:48:23 +01:00
James Graham 7d1aac2021 refactor: Rename Person serializers 2020-04-01 16:23:16 +01:00
James Graham d02f865952 refactor: Move export into separate app 2020-04-01 16:00:22 +01:00
James Graham 76270c4572 feat: Export relationships with answers 
See #27
See #29
Resolves #25
 2020-04-01 13:15:48 +01:00
James Graham 76ae447cc6 refactor: Move flattening to serializer base class 2020-04-01 09:57:28 +01:00
James Graham 04ae8cb4f6 feat: Recursively flatten serializers for CSV export 2020-03-31 15:43:33 +01:00
James Graham 80f7fb0857 deploy: Add SSH to firewall allowed services 2020-03-30 20:54:15 +01:00
James Graham 834fb3c644 fix: Add login required on all remaining views 2020-03-30 20:52:09 +01:00
James Graham 1bc45b1106 deploy: Only configure firewall if it's already running 2020-03-30 20:30:37 +01:00
James Graham 74d3c1b091 deploy: Use RedHat Software Collections 
RHSCL provides patched versions of Python and Nginx
 2020-03-30 17:18:19 +01:00
James Graham da57108e3e refactor: Use custom CSV export view 
Remove dependency on djangorestframework-csv
 2020-03-27 17:00:37 +00:00
James Graham 2cdc7675c7 refactor: Split people.views into multiple modules 2020-03-27 15:15:18 +00:00
James Graham 7c75f9d7f4 feat: Add export page link to navbar 2020-03-27 14:33:22 +00:00
James Graham 74aab162e1 feat: Add export front page 2020-03-27 14:31:59 +00:00
James Graham af77cb39f8 feat: Add CSV export of Relationships 2020-03-27 14:31:38 +00:00
James Graham 416f2fbf6c Merge branch 'master' into dev 2020-03-27 11:15:37 +00:00
James Graham 9f493a53e4 feat: Add initial CSV export of people 2020-03-27 11:15:26 +00:00
James Graham d83f4bda49 fix(people): Fix redirect after new relationship 2020-03-10 13:12:20 +00:00
James Graham 8c698e821d fix(deploy): Drop uWSGI to correct gid 2020-03-10 10:55:27 +00:00
James Graham 440de19c56 feat(network): Add initial filtering to network 
See #19
 2020-03-10 10:52:20 +00:00
James Graham 09b7fc334b fix(network): Require login for network view 2020-03-09 12:52:29 +00:00
James Graham 512590d615 feat(network): Add style to network 
Style nodes and edges of network
Fix layout of network not running

See #14
 2020-03-09 12:43:57 +00:00
James Graham 6e00c42302 Merge branch 'dev' 2020-03-06 15:12:53 +00:00
James Graham b2fd9eeaf9 feat(people): Add network view 
Network view shows people and relationships between them

Resolves #21
Resolves #20
Part of #14
 2020-03-06 15:09:40 +00:00
James Graham 9b3b759254 refactor(people): Move relationship answers to answer set 
Answers to the relationship questions have been moved from the relationship
to another model RelationshipAnswerSet.  A new answer set is created each
time a user answers the relationship questions.

Resolves #16
Resolves #17
Resolves #18
 2020-03-05 15:22:28 +00:00
James Graham 1a9ba731cf deploy: Create backup of DB before running migrations 2020-03-05 11:00:12 +00:00
James Graham 474f3a4be3 docs: Add link to (private) GitHub in README.md 2020-03-05 10:25:51 +00:00
James Graham 118ce6228f docs: Add initial README content 2020-03-05 10:12:20 +00:00
James Graham 40afbc1908 fix: Fix broken user check when anonymous 2020-03-03 13:42:46 +00:00
James Graham 7784ab3e09 fix: Fix broken user check when anonymous 2020-03-03 09:58:51 +00:00
James Graham e3ef4ed90c feat(people): Add notice to fill in user details 2020-03-03 09:55:47 +00:00
James Graham 7ee7ed3ff0 fix: Add dbbackup to installed apps 2020-03-02 08:04:52 +00:00
James Graham 56568093ae fix: Deploy migrations as web user 
Resolves issue where server cannot run due to log
file owned by root
 2020-03-02 07:42:11 +00:00
James Graham e410d9bcb1 fix: Add missing settings to template 2020-02-28 15:46:31 +00:00
James Graham 097a6b0152 deploy: Add Makefile with deploy shortcuts 2020-02-28 15:39:13 +00:00
James Graham a7f34bbb54 deploy: Add Ansible deployment scripts 2020-02-28 15:36:14 +00:00
James Graham 0d2f1a79b2 fix: Retrofix initial migrations with 1023 col 
BREAKING CHANGE: Retrospectively modifies migrations
 2020-02-28 15:21:43 +00:00
James Graham 512c02a198 fix: Shrink name fields to fit in indexed column 2020-02-28 15:05:47 +00:00
James Graham 507e2a43fa deploy: Add MySQL as dependency 2020-02-28 14:47:01 +00:00
James Graham 7891ab72da feat(people): Admin can define new People 
Resolves #9
 2020-02-27 13:41:53 +00:00
James Graham 6d12202c8a feat: Add access controls to Person views 
See #6
 2020-02-27 08:16:01 +00:00
James Graham e47ee453bd feat(people): Use Select2 fields for Relationship People 2020-02-25 12:47:03 +00:00
James Graham 39127cf972 feat(people): Add discipline and themes to Person 
See #1
 2020-02-25 11:19:46 +00:00
James Graham d733b6db63 feat(people): Display activites and data on profile 
See #10
 2020-02-25 10:47:56 +00:00
James Graham 224bce9853 feat(people): Add job title and role 
See #1
 2020-02-25 09:15:25 +00:00
James Graham 5e6065951f feat(people): Add organisation field to Person 
See #1
 2020-02-25 08:52:11 +00:00
James Graham 9210636475 feat(people): Add nationality and residence fields 
See #1
 2020-02-25 08:38:30 +00:00
James Graham abcfd67f77 style: Fix majority of Prospector complaints 
Mainly whitespace fixes
 2020-02-21 17:28:43 +00:00
James Graham 6d2737b1a6 feat(people): Add first user data fields 
To support choices in CharFields, Django choices enums have been
backported by bringing in the source file from Django 3.0.3

See #1
 2020-02-21 17:10:26 +00:00
James Graham e4a50dbfa4 feat(people): Display relationship answers on detail page 
resolve #5
 2020-02-20 15:24:48 +00:00
James Graham 5a1b043862 feat(people): Allow people to describe relationships 
Creating a relationship requires answering each of the
relationship questions

resolve #2
partial #5
 2020-02-20 14:46:51 +00:00
James Graham e1df999108 feat(people): Make relationship questions / choices sortable 
resolve #7
 2020-02-20 14:43:48 +00:00
James Graham 65f46a66f1 feat(activities,people): Allow people to attend activities 
resolve #13
 2020-02-20 09:38:34 +00:00
James Graham 0d5d04902e feat(activities): Add read views for ActivitySeries 2020-02-19 13:34:59 +00:00