This repository has been archived by the owner on Sep 26, 2019. It is now read-only.
Upgrade #616
Open
Upgrade #616
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…roduction updates from master -- includes whaling updates and classification.created_at index
…roduction pulling in new changes from master
…roduction changes for calling project stats
…v-var env fixes
…lab/scribeAPI into feature/react-update
commit 2c08d68 Author: Sheean Spoel <[email protected]> Date: Tue Aug 21 14:46:17 2018 +0200 Renamed to jsx (ES6) from cjsx (CofeeScript) commit 4adbd5c Author: Sheean Spoel <[email protected]> Date: Tue Aug 21 14:44:09 2018 +0200 Prepare for ES6 js(x) commit 8fcaac5 Author: Sheean Spoel <[email protected]> Date: Tue Aug 21 14:42:45 2018 +0200 Changed file extension to js(x) commit f5ab478 Author: Sheean Spoel <[email protected]> Date: Tue Aug 21 10:44:24 2018 +0200 Fixed jest unit tests commit 83fff80 Author: Sheean Spoel <[email protected]> Date: Mon Aug 20 15:51:37 2018 +0200 Attempt at CI with Travis, updated Gemfile.lock. Renamed all stylus files to sass. Removed stylus dependencies
commit a37c7bd Author: Sheean Spoel <[email protected]> Date: Wed Dec 5 15:15:34 2018 +0100 Linted * (removed ; and " -> ' = smaller differences with coffeescript) commit cae2286 Author: Sheean Spoel <[email protected]> Date: Wed Dec 5 15:04:06 2018 +0100 Improved marking, added linting commit d722d28 Author: Sheean Spoel <[email protected]> Date: Tue Dec 4 16:40:26 2018 +0100 Fixes for admin environment commit 6c06d7e Author: Sheean Spoel <[email protected]> Date: Tue Dec 4 15:32:01 2018 +0100 Allowing zooming out, pan window instead of subject when possible commit e15a85e Author: Sheean Spoel <[email protected]> Date: Tue Dec 4 12:44:16 2018 +0100 Fixed tests (added babel support for static properties) commit 22e0fbf Merge: d19e00d 739553c Author: Sheean Spoel <[email protected]> Date: Tue Dec 4 12:31:01 2018 +0100 Merge branch 'feature/react-update' of github.com:UUDigitalHumanitieslab/scribeAPI into feature/react-update commit d19e00d Author: Sheean Spoel <[email protected]> Date: Tue Dec 4 12:29:41 2018 +0100 Retain group going back to marking. Fixed scroll when transcribing done commit 739553c Author: Sheean Spoel <[email protected]> Date: Tue Dec 4 10:08:28 2018 +0100 Removed running using older node commit 7389b16 Author: Sheean Spoel <[email protected]> Date: Mon Dec 3 17:06:02 2018 +0100 Scroll to top on navigation change commit f446388 Author: Sheean Spoel <[email protected]> Date: Mon Dec 3 14:46:25 2018 +0100 Updated LabeledRadioButton, supports className commit bb6212b Author: Sheean Spoel <[email protected]> Date: Wed Nov 28 15:47:02 2018 +0100 Fixed going to next page after marking one page as bad. commit 23fa441 Author: Sheean Spoel <[email protected]> Date: Mon Nov 26 10:01:58 2018 +0100 Adds the option to show labels on mark boxes commit 26d9b7c Author: Sascha T. Ishikawa <[email protected]> Date: Mon Dec 14 14:18:59 2015 -0600 Show group buttons commit 5906d7d Author: Sheean Spoel <[email protected]> Date: Mon Nov 5 11:42:22 2018 +0100 Fixed group browser and page commit dfbc72e Merge: efe11b8 ae296cc Author: Sheean Spoel <[email protected]> Date: Tue Oct 2 15:35:18 2018 +0200 Merge branch 'feature/react-update' of github.com:UUDigitalHumanitieslab/scribeAPI into feature/react-update commit efe11b8 Merge: 665abcf c82c125 Author: Sheean Spoel <[email protected]> Date: Tue Oct 2 15:35:08 2018 +0200 Merged from develop commit ae296cc Author: Sheean Spoel <[email protected]> Date: Mon Sep 24 17:20:41 2018 +0200 Clean up of Classification commit 6ab7082 Author: Sheean Spoel <[email protected]> Date: Mon Sep 24 15:10:19 2018 +0200 Small fixes for large framework updates commit 665abcf Author: Sheean Spoel <[email protected]> Date: Thu Sep 20 12:17:00 2018 +0200 Fixed subject zoom buttons commit 17a362e Author: Sheean Spoel <[email protected]> Date: Thu Sep 20 12:12:21 2018 +0200 Fixed Yarn dependencies commit 12dfdb3 Author: Sheean Spoel <[email protected]> Date: Thu Sep 20 11:21:30 2018 +0200 Fixed SubjectZoomPan and jquery-ui dependency commit 2e003e1 Author: Sheean Spoel <[email protected]> Date: Wed Sep 12 15:33:46 2018 +0200 Using old marked library again: newer version doesn't convert links commit 5326fff Author: Sheean Spoel <[email protected]> Date: Wed Sep 12 12:41:31 2018 +0200 Using webpacker to build javascript assets commit d515981 Author: Sheean Spoel <[email protected]> Date: Wed Sep 12 10:47:15 2018 +0200 Upgrade to Rails 4.2 commit 7b066fb Author: Sheean Spoel <[email protected]> Date: Wed Sep 12 10:01:13 2018 +0200 ES6 imports/exports commit 4d5e2ea Author: Sheean Spoel <[email protected]> Date: Tue Sep 11 14:51:00 2018 +0200 Fixed precompilation commit 67d1b79 Author: Sheean Spoel <[email protected]> Date: Mon Sep 3 11:04:28 2018 +0200 Fixed transition-delay for rectangle-tool commit 2051ed3 Author: Sheean Spoel <[email protected]> Date: Mon Sep 3 11:03:20 2018 +0200 Fixed classify style commit ff31f48 Author: Sheean Spoel <[email protected]> Date: Mon Sep 3 11:02:15 2018 +0200 Converted all styl to sass commit b1675ad Author: Sheean Spoel <[email protected]> Date: Mon Sep 3 10:06:01 2018 +0200 Renamed all stylus files to sass. Removed stylus dependencies commit 736db68 Author: Sheean Spoel <[email protected]> Date: Fri Aug 31 16:38:58 2018 +0200 Resolved issues for transcribe and verify commit 8db4eb3 Author: Sheean Spoel <[email protected]> Date: Fri Aug 31 16:14:05 2018 +0200 Fixes for marking commit 105aa99 Author: Sheean Spoel <[email protected]> Date: Wed Aug 29 17:13:41 2018 +0200 Get to the marking page commit acdc278 Author: Sheean Spoel <[email protected]> Date: Wed Aug 29 13:25:31 2018 +0200 Fixed routing commit 85e5ff9 Author: Sheean Spoel <[email protected]> Date: Wed Aug 29 11:40:31 2018 +0200 Home page works again! commit f4785b6 Author: Sheean Spoel <[email protected]> Date: Tue Aug 21 17:22:01 2018 +0200 Updates for React 15 and running unit tests. commit f948836 Author: Sheean Spoel <[email protected]> Date: Tue Aug 21 16:11:14 2018 +0200 Moved all CoffeeScript to ES6. Using depercolate and manual mods.
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This should resolve #602: upgrade to React 15, using ES6 instead of CoffeeScript, newer version of Ruby (2.2.10) and supporting current versions of Node. I've also gathered some fixes from forks and branches. I got hospitalized just a few days after my last commit from December so this PR was postponed for some time. (The hospitalization had nothing to do with the code 😃). There is still some last development going on for https://cemrol.hum.uu.nl/ which isn't done yet, but this PR should cover the upgrades on the framework itself. There will be a PR soon™ containing the changes for the CEMROL project itself.