Skip to content
This repository has been archived by the owner on Sep 26, 2019. It is now read-only.

Upgrade #616

Open
wants to merge 136 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
136 commits
Select commit Hold shift + click to select a range
0dcf9bf
anzac workflow modifications
simensta Oct 19, 2015
f448094
Merge branch 'master' of github.com:zooniverse/scribeAPI into anzac-p…
simensta Oct 20, 2015
fa9f44f
homepage max-width
simensta Oct 20, 2015
c387589
Merge branch 'master' of github.com:zooniverse/scribeAPI into anzac-p…
simensta Oct 27, 2015
9349316
adding logstasher
simensta Oct 27, 2015
0a635e7
Merge branch 'master' of github.com:zooniverse/scribeAPI into anzac-p…
simensta Oct 27, 2015
38a979c
Merge branch 'master' of github.com:zooniverse/scribeAPI into anzac-p…
simensta Nov 5, 2015
de582b7
change in about and transcribe workflow fetchlimit
simensta Nov 5, 2015
1e63204
Merge branch 'master' of github.com:zooniverse/scribeAPI into anzac-p…
simensta Nov 19, 2015
ac5af58
adding Rfm abbreviation
simensta Nov 19, 2015
92facf6
fixed mistakenly labeled hs_rectangleTool_sickness
simensta Nov 20, 2015
d11231e
adding punctuation for transcribe wrkflw
simensta Dec 1, 2015
4ac90ea
adding to more fields to mark and transcribe workflow
simensta Dec 2, 2015
7402c8a
adding initial
simensta Dec 2, 2015
a849731
temp index create for jenkins
simensta Dec 4, 2015
07e7e16
temp rake task addition
simensta Dec 4, 2015
5cfbdb2
take out create indexes call in project:load
simensta Jan 6, 2016
0890782
Merge branch 'master' of github.com:zooniverse/scribeAPI into anzac-p…
simensta Jan 6, 2016
5625f7f
correcting sickness transcribe task
simensta Jan 6, 2016
efe40d2
cleanup
simensta Jan 6, 2016
a55de50
gemfile change
simensta Jan 6, 2016
ebe6000
use in include in visible_marks scope
simensta Jan 6, 2016
cb66881
fix scope typo
simensta Jan 6, 2016
f1c7237
more selective query order
simensta Jan 6, 2016
24d8bfc
fast indexes for subject
simensta Jan 6, 2016
12eb83b
temp addition to rake task to run indexes
simensta Jan 6, 2016
5a8eac2
cleanup for rake
simensta Jan 6, 2016
9e0847e
using env
simensta Feb 17, 2016
e45527c
Merge pull request #569 from zooniverse/anzac-production-env-var
simensta Feb 17, 2016
49ad299
GA tag fix
simensta Feb 24, 2016
54051be
Merge branch 'anzac-production' of github.com:zooniverse/scribeAPI in…
simensta Feb 24, 2016
899277a
don't source env_vars.sh in start.sh
simensta Feb 25, 2016
dda10f9
cleanup rake command
simensta Feb 25, 2016
d353b33
last name index
simensta Mar 23, 2016
8da803c
styling for name search page
simensta Mar 24, 2016
8934ef5
finishing touches on the search page:
simensta Mar 25, 2016
f05eaf3
provide comment citation for search inspiration
simensta Mar 25, 2016
9b78b7c
remove index page
simensta Jul 13, 2016
410c5b6
Merge pull request #586 from zooniverse/a-p-subject-update-7-12-16
simensta Jul 13, 2016
d718acd
new subjects 7-20-16
simensta Jul 20, 2016
cacb6af
subjects from pfe wrkflw 5305 pt1 and 2
simensta Jul 26, 2016
9263cc8
subjects from pfe wrkflw 5305 pt3
simensta Jul 26, 2016
2054c48
subjects from pfe wrkflw 5335
simensta Jul 27, 2016
10898f3
subjects from pfe wrkflw 5379 pt2-1
simensta Jul 30, 2016
91acfa9
subjects from pfe wrkflw 5379 pt2-2
simensta Jul 30, 2016
03236cd
subjects from pfe wrkflw 5379 pt1 and pt2-3
simensta Jul 30, 2016
a473c8f
subjects from pfe wrkflw 5379 pt2-4
simensta Jul 31, 2016
6ecbedb
subjects from pfe wrkflw 5434 pt1
simensta Jul 31, 2016
7adaa98
subjects from pfe wrkflw 5446
simensta Aug 2, 2016
fee9938
subjects from pfe 6997
simensta Nov 23, 2016
b2061f2
subjects from pfe 7851
simensta Jan 24, 2017
79af803
attestation form questionnaire text for field guide
simensta Feb 1, 2017
ddc95c1
change field guide title
simensta Feb 2, 2017
ccbf017
Merge pull request #592 from zooniverse/anzac-production-table-field-…
simensta Feb 2, 2017
8a7685a
Modifications to deploy to Heroku
wragge Jul 29, 2017
8fef6e1
Fiddling with dependencies
wragge Jul 29, 2017
217dde4
Fiddling with dependencies
wragge Jul 29, 2017
67fbc37
Fiddling with dependencies
wragge Jul 29, 2017
388887f
Fiddling with dependencies
wragge Jul 29, 2017
2acbd5c
Set Procfile to use puma
wragge Jul 29, 2017
9e82f4a
update readme
wragge Jul 29, 2017
f94be20
update readme
wragge Jul 29, 2017
30e39ed
Added links from README to main wiki
wragge Jul 30, 2017
bf2c8b4
Load environment and config from docker secrets
adammcmaster Jan 11, 2018
7e86dc5
Update jquery to v3.3.3
simensta Apr 5, 2018
fbf8c29
Merge pull request #598 from zooniverse/anzac-production-update-jquery
simensta Apr 5, 2018
5035ee2
Disable strict SSL checking
adammcmaster Apr 6, 2018
51bf37e
Merge pull request #599 from zooniverse/anzac-production-npm-ssl
adammcmaster Apr 6, 2018
1b4e665
Merge branch 'master' into anzac-production
oktaal Jun 13, 2018
808895c
Removed project-specific exception
oktaal Jun 13, 2018
aa6ae72
Merge branch 'anzac-production' of github.com:UUDigitalHumanitieslab/…
oktaal Jun 13, 2018
e3ad2a0
Merge pull request #1 from UUDigitalHumanitieslab/anzac-production
oktaal Jun 13, 2018
7edac2e
Updated Ruby to 2.2.10
oktaal Jun 13, 2018
1d66bc1
newline
oktaal Jun 13, 2018
d98b941
Merged Gemfile.lock from zooniverse
oktaal Aug 20, 2018
ac97e2b
Merge branch 'zooniverse-master'
oktaal Aug 20, 2018
83fff80
Attempt at CI with Travis, updated Gemfile.lock.
oktaal Aug 20, 2018
f5ab478
Fixed jest unit tests
oktaal Aug 21, 2018
8fcaac5
Changed file extension to js(x)
oktaal Aug 21, 2018
4adbd5c
Prepare for ES6 js(x)
oktaal Aug 21, 2018
2c08d68
Renamed to jsx (ES6) from cjsx (CofeeScript)
oktaal Aug 21, 2018
f948836
Moved all CoffeeScript to ES6. Using depercolate and manual mods.
oktaal Aug 21, 2018
f4785b6
Updates for React 15 and running unit tests.
oktaal Aug 21, 2018
85e5ff9
Home page works again!
oktaal Aug 29, 2018
acdc278
Fixed routing
oktaal Aug 29, 2018
105aa99
Get to the marking page
oktaal Aug 29, 2018
8db4eb3
Fixes for marking
oktaal Aug 31, 2018
736db68
Resolved issues for transcribe and verify
oktaal Aug 31, 2018
b1675ad
Renamed all stylus files to sass. Removed stylus dependencies
oktaal Sep 3, 2018
ff31f48
Converted all styl to sass
oktaal Sep 3, 2018
2051ed3
Fixed classify style
oktaal Sep 3, 2018
67d1b79
Fixed transition-delay for rectangle-tool
oktaal Sep 3, 2018
4d5e2ea
Fixed precompilation
oktaal Sep 11, 2018
7b066fb
ES6 imports/exports
oktaal Sep 12, 2018
d515981
Upgrade to Rails 4.2
oktaal Sep 12, 2018
5326fff
Using webpacker to build javascript assets
oktaal Sep 12, 2018
2e003e1
Using old marked library again: newer version doesn't convert links
oktaal Sep 12, 2018
12dfdb3
Fixed SubjectZoomPan and jquery-ui dependency
oktaal Sep 20, 2018
17a362e
Fixed Yarn dependencies
oktaal Sep 20, 2018
665abcf
Fixed subject zoom buttons
oktaal Sep 20, 2018
6ab7082
Small fixes for large framework updates
oktaal Sep 24, 2018
ae296cc
Clean up of Classification
oktaal Sep 24, 2018
c82c125
Merged from wragge/master
oktaal Oct 2, 2018
efe11b8
Merged from develop
oktaal Oct 2, 2018
dfbc72e
Merge branch 'feature/react-update' of github.com:UUDigitalHumanities…
oktaal Oct 2, 2018
5906d7d
Fixed group browser and page
oktaal Nov 5, 2018
26d9b7c
Show group buttons
saschaishikawa Dec 14, 2015
23fa441
Adds the option to show labels on mark boxes
oktaal Nov 26, 2018
bb6212b
Fixed going to next page after marking one page as bad.
oktaal Nov 28, 2018
f446388
Updated LabeledRadioButton, supports className
oktaal Dec 3, 2018
7389b16
Scroll to top on navigation change
oktaal Dec 3, 2018
739553c
Removed running using older node
oktaal Dec 4, 2018
d19e00d
Retain group going back to marking. Fixed scroll when transcribing done
oktaal Dec 4, 2018
22e0fbf
Merge branch 'feature/react-update' of github.com:UUDigitalHumanities…
oktaal Dec 4, 2018
e15a85e
Fixed tests (added babel support for static properties)
oktaal Dec 4, 2018
6c06d7e
Allowing zooming out, pan window instead of subject when possible
oktaal Dec 4, 2018
d722d28
Fixes for admin environment
oktaal Dec 4, 2018
cae2286
Improved marking, added linting
oktaal Dec 5, 2018
a37c7bd
Linted * (removed ; and " -> ' = smaller differences with coffeescript)
oktaal Dec 5, 2018
cb0c16f
Fixed retrieving info from url (e.g. group_id)
oktaal Dec 11, 2018
b750283
Corectly highlight the page in the header
oktaal Dec 12, 2018
31d4f22
Only scroll to mark when transcribing when needed
oktaal Dec 12, 2018
0677770
Fixed regression in subject viewer after conversion to ES6 component
oktaal Dec 12, 2018
a44e86c
Fixed panning
oktaal Dec 12, 2018
aa55ed2
Updated browser warning
oktaal Dec 12, 2018
d54325e
Merge commit '2c08d68bc452a4227bfe078624e3a7bcab871b33' into develop
oktaal Dec 12, 2018
d452040
Squashed commit of the following:
oktaal Sep 3, 2018
3de1641
Squashed commit of the following:
oktaal Dec 12, 2018
3c467aa
Merge branch 'feature/react-update' into develop
oktaal Dec 12, 2018
4ce17ac
Updated yarn.lock
oktaal Dec 12, 2018
4ac0b97
Fixed routing (going to a specific page, the params were missing)
oktaal Dec 14, 2018
a88c07c
Fixed bind for submitMark in subjectviewer
oktaal Dec 14, 2018
de4e3a1
Merge branch 'feature/react-update' into develop
oktaal Mar 4, 2019
2b29189
Merge branch 'master' of github.com:zooniverse/scribeAPI into zoonive…
oktaal Mar 4, 2019
93108d3
Merge branch 'zooniverse-master'
oktaal Mar 4, 2019
68f1b0a
Updated packages
oktaal Mar 4, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
correcting sickness transcribe task
  • Loading branch information
simensta committed Jan 6, 2016
commit 5625f7f736387b308e541e8d3659a4c87c966722
11 changes: 6 additions & 5 deletions project/anzac/workflows/transcribe.json
Original file line number Diff line number Diff line change
@@ -1362,7 +1362,7 @@
"hs_rectangleTool_sickness": {
"tool": "textTool",
"tool_config": {},
"instruction": "Transcribe the entry for **sickness**.",
"instruction": "Transcribe the cable no. for **sickness**.",
"help": {
"title": "Transcription Help",
"file": "basic_transcribe_help"
@@ -1373,7 +1373,7 @@
"hs_service_sickness_date": {
"tool": "textTool",
"tool_config": {},
"instruction": "Transcribe the entry for **date of the wound**.",
"instruction": "Transcribe the entry for **date of the sickness**.",
"help": {
"title": "Transcription Help",
"file": "basic_transcribe_help"
@@ -1389,18 +1389,19 @@
"title": "Transcription Help",
"file": "basic_transcribe_help"
},
"generates_subject_type": "hs_transcribed_wounds_location.",
"generates_subject_type": "hs_transcribed_sickness_location.",
"next_task": "hs_sickness_mssg_remarks"
},
"hs_sickness_mssg_remarks": {
"tool": "textTool",
"tool_config": {},
"instruction": "Transcribe any **messages or remarks** associated with the wound.",
"instruction": "Transcribe any **messages or remarks** associated with the sickness.",
"help": {
"title": "Transcription Help",
"file": "basic_transcribe_help"
},
"generates_subject_type": null
"generates_subject_type": "hs_transcribed_sickness_mssg_remarks",
"next_task": null
}
}
}