Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

increase session timeout #142

Closed
mvexel opened this issue Jun 22, 2016 · 3 comments
Closed

increase session timeout #142

mvexel opened this issue Jun 22, 2016 · 3 comments

Comments

@mvexel
Copy link
Member

mvexel commented Jun 22, 2016

This is too short now. We can make it 24 or even 48 hours.

@mgcuthbert
Copy link
Contributor

I added recently the ability to have it never time out by setting the value to -1. As it was driving me crazy during development. So I can switch it to that, as this is a session cookie we are dropping.

@jschleuss
Copy link

Great! I'm also bugged by the one hour or so timeout. Though, it's probably a good reminder to move around.

@mgcuthbert
Copy link
Contributor

This has been previously fixed.

mgcuthbert pushed a commit to mgcuthbert/maproulette2 that referenced this issue Jun 4, 2018
commit d4b193c92ec57c9d7e60ea096fe5d2ad0f12d4ab
Merge: b8be572 edb4b32
Author: Michael Cuthbert <mcuthbert@apple.com>
Date:   Mon Jun 4 15:20:09 2018 -0700

    Merge pull request #148 from mcuthbert/master

    Merge from Public and docs updates

commit edb4b328b4a7c86665a521b4f32fde9977cac681
Author: mcuthbert <mcuthbert@apple.com>
Date:   Mon Jun 4 15:09:26 2018 -0700

    Updating readme file to point to new API documentation.

commit c74b601e8e0f1e6eb1fd56e1e77337ece52cff10
Merge: df5ae74 bf83ce4
Author: mcuthbert <mcuthbert@apple.com>
Date:   Mon Jun 4 14:38:03 2018 -0700

    Merge remote-tracking branch 'external/master'

commit bf83ce438f443459ff329cdcc5a5f3802e31d24c
Merge: 308c271 2cb5abe
Author: Michael Cuthbert <mgcuthbert@hotmail.com>
Date:   Mon Jun 4 13:50:39 2018 -0700

    Merge pull request #428 from maproulette/dev

    Merge from dev to master

commit df5ae745130afb8c1d89cdb66bb33fda9f4c8636
Author: mcuthbert <mcuthbert@apple.com>
Date:   Tue May 29 20:58:02 2018 -0700

    Update a couple things in API docs

commit 873fe27afcaa6492445182a57af1b26a06caa799
Author: mcuthbert <mcuthbert@apple.com>
Date:   Tue May 29 17:01:05 2018 -0700

    Added some documentation about creating challenges

commit 308c271d6be4ef9d53a71a918d50e3dbd78c9e19
Merge: d78f97f d3b2531
Author: Michael Cuthbert <mgcuthbert@hotmail.com>
Date:   Mon May 21 13:47:56 2018 -0700

    Merge pull request #425 from maproulette/dev

    Merge from dev

commit d78f97f63a780f069f5f9990b7f014c92b7be779
Merge: 14d2b9b 0fc16d9
Author: Michael Cuthbert <mgcuthbert@hotmail.com>
Date:   Mon May 21 13:32:40 2018 -0700

    Merge pull request #423 from maproulette/dev

    Merge from dev to master

commit b8be572560ef7ff564dc434d7e153f86e20bf75e
Merge: 9ace8f6 307443b
Author: Michael Cuthbert <mcuthbert@apple.com>
Date:   Mon May 21 11:25:16 2018 -0700

    Merge pull request #147 from mcuthbert/Play26

    Don't allow redirects to be cached.

commit 307443ba8d4b0e9650f742713f0c2db9c95be502
Author: mcuthbert <mcuthbert@apple.com>
Date:   Mon May 21 11:24:50 2018 -0700

    Don't allow redirects to be cached.

commit 9ace8f661bf67c123e9b3250fd9d84cccca2e12f
Merge: 075dc19 ef36875
Author: Michael Cuthbert <mcuthbert@apple.com>
Date:   Mon May 21 09:54:19 2018 -0700

    Merge pull request #146 from mcuthbert/Play26

    Adding secret for the application

commit ef36875a0684815767ccd0c2996ad45845dc183b
Author: mcuthbert <mcuthbert@apple.com>
Date:   Mon May 21 09:50:54 2018 -0700

    Adding secret for the application

commit 075dc1977e8662b6a22fa88f24f855b07199f522
Merge: d05e400 32db7d9
Author: Michael Cuthbert <mcuthbert@apple.com>
Date:   Mon May 21 08:49:20 2018 -0700

    Merge pull request #145 from mcuthbert/Play26

    Updating leaflet.markercluster to 1.3.0

commit 32db7d95c90ede88649ffe6b55d03f4861772428
Author: mcuthbert <mcuthbert@apple.com>
Date:   Mon May 21 08:48:45 2018 -0700

    Updating leaflet.markercluster to 1.3.0

commit d05e400efe65a7292d9a6f594b5f14b45b18adbe
Merge: 85117a6 59796ba
Author: Michael Cuthbert <mcuthbert@apple.com>
Date:   Mon May 21 08:31:48 2018 -0700

    Merge pull request #144 from mcuthbert/Play26

    Adding debug warnings

commit 59796ba11fae631d0132e872a1d1dc651d57e876
Author: mcuthbert <mcuthbert@apple.com>
Date:   Mon May 21 08:30:51 2018 -0700

    Adding debug warnings

commit 85117a64c31d3ccefd3db4a4012494e0b13bf2de
Merge: 85611f6 f2f0e26
Author: Michael Cuthbert <mcuthbert@apple.com>
Date:   Fri May 18 16:22:13 2018 -0700

    Merge pull request #143 from mcuthbert/Play26

    Upgrade to Play 2.6

commit f2f0e2609ef978bdfd9477c6ce1e60544290a3f5
Author: mcuthbert <mcuthbert@apple.com>
Date:   Fri May 18 13:52:07 2018 -0700

    Upgrading Play to Play2.6. Supporting HTTPS for Oauth authentication in OpenStreetMap

commit d0749d7f3445a7369bc62985bb12878ab2daffe4
Author: mcuthbert <mcuthbert@apple.com>
Date:   Wed May 16 11:49:38 2018 -0700

    Initial updates for Play 2.6

commit 14d2b9b9126d7da7812c15069b521e30e17140ea
Merge: b5ae0e8 06b1297
Author: Michael Cuthbert <mgcuthbert@hotmail.com>
Date:   Wed May 16 07:52:43 2018 -0700

    Merge pull request #420 from maproulette/dev

    Merge from dev to master

commit 85611f629f749e135a91415e826a29d168dbd2f1
Merge: 27587c6 542e758
Author: Michael Cuthbert <mcuthbert@apple.com>
Date:   Fri May 11 14:23:07 2018 -0700

    Merge pull request #142 from mcuthbert/Release

    Preparation for Release of MapRoulette

commit 542e758fafdcbd10a497bde5470b5c0411673e0b
Author: mcuthbert <mcuthbert@apple.com>
Date:   Fri May 11 13:27:53 2018 -0700

    Handle redirects for UI on error correctly.

commit d7a633dfd48f971b7bb8274d7f1151b9a2a85b25
Author: mcuthbert <mcuthbert@apple.com>
Date:   Wed May 9 07:55:34 2018 -0700

    Switching default UI to be the new UI.

commit 27587c644ef3167d605486e4a2537f5939385743
Merge: 7fd79f7 99a3a2c
Author: Michael Cuthbert <mcuthbert@apple.com>
Date:   Mon May 7 09:33:14 2018 -0700

    Merge pull request #141 from mcuthbert/master

    Merge

commit 99a3a2cf4edd71954e6834298c4e81e89bcd9bfe
Merge: fa04394 7fd79f7
Author: mcuthbert <mcuthbert@apple.com>
Date:   Mon May 7 09:30:32 2018 -0700

    Merge remote-tracking branch 'upstream/master'

commit fa043945fd9f7ca935ec42df5fd18e0e9ab0f3ec
Merge: 1f64f74 b5ae0e8
Author: mcuthbert <mcuthbert@apple.com>
Date:   Mon May 7 09:29:54 2018 -0700

    Merge remote-tracking branch 'external/master'

commit b5ae0e81fc2ab5232f8b06242a590be6469db043
Merge: e78c81f 26341d1
Author: Michael Cuthbert <mgcuthbert@hotmail.com>
Date:   Tue Apr 24 14:12:43 2018 -0700

    Merge pull request #412 from maproulette/dev

    Merge from dev to master for release

commit 7fd79f7ebd8ea0e598f28a89625aeb217230608d
Merge: c69e9d9 1f64f74
Author: Michael Cuthbert <mcuthbert@apple.com>
Date:   Tue Apr 24 14:09:22 2018 -0700

    Merge pull request #139 from mcuthbert/master

    Added API to move a challenge from one project to another.

commit 1f64f742b8a93a3a115967ca5c6ac9b11757d7d8
Author: mcuthbert <mcuthbert@apple.com>
Date:   Tue Apr 24 13:06:27 2018 -0700

    Added API to move a challenge from one project to another.

commit c69e9d924e7059eb033d4bf189c4efa4302aacf3
Merge: f8883b7 eecf12b
Author: Michael Cuthbert <mcuthbert@apple.com>
Date:   Tue Apr 24 09:50:08 2018 -0700

    Merge pull request #138 from mcuthbert/master

    Merge leaderboard API's from public repo

commit eecf12ba2c4934a7c4d7a8d8b0456beb1deec9a6
Merge: 7be1a10 9415e37
Author: mcuthbert <mcuthbert@apple.com>
Date:   Tue Apr 24 09:48:45 2018 -0700

    Merge remote-tracking branch 'external/dev'

commit 7be1a1083bdd541ca4f307d49df8bace079bfd1b
Author: mcuthbert <mcuthbert@apple.com>
Date:   Thu Apr 19 09:04:36 2018 -0700

    Updating readme to include information about the API_HOST variable that is required to start the server

commit e78c81fd14b672c930c318a8451227494a3cb07f
Merge: e3cefc4 4830086
Author: Michael Cuthbert <mgcuthbert@hotmail.com>
Date:   Wed Apr 18 14:56:54 2018 -0700

    Merge pull request #405 from maproulette/dev

    Merge from dev to master for Release

commit f8883b7b8f024a7686d2b0d0ddce9902d111670a
Merge: 4998704 5c2881a
Author: Michael Cuthbert <mcuthbert@apple.com>
Date:   Wed Apr 18 08:28:05 2018 -0700

    Merge pull request #137 from mcuthbert/KeepRight

    KeepRight Integration

commit 5c2881a0b9b56c1730495446eedad994e3f72188
Author: Michael Cuthbert <mcuthbert@apple.com>
Date:   Wed Apr 18 08:27:22 2018 -0700

    disabling keep right by default initially.

commit fb37d3676a29e306611efd6f16044493013b297c
Author: mcuthbert <mcuthbert@apple.com>
Date:   Tue Apr 17 21:14:50 2018 -0700

    Removing extraneous country bounding boxes

commit 84d73d3188615ddfdfe846fb7a80b31b02496bc5
Merge: 89b9688 4998704
Author: mcuthbert <mcuthbert@apple.com>
Date:   Tue Apr 17 14:28:31 2018 -0700

    Merge remote-tracking branch 'upstream/master' into keepright

commit 4998704c5fc15287570b6680c79784c6cb7e3433
Merge: dd12040 61b0b85
Author: Michael Cuthbert <mcuthbert@apple.com>
Date:   Tue Apr 17 12:03:18 2018 -0700

    Merge pull request #136 from mcuthbert/master

    Connection Fixes

commit 61b0b8543dbe2ab24b85df689695bc4d4e3eb1ee
Merge: 6253037 b70b2f2
Author: mcuthbert <mcuthbert@apple.com>
Date:   Tue Apr 17 08:53:58 2018 -0700

    Merge remote-tracking branch 'external/dev'

commit 89b9688a2109e7589227954c387fbedde1b41ecd
Author: mcuthbert <mcuthbert@apple.com>
Date:   Mon Apr 9 14:55:36 2018 -0700

    Adding some configuration and making the requests a little more efficient.

commit de59852349332c20ed5724a3b0c510da0c256076
Merge: 50e3b58 6253037
Author: mcuthbert <mcuthbert@apple.com>
Date:   Thu Apr 5 12:09:29 2018 -0700

    Merge branch 'master' into KeepRight

commit 62530377488a75981012dd85c9e4f5ac2deec1bd
Merge: 02b1098 c1f7460
Author: Michael Cuthbert <mcuthbert@apple.com>
Date:   Thu Apr 5 11:56:01 2018 -0700

    Merge pull request #1 from mcuthbert/connUpdates

    Fixing Connection Issues

commit 02b1098afd02982d7086461d1a2d1737341139e3
Author: mcuthbert <mcuthbert@apple.com>
Date:   Thu Apr 5 11:50:20 2018 -0700

    Fixing bootstrap update for super users in unique case when all users are defined as super users.

commit c1f746048d51bf100ee23bf55f8da17fa1ce24ca
Author: mcuthbert <mcuthbert@apple.com>
Date:   Thu Apr 5 11:24:39 2018 -0700

    Large update to fix issue with the TransactionManager class

commit 2b5679444c0fedbba46c624ed50436df7a5d4319
Author: mcuthbert <mcuthbert@apple.com>
Date:   Thu Apr 5 10:32:31 2018 -0700

    Fixing an issue with initializing super users from the configuration

commit 50e3b589c87410afbb88a47e454d99f89e42d641
Author: mcuthbert <mcuthbert@apple.com>
Date:   Thu Apr 5 10:30:09 2018 -0700

    Initial checkin for KeepRight Integration

commit dd120400a86ae018c227de631502cf1cfbe08845
Merge: 1d7b163 3966122
Author: Michael Cuthbert <mcuthbert@apple.com>
Date:   Tue Apr 3 07:59:52 2018 -0700

    Merge pull request #134 from mcuthbert/master

    Task Cluster API's

commit 396612247fe8c44e76aa0e83faae3bfe22e4b1d1
Author: mcuthbert <mcuthbert@apple.com>
Date:   Mon Apr 2 16:42:23 2018 -0700

    Added multi polygon bounding box for Task Cluster.

commit ecf87114413ffe6bf657b9be8c80fd5f5cb022a8
Author: mcuthbert <mcuthbert@apple.com>
Date:   Mon Apr 2 16:27:44 2018 -0700

    Added API to retrieve task cluster information.
    Added API to allow users to add/remove a list of users to/from a Project.

commit e3cefc44cde347eda47fe29b4695abc1acea274c
Merge: 1e11ba4 55c27e4
Author: Michael Cuthbert <mgcuthbert@hotmail.com>
Date:   Wed Mar 28 08:03:05 2018 -0700

    Merge pull request #398 from maproulette/dev

    Merge from dev to master

commit 1d7b163f4bf1bca0d76433a3bbe6b132bd9c4c90
Merge: 542feea 0244a16
Author: Michael Cuthbert <mcuthbert@apple.com>
Date:   Wed Mar 28 08:00:32 2018 -0700

    Merge pull request #133 from mcuthbert/master

    Making sure that the location and geometry of a task is always up to …

commit 0244a1637956e482dd60b68f161a41380bc7c73a
Author: mcuthbert <mcuthbert@apple.com>
Date:   Wed Mar 28 07:52:48 2018 -0700

    Making sure that the location and geometry of a task is always up to date.

commit 542feea494792d74a174bc793f0a2d0af9d8e743
Merge: a27660d 1ded14a
Author: Michael Cuthbert <mcuthbert@apple.com>
Date:   Tue Mar 27 11:22:25 2018 -0700

    Merge pull request #131 from mcuthbert/master

    Fixing issue with updating the bounds of a Challenge.

commit 1ded14a1695d8c6805fbd8387e9df6300e19cdda
Author: mcuthbert <mcuthbert@apple.com>
Date:   Tue Mar 27 11:12:22 2018 -0700

    Fixing minor issues related to adding and removing users from groups.

commit c1f27b7ce05055fb126048dd7ddb3c6167d17f39
Author: mcuthbert <mcuthbert@apple.com>
Date:   Tue Mar 27 10:00:13 2018 -0700

    Fixing issue with updating the bounds of a Challenge.

commit a27660dc29ef4c24d53117836b56dd614b9d28da
Merge: 496b696 6399193
Author: Michael Cuthbert <mcuthbert@apple.com>
Date:   Tue Mar 27 07:57:49 2018 -0700

    Merge pull request #130 from mcuthbert/master

    Primarily fixes to Unit test and updates to Permissions

commit 6399193a12b4d9323eda17d10c786653ae2b03d4
Author: mcuthbert <mcuthbert@apple.com>
Date:   Mon Mar 26 23:04:54 2018 -0700

    Fixed Unit tests. Cleaned up Permissions, added new Write and ReadOnly groups. Fixed comments retrieval for tasks.

commit 496b696e506dd5d38135659e2d0868b9bbfef0a0
Merge: ed9f6fb e082b6f
Author: Michael Cuthbert <mcuthbert@apple.com>
Date:   Wed Mar 21 20:06:59 2018 -0700

    Merge pull request #129 from mcuthbert/master

    Adds linebyline geojson in extract

commit e082b6f0e933690f9be0215128b1a4a318cc7ddd
Merge: 7260378 ed9f6fb
Author: mcuthbert <mcuthbert@apple.com>
Date:   Wed Mar 21 15:51:36 2018 -0700

    Merge remote-tracking branch 'upstream/master'

commit 7260378bd2762d4099eb5f8d42d6a130edc9e1f1
Author: mcuthbert <mcuthbert@apple.com>
Date:   Wed Mar 21 15:51:22 2018 -0700

    Add lineByLine geoJSON in extract of challenge.

commit ed9f6fbabd41a527bcb2cd2fe1a6868a18b9ef7d
Merge: 3d61b43 6daef71
Author: Michael Cuthbert <mcuthbert@apple.com>
Date:   Wed Mar 21 08:24:26 2018 -0700

    Merge pull request #127 from mcuthbert/master

    Fixing bug in add comments to tasks

commit 6daef71ff40e4c2064b4d77946f9bf113cffc2ad
Author: mcuthbert <mcuthbert@apple.com>
Date:   Tue Mar 20 20:17:07 2018 -0700

    Fixing bug in add comments to tasks

commit 3d61b43e5a309d2ec9e21a926bdbab47b0ed51ef
Merge: 2bdf15c 294b0ed
Author: Michael Cuthbert <mcuthbert@apple.com>
Date:   Tue Mar 20 09:58:04 2018 -0700

    Merge pull request #126 from mcuthbert/master

    Make LineByLine GeoJSON more robust

commit 294b0edcdcf7853a63fa988544caa66da26d286e
Author: mcuthbert <mcuthbert@apple.com>
Date:   Tue Mar 20 09:37:48 2018 -0700

    Updating return type to None for Flatmap

commit ee5908b173981b58515a279d472c9568593f614f
Author: mcuthbert <mcuthbert@apple.com>
Date:   Tue Mar 20 09:30:22 2018 -0700

    Updated line by line GeoJSON code so it handles failures more robustly.

commit 2bdf15cdad265a05852fb5257fbff317f25ae843
Merge: 8d8a17e 5ab69d9
Author: Michael Cuthbert <mcuthbert@apple.com>
Date:   Tue Mar 20 08:19:28 2018 -0700

    Merge pull request #125 from mcuthbert/master

    Added status_message for building challenge tasks.

commit 5ab69d9a3546712a7ac2e83dcd51c8ca6d59f501
Author: mcuthbert <mcuthbert@apple.com>
Date:   Mon Mar 19 21:53:31 2018 -0700

    Added status_message for building challenge tasks. So that during failures there is a message included that will explain why the building tasks failed.

commit 8d8a17e6cd0c75076bbe816b04d8eaa35dcda2aa
Merge: a19d71f b43fad2
Author: Michael Cuthbert <mcuthbert@apple.com>
Date:   Sat Mar 17 00:12:45 2018 -0700

    Merge pull request #114 from mcuthbert/master

    Making minor update to the Old UI to handle line by line GeoJSON corr…

commit b43fad2c6348a33411da0f6a2e48fb736ea49dcf
Author: mcuthbert <mcuthbert@apple.com>
Date:   Sat Mar 17 00:11:53 2018 -0700

    Making minor update to the Old UI to handle line by line GeoJSON correctly

commit a19d71f4ca54402bd4e0a50b8d255cef786f84fd
Merge: 2e0fb12 998e928
Author: Michael Cuthbert <mcuthbert@apple.com>
Date:   Fri Mar 16 23:30:00 2018 -0700

    Merge pull request #113 from mcuthbert/master

    Update to various methods adding tasks to a challenge

commit 998e928c97bee6e04f097e223666cab468e07b45
Merge: 0147de6 2e0fb12
Author: mcuthbert <mcuthbert@apple.com>
Date:   Fri Mar 16 23:22:25 2018 -0700

    Merge remote-tracking branch 'upstream/master'

commit 0147de65aae633511ec59a1d51654bcfdbd3d166
Author: mcuthbert <mcuthbert@apple.com>
Date:   Fri Mar 16 23:21:26 2018 -0700

    Updating various methods of creating new tasks for a challenge.

commit 345cced1377b23c3f759db9ed3cbe01f51c6ca8e
Author: mcuthbert <mcuthbert@apple.com>
Date:   Thu Mar 15 23:04:38 2018 -0700

    Added ability to create Virtual Challenges based on a list of task IDs. Added ability to create challenges from multiple json files.

commit 2e0fb12d37e36956c9add8da96d018063515af49
Merge: 10bfa06 374c196
Author: Michael Cuthbert <mcuthbert@apple.com>
Date:   Thu Mar 15 09:29:18 2018 -0700

    Merge pull request #111 from mcuthbert/master

    Fix owner ID issue on project creation

commit 374c1965a84fa1e05557868a0cc21b6b19cd852e
Merge: 0b211b3 10bfa06
Author: mcuthbert <mcuthbert@apple.com>
Date:   Wed Mar 14 21:36:48 2018 -0700

    Merge remote-tracking branch 'upstream/master'

commit 0b211b3140aade796b62cd1ed86c5f82e2f45df6
Author: mcuthbert <mcuthbert@apple.com>
Date:   Wed Mar 14 21:35:30 2018 -0700

    Fixing issue that was not setting the owner of a users project home initially.

commit 10bfa0603c7b347868f520803a047303371f0657
Merge: 214530a 6772d46
Author: Michael Cuthbert <mcuthbert@apple.com>
Date:   Wed Mar 14 14:42:12 2018 -0700

    Merge pull request #110 from mcuthbert/master

    Fixing syntax error in upgrade script

commit 6772d469e91055c92408552d66ea6666da2df97c
Author: mcuthbert <mcuthbert@apple.com>
Date:   Wed Mar 14 14:41:44 2018 -0700

    Fixing syntax error in upgrade script

commit 214530a566032393f494156f5434301c0dc0a9d9
Merge: 7bcdbdc 097addc
Author: Michael Cuthbert <mcuthbert@apple.com>
Date:   Wed Mar 14 14:40:50 2018 -0700

    Merge pull request #109 from mcuthbert/master

    Fixing syntax error in upgrade script

commit 097addc17430f76920befae0df6f7075c25c3129
Author: mcuthbert <mcuthbert@apple.com>
Date:   Wed Mar 14 14:39:57 2018 -0700

    Fixing syntax error in upgrade script

commit 7bcdbdc73273b2271a1e8ae3a39b2a06cd7a2c74
Merge: 69753c3 604e0e8
Author: Michael Cuthbert <mcuthbert@apple.com>
Date:   Wed Mar 14 14:15:28 2018 -0700

    Merge pull request #108 from mcuthbert/master

    Updating old UI so that it uses the immediate deletion of projects an…

commit 604e0e81a52926a16d568b525ab5f2562686b4d9
Author: mcuthbert <mcuthbert@apple.com>
Date:   Wed Mar 14 14:02:21 2018 -0700

    Updating old UI so that it uses the immediate deletion of projects and tasks instead of delayed deletion.

commit 69753c38ad92d1c2c32b297e83715276be637d0b
Merge: 97ba622 4ec2c37
Author: Michael Cuthbert <mcuthbert@apple.com>
Date:   Wed Mar 14 09:21:44 2018 -0700

    Merge pull request #107 from mcuthbert/master

    Adding new API to retrieve all comments for Projects

commit 4ec2c3730e19c024c4ede1a537d89643b45ff963
Author: mcuthbert <mcuthbert@apple.com>
Date:   Tue Mar 13 22:38:35 2018 -0700

    Adding new API to retrieve all comments for Projects

commit 97ba622800be6d35f1dd4167b017416a331f9445
Merge: 3e261a2 2df462a
Author: Michael Cuthbert <mcuthbert@apple.com>
Date:   Fri Mar 9 10:14:04 2018 -0800

    Merge pull request #106 from mcuthbert/master

    Adding a optional limit on the number of clustered points returned.

commit 2df462ac4eac6b918ba1f03b35c049f4c151ec7e
Author: mcuthbert <mcuthbert@apple.com>
Date:   Fri Mar 9 09:04:27 2018 -0800

    Adding a optional limit on the number of clustered points returned.

commit 3e261a205e5df523cf761d2c8a7aab52cb384b13
Merge: 797e560 0f4fe00
Author: Michael Cuthbert <mcuthbert@apple.com>
Date:   Thu Mar 8 14:46:30 2018 -0800

    Merge pull request #105 from mcuthbert/master

    Fixing minor SQL error

commit 0f4fe000f799adf9683748b296baf38fb77953c6
Merge: 8a38cf8 797e560
Author: mcuthbert <mcuthbert@apple.com>
Date:   Thu Mar 8 14:46:06 2018 -0800

    Merge remote-tracking branch 'upstream/master'

commit 8a38cf86ca70b4957a98d29baed1a6ed4a45ebca
Author: mcuthbert <mcuthbert@apple.com>
Date:   Thu Mar 8 14:44:11 2018 -0800

    Fixing minor sql error

commit 797e560cfcb8bda1e8afe7e79ba15b9589f071c4
Author: Michael Cuthbert <mcuthbert@apple.com>
Date:   Thu Mar 8 14:37:33 2018 -0800

    Removing SSL options

commit b35d7afd16f5f57814d5bf6459484bb5d1074894
Merge: ee4d724 d4dad9e
Author: Michael Cuthbert <mcuthbert@apple.com>
Date:   Thu Mar 8 14:11:43 2018 -0800

    Merge pull request #104 from mcuthbert/master

    Minor bug fixes

commit d4dad9e864f14386d7e3e5fbcac2b03996c6a6df
Author: mcuthbert <mcuthbert@apple.com>
Date:   Thu Mar 8 14:09:55 2018 -0800

    Fixing some minor API errors produced from previous PRs.

commit 76a1c6c344e4985cf548aeedd28e9586b3b0df70
Author: mcuthbert <mcuthbert@apple.com>
Date:   Wed Mar 7 15:25:53 2018 -0800

    Fixed bug causing sql errors

commit ee4d724a908a65616dd77a7c5ca84450e1fb05d3
Merge: 79b2f32 3fbab50
Author: Michael Cuthbert <mcuthbert@apple.com>
Date:   Wed Mar 7 14:23:20 2018 -0800

    Merge pull request #103 from mcuthbert/APIUpdates_Alpha6

    Continued API Updates

commit 3fbab504980601725f4498dfa569cd4e0d917089
Merge: ee0ffb0 79b2f32
Author: mcuthbert <mcuthbert@apple.com>
Date:   Wed Mar 7 14:03:12 2018 -0800

    Merge remote-tracking branch 'upstream/master' into APIUpdates_Alpha6

commit 79b2f329def4f4d8a2676251ca72002a656ad628
Merge: e419cd1 21c5c6f
Author: Michael Cuthbert <mcuthbert@apple.com>
Date:   Wed Mar 7 13:57:04 2018 -0800

    Merge pull request #102 from mcuthbert/APIUpdates_Alpha5

    API Updates

commit 21c5c6f6d22effef1766a72f5bbcd47f3d5a1214
Author: mcuthbert <mcuthbert@apple.com>
Date:   Wed Mar 7 13:52:32 2018 -0800

    Removing references to Mapillary as that will come in a later PR.

commit ee0ffb0fcbbb29003c54f8539677923948c716e0
Author: mcuthbert <mcuthbert@apple.com>
Date:   Wed Mar 7 13:32:48 2018 -0800

    Updating SearchParameters to use Lists for ProjectId's and ChallengeId's. Including ParentName and ParentId in Clustered Objects.

commit b9b3b24f3b296ce4a13a5f9efbea242616227375
Merge: 2dcd17c e419cd1
Author: mcuthbert <mcuthbert@apple.com>
Date:   Wed Mar 7 13:14:24 2018 -0800

    Merge remote-tracking branch 'upstream/master' into APIUpdates_Alpha6

commit e419cd12095e0c583d93581c7dad777ec29e881c
Merge: 155a06d 634cebd
Author: Michael Cuthbert <mcuthbert@apple.com>
Date:   Tue Mar 6 20:29:51 2018 -0800

    Merge pull request #101 from mcuthbert/GithubChallenges

    New Creation and Extraction API's

commit 155a06da5c37f99a589c3ed438137dd4a74b66d7
Merge: 15cd1c6 b0826d1
Author: Michael Cuthbert <mcuthbert@apple.com>
Date:   Tue Mar 6 16:23:49 2018 -0800

    Merge pull request #100 from mcuthbert/actionUpdates

    OSM Matcher

commit 2dcd17c51c8b2f91b61a630fdad1861ac37d94c5
Author: mcuthbert <mcuthbert@apple.com>
Date:   Mon Feb 26 22:19:30 2018 -0800

    Adding delayed deletion functionality. That will instead set a deleted flag and then have a scheduled job to delete the projects and/or challenges at a later date.

commit 8f1017cc63bfb4d1340fab2b7f01eaeb866d75f1
Author: mcuthbert <mcuthbert@apple.com>
Date:   Mon Feb 26 19:32:11 2018 -0800

    Injecting osmid into the properties of an object.

commit 00522131cdd55f6c9e9167489a6f667ea6e386f5
Author: mcuthbert <mcuthbert@apple.com>
Date:   Wed Feb 21 21:19:35 2018 -0800

    Added priority to clustered tasks

commit 42db2fd0fe3e2c2ded397cc51b12b64c7f92ab74
Author: mcuthbert <mcuthbert@apple.com>
Date:   Wed Feb 21 20:59:07 2018 -0800

    Added refresh profile for the user to the standard API

commit 0a07ef2ab8c54b525e67dbf0005fe3b3d44d00c2
Author: mcuthbert <mcuthbert@apple.com>
Date:   Wed Feb 21 14:52:05 2018 -0800

    Added API's clone and rebuild for challenges

commit d0a1bb96de54ad8a0a5d753b9b5621eb848ab6ad
Author: mcuthbert <mcuthbert@apple.com>
Date:   Wed Feb 21 08:31:53 2018 -0800

    Through query string variable "mapillary=true" can request tasks include a list of mapillary image keys that fall inside of the bounds of it's geometry.

commit 820ba723831b349d675816d6f916e006ee175021
Author: mcuthbert <mcuthbert@apple.com>
Date:   Mon Feb 19 16:50:06 2018 -0800

    Using await in injection method to pull close mapillary images for task

commit f16551078372c96a2a072d2f2959424fb3e5962b
Merge: 90ccad2 634cebd
Author: mcuthbert <mcuthbert@apple.com>
Date:   Mon Feb 19 08:49:07 2018 -0800

    Merge branch 'GithubChallenges' into mapillary

commit 634cebdf0db788130aeb4b8d5bc6c7217f403fc1
Merge: 35865c7 b0826d1
Author: mcuthbert <mcuthbert@apple.com>
Date:   Mon Feb 19 08:33:09 2018 -0800

    Merge remote-tracking branch 'origin/actionUpdates' into GithubChallenges

commit b0826d13a0f45d75a75bb9035eb735faf5557b9a
Author: mcuthbert <mcuthbert@apple.com>
Date:   Mon Feb 19 08:23:19 2018 -0800

    Allowing Scheduled osm matcher, on demand osm matcher, and task osm matcher to be enabled separately. All defaulted to false.

commit 2b391c21aa9be2f58bb59259c8b3908862b29280
Author: mcuthbert <mcuthbert@apple.com>
Date:   Mon Feb 19 08:02:23 2018 -0800

    Defaulting matching changesets to disabled.

commit 90ccad269dcc8f1b251c2a9818ba0d57506b7201
Author: mcuthbert <mcuthbert@apple.com>
Date:   Sat Feb 17 21:40:16 2018 -0800

    Mapillary config

commit 26e4490c802b1dcb31e629a58d90112706798a51
Merge: 35865c7 e918991
Author: mcuthbert <mcuthbert@apple.com>
Date:   Fri Feb 16 16:08:33 2018 -0800

    Merge branch 'actionUpdates' into mapillary

commit e9189918c46774f1b56296605a3e27d999b0ad7e
Author: mcuthbert <mcuthbert@apple.com>
Date:   Fri Feb 16 15:49:03 2018 -0800

    Added a scheduled job to run every 24hours to match the OSM changesets to tasks.

commit afb5a4c20cf1a6015c26f3cd8eeb893dae6270ee
Author: mcuthbert <mcuthbert@apple.com>
Date:   Thu Feb 15 16:01:20 2018 -0800

    Updated changeset matcher, so that when matching after the fact it will look for changesets before and after the user actually set the status.

commit 35865c74182247d4669a2dbb77cece7b81e30752
Author: mcuthbert <mcuthbert@apple.com>
Date:   Thu Feb 15 11:21:00 2018 -0800

    Adding API call to extract a challenge from MapRoulette. Those files then can be used to build a challenge somewhere else.

commit e47f77e37a015dc82e96d6657f75d53e0da1b174
Author: mcuthbert <mcuthbert@apple.com>
Date:   Mon Feb 12 15:09:46 2018 -0800

    Create challenges from github

commit ad6bdfb83dab6619ed7feffe5d39f8b8dc111d1a
Merge: 68005db 15cd1c6
Author: mcuthbert <mcuthbert@apple.com>
Date:   Mon Feb 12 07:57:17 2018 -0800

    Merge remote-tracking branch 'upstream/master' into actionUpdates

commit 68005db0f4cdf4a927f067374299b99908620368
Author: mcuthbert <mcuthbert@apple.com>
Date:   Thu Feb 8 15:11:24 2018 -0800

    Adding API to force challenges to look for OSM changeset updates for it's tasks. Including infoLink column for future use. Added config option to turn off changeset matching.

commit 090139ec81e3d8cf51b5d44449813b37adfc560b
Author: mcuthbert <mcuthbert@apple.com>
Date:   Thu Feb 8 13:31:45 2018 -0800

    Adding job that can be manually run to match osm changeset ids to tasks

commit 264da9b263a4a42a3655578e3a23f344da98e91a
Author: mcuthbert <mcuthbert@apple.com>
Date:   Thu Feb 8 11:27:30 2018 -0800

    Adding function that will match a fix to a changeset that the user actually made in OSM.

commit 15cd1c6b52f290d14999deee63b1e6c42a8dc8fa
Merge: c849091 e00d83a
Author: Michael Cuthbert <mcuthbert@apple.com>
Date:   Tue Feb 6 14:28:59 2018 -0800

    Merge pull request #98 from mcuthbert/master

    Adding custom properties string for user.

commit dcda82953f9e68325c1af7c3027ce378af642d3e
Author: mcuthbert <mcuthbert@apple.com>
Date:   Tue Feb 6 10:45:06 2018 -0800

    Adding parent_id and parent_name to the user activity response

commit e00d83ae9db85103ebd7395198b6c2d6f14f3829
Author: mcuthbert <mcuthbert@apple.com>
Date:   Tue Feb 6 09:34:55 2018 -0800

    Adding custom properties string for user.

commit c8490912dae9b73516a93545f3c88d6d695a2fb5
Merge: eb642d7 e3f74c6
Author: Michael Cuthbert <mcuthbert@apple.com>
Date:   Thu Feb 1 15:26:09 2018 -0800

    Merge pull request #97 from mcuthbert/master

    Fixing bug which could cause users to fall into an infinite loop when…

commit e3f74c670a3eb11fcc577604587671865f625dca
Author: mcuthbert <mcuthbert@apple.com>
Date:   Thu Feb 1 14:04:18 2018 -0800

    Fixing bug which could cause users to fall into an infinite loop when looking at different tasks and using the proximity flag.

commit eb642d7ab0983607d78766d98c50f485529461c1
Merge: 7ac79c8 5f65286
Author: Michael Cuthbert <mcuthbert@apple.com>
Date:   Thu Feb 1 09:02:29 2018 -0800

    Merge pull request #96 from mcuthbert/master

    Updating API to include next/previous task functions for Challenges a…

commit 5f652861cbda2f99bf18d447f3d2cae7a3ac4ea8
Author: mcuthbert <mcuthbert@apple.com>
Date:   Wed Jan 31 15:46:23 2018 -0800

    Updating API to include next/previous task functions for Challenges and VirtualChallenges

commit 7ac79c8ef3c910347cdbd30e52521e14d83a2259
Merge: c36a60e fb74026
Author: Michael Cuthbert <mcuthbert@apple.com>
Date:   Wed Jan 31 09:15:59 2018 -0800

    Merge pull request #94 from mcuthbert/master

    Get random tasks by proximity

commit fb74026955232b42f327325fae3f794d622596cd
Merge: fffbfc5 5bbc024
Author: mcuthbert <mcuthbert@apple.com>
Date:   Wed Jan 31 09:13:51 2018 -0800

    Merge remote-tracking branch 'external/master'

commit fffbfc581309d6b07e3cef299a7c478510c78884
Merge: 4082f14 c36a60e
Author: mcuthbert <mcuthbert@apple.com>
Date:   Fri Jan 26 15:27:46 2018 -0800

    Merge remote-tracking branch 'upstream/master'

commit 4082f14693d577e777831bba693e3105bd71f0fd
Author: mcuthbert <mcuthbert@apple.com>
Date:   Fri Jan 26 15:27:04 2018 -0800

    Adding ability to find random tasks by proximity.

commit c36a60edc1e3b44cdb547b13382976f922660c9a
Merge: 76b96dd 26483f1
Author: Michael Cuthbert <mcuthbert@apple.com>
Date:   Fri Jan 26 14:53:06 2018 -0800

    Merge pull request #93 from mcuthbert/master

    Making sure that the ExtendedFind API respects the enabled flags for …

commit 26483f107a855e941d9b4124071f9df56fcb3377
Author: mcuthbert <mcuthbert@apple.com>
Date:   Fri Jan 26 14:33:53 2018 -0800

    Making sure that the ExtendedFind API respects the enabled flags for projects and challenges. By default it will only show enabled projects and challenges.

commit 76b96ddececaa2491540744891403840f813be7d
Merge: 35eb940 62135ae
Author: Michael Cuthbert <mcuthbert@apple.com>
Date:   Fri Jan 26 08:43:47 2018 -0800

    Merge pull request #92 from mcuthbert/master

    Fixing bug where updating all task locations for a challenge would th…

commit 62135ae49772b1fa6cc8d061ceeeff2975fbc0af
Author: mcuthbert <mcuthbert@apple.com>
Date:   Fri Jan 26 08:41:42 2018 -0800

    Fixing bug where updating all task locations for a challenge would throw an exception due to the way that the query was being executed.

commit 35eb940f7deead126e31223e3689ecebdeffe2f4
Merge: df320b3 49eddf6
Author: Michael Cuthbert <mcuthbert@apple.com>
Date:   Thu Jan 25 08:09:11 2018 -0800

    Merge pull request #91 from mcuthbert/master

    Cleaned up TaskDAL insert/update functions so that they always run th…

commit 49eddf687f9677d29d92ad7e96aa2eac3d212596
Author: mcuthbert <mcuthbert@apple.com>
Date:   Mon Jan 22 15:27:37 2018 -0800

    Cleaned up TaskDAL insert/update functions so that they always run through the mergeUpdate function. Added non-scheduled job to update locations of tasks as a backup in case the location is not updated correctly for some reason.

commit df320b3cced6b3fa929fc540c2a0c4cef442d13f
Merge: 31c92d7 921a35f
Author: Michael Cuthbert <mcuthbert@apple.com>
Date:   Mon Jan 22 15:10:44 2018 -0800

    Merge pull request #68 from mcuthbert/VirtualChallenge

    Virtual challenges

commit 921a35fd07569fad9ee57d01a848ea2a74208918
Merge: 066103b 31c92d7
Author: mcuthbert <mcuthbert@apple.com>
Date:   Mon Jan 22 14:28:45 2018 -0800

    Merge remote-tracking branch 'upstream/master' into VirtualChallenge

commit 31c92d74877178944cc01e1d4dc6b7fc813aae86
Merge: 5508836 e6c6c81
Author: Michael Cuthbert <mcuthbert@apple.com>
Date:   Fri Jan 19 09:26:29 2018 -0800

    Merge pull request #74 from mcuthbert/master

    Update handling of MR3 content

commit e6c6c818db9470480754a00df54e9b8c61fde61b
Merge: fcdc7b3 5508836
Author: mcuthbert <mcuthbert@apple.com>
Date:   Thu Jan 18 23:13:54 2018 -0800

    Merge remote-tracking branch 'upstream/master'

commit 5508836cb41b0a40a3fb7d9202367c170f9f5e87
Merge: 54d1cbd bed0574
Author: Michael Cuthbert <mcuthbert@apple.com>
Date:   Thu Jan 18 14:57:41 2018 -0800

    Merge pull request #73 from mcuthbert/updateTaskBug

    Was setting the incorrect id for the owner of a project through the API

commit fcdc7b3912c23acce5644a0cd243684201066e8e
Merge: 35c3696 a74b33e
Author: mcuthbert <mcuthbert@apple.com>
Date:   Thu Jan 18 14:22:51 2018 -0800

    Merge branch 'master' of github.geo.apple.com:mcuthbert/MapRouletteV2

commit 35c3696222279d30fd7c545ccbb0c7d9973c306f
Merge: ff4c074 54d1cbd
Author: mcuthbert <mcuthbert@apple.com>
Date:   Thu Jan 18 14:22:23 2018 -0800

    Merge remote-tracking branch 'upstream/master'

commit bed0574d50e5de4cc6f09f0eb61ee39c27782611
Author: mcuthbert <mcuthbert@apple.com>
Date:   Thu Jan 18 14:14:48 2018 -0800

    Was setting the incorrect id for the owner of a project through the API

commit 54d1cbdd9667948a753557cfacb1a55962ef9af4
Merge: 71a703e 4924cac
Author: Michael Cuthbert <mcuthbert@apple.com>
Date:   Thu Jan 18 13:56:34 2018 -0800

    Merge pull request #72 from mcuthbert/updateTaskBug

    Fixing permission issues

commit 4924cacd4ff2c6091a4b87ef02fb9151c2ccb178
Author: mcuthbert <mcuthbert@apple.com>
Date:   Thu Jan 18 12:41:53 2018 -0800

    Fixing permission issues

commit 71a703efc35505c70e2dbe3347c797161fa0520c
Merge: e9d5106 fb61a4d
Author: Michael Cuthbert <mcuthbert@apple.com>
Date:   Wed Jan 17 08:17:11 2018 -0800

    Merge pull request #71 from mcuthbert/updateTaskBug

    Removing updateLocations function from update process and letting sch…

commit fb61a4dffad70e40f568401bbf3421bc808fb5ad
Author: mcuthbert <mcuthbert@apple.com>
Date:   Tue Jan 16 13:09:47 2018 -0800

    Removing updateLocations function from update process and letting scheduled job handled it

commit a74b33e0a85487ea2c6af7374c75ba26e88088a4
Author: Michael Cuthbert <mcuthbert@apple.com>
Date:   Tue Jan 16 08:34:41 2018 -0800

    Updating default location to static path for maproulette-frontend

commit ff4c0747ca4f066d5329a0288601ffa8f210f699
Author: mcuthbert <mcuthbert@apple.com>
Date:   Sat Jan 13 22:08:53 2018 -0800

    Updating the way that MR3 is handled through the MR2 server.

commit e9d51067616320a1b88aa05a72622d9f0a453773
Merge: e4032b6 bb9c40e
Author: Michael Cuthbert <mcuthbert@apple.com>
Date:   Thu Jan 11 09:55:18 2018 -0800

    Merge pull request #70 from mcuthbert/master

    Updated Challenge creation so that it handles overpass queries and re…

commit bb9c40eb4580e6e6653c0002405878eaef4b229c
Author: mcuthbert <mcuthbert@apple.com>
Date:   Wed Jan 10 21:14:48 2018 -0800

    Updated Challenge creation so that it handles overpass queries and remoteGeoJSON correctly, exactly like the FormEditController.

commit e4032b6bcc651891913dc8debb4aea6eccb28ade
Merge: b7e7bac 187fdea
Author: Michael Cuthbert <mcuthbert@apple.com>
Date:   Mon Jan 8 16:12:24 2018 -0800

    Merge pull request #69 from mcuthbert/master

    Handling bug in transforming the challenge locations. This only occur…

commit 187fdea300954b94d9e6663a3ccfc977a45a60e0
Merge: 9c91bc9 b7e7bac
Author: mcuthbert <mcuthbert@apple.com>
Date:   Mon Jan 8 14:44:23 2018 -0800

    Merge remote-tracking branch 'upstream/master'

commit 9c91bc9cab9b63a5806adbca5236e4d44b5cac9a
Author: mcuthbert <mcuthbert@apple.com>
Date:   Mon Jan 8 14:40:07 2018 -0800

    Handling bug in transforming the challenge locations. This only occurs for a single challenge currently.

commit 066103be59e3e5db827f739323cce924c08fb84f
Merge: f745b45 b7e7bac
Author: mcuthbert <mcuthbert@apple.com>
Date:   Fri Jan 5 07:49:56 2018 -0800

    Merge remote-tracking branch 'upstream/master' into VirtualChallenge

commit f745b45a88afc171a1a40e77d9db0198e8065e80
Author: mcuthbert <mcuthbert@apple.com>
Date:   Thu Jan 4 11:47:13 2018 -0800

    Adding locking for tasks retrieved through Virtual Challenges

commit 1797e47635ef171f6ec36bdd63499f4a08fb9c3e
Author: mcuthbert <mcuthbert@apple.com>
Date:   Thu Jan 4 11:16:21 2018 -0800

    Putting back API_HOST variable replacement that was accidentally removed.

commit b75304d04a7bc7da55188bac6ea8143a7f2db2d2
Author: mcuthbert <mcuthbert@apple.com>
Date:   Thu Jan 4 11:15:21 2018 -0800

    Removing concat plugin that was never used.

commit 5465709e209dad98ca2674d9c498d70709ed36a6
Author: mcuthbert <mcuthbert@apple.com>
Date:   Thu Jan 4 11:09:33 2018 -0800

    Flushing out commands to complete the Virtual Challenge concept.

commit b7e7bac9ac9a2f80339abc2071a012042c2bb0c6
Merge: 9a7a1f8 bef19e0
Author: Michael Cuthbert <mcuthbert@apple.com>
Date:   Wed Jan 3 12:59:51 2018 -0800

    Merge pull request #67 from mcuthbert/master

    Updating config

commit bef19e08bb17463a35db399d0fc3fb3ef53eef2a
Author: Michael Cuthbert <mcuthbert@apple.com>
Date:   Wed Jan 3 12:59:35 2018 -0800

    Updating config

    incorrect options where defaulted into the main config file.

commit 30937f95bbaddd62060c0437042dc033dd24854f
Merge: 22ecf12 0203f1e
Author: mcuthbert <mcuthbert@apple.com>
Date:   Wed Jan 3 09:23:48 2018 -0800

    Merge branch 'master' into VirtualChallenge

commit 9a7a1f83b38f73a96f91334b667d127db5f16564
Merge: 4bccbdf 0203f1e
Author: Michael Cuthbert <mcuthbert@apple.com>
Date:   Tue Jan 2 20:39:14 2018 -0800

    Merge pull request #66 from mcuthbert/master

    Fixing missed semi-colon in upgrade script

commit 0203f1e836ef636114536161c4cb8ee61da8c867
Author: mcuthbert <mcuthbert@apple.com>
Date:   Tue Jan 2 15:49:53 2018 -0800

    Fixing missed semi-colon in upgrade script

commit 4bccbdf9548d8846a14f1ceb6cf033a103e5749e
Merge: 2854249 5f29eb9
Author: Michael Cuthbert <mcuthbert@apple.com>
Date:   Thu Dec 21 11:49:25 2017 -0800

    Merge pull request #65 from mcuthbert/master

    Fixing bug where was using the incorrect DAL to retrieve a tag.

commit 5f29eb9f87e0cd87279a8c5d8205a40c7ba9cc56
Author: mcuthbert <mcuthbert@apple.com>
Date:   Thu Dec 21 11:39:44 2017 -0800

    Fixing bug where was using the incorrect DAL to retrieve a tag.

commit 285424913b2eade82e7b09abd6f3dfb9d6ef2f6e
Merge: 798ffaf 1d986f7
Author: Michael Cuthbert <mcuthbert@apple.com>
Date:   Thu Dec 21 11:14:33 2017 -0800

    Merge pull request #64 from mcuthbert/APIUpdates3

    API bug fixes

commit 22ecf1293d4b24d49e2a59eac2345ed562756f22
Author: mcuthbert <mcuthbert@apple.com>
Date:   Thu Dec 21 09:08:59 2017 -0800

    Initial commit for virtual challenges.

commit 2c4b05ae489238c3fd3b487bba2af87b6eaec127
Merge: 1d986f7 798ffaf
Author: mcuthbert <mcuthbert@apple.com>
Date:   Thu Dec 21 08:24:03 2017 -0800

    Merge remote-tracking branch 'upstream/master' into VirtualChallenge

commit 798ffaff525edf583734f9b13bfa567293027b51
Merge: e250b33 bc1a514
Author: Michael Cuthbert <mcuthbert@apple.com>
Date:   Wed Dec 20 13:47:06 2017 -0800

    Merge pull request #63 from mcuthbert/APIUpdates2

    Further API Updates

commit e250b336db681feb367043eb2f284460ef31b101
Merge: d2ae51c a1ab0ee
Author: Michael Cuthbert <mcuthbert@apple.com>
Date:   Wed Dec 20 13:33:05 2017 -0800

    Merge pull request #62 from mcuthbert/APIUpdates

    API Updates

commit d2ae51ca52a130fe2702277a753119427a9dd42c
Merge: 1f33ff4 6577037
Author: Michael Cuthbert <mcuthbert@apple.com>
Date:   Tue Dec 19 07:39:21 2017 -0800

    Merge pull request #61 from mcuthbert/master

    Added API function to retrieve all the tasks within a given bounding box

commit 1d986f76c933919a0b72f1b23b7f348db755a4b4
Author: mcuthbert <mcuthbert@apple.com>
Date:   Thu Dec 14 15:31:14 2017 -0800

    Fixing bug that was throwing invalid exception with correct data.

commit 85dac2469009a28cc858b5f94adb896e1324004f
Author: mcuthbert <mcuthbert@apple.com>
Date:   Thu Dec 14 14:20:38 2017 -0800

    Fixing bug in API that would fail on empty csv list. Updated cache for UserGroup, improving various requests.

commit bc1a514f237e6ebd24ac3dac712fdb22a234b9d3
Author: mcuthbert <mcuthbert@apple.com>
Date:   Tue Dec 12 14:39:48 2017 -0800

    Adding in mr3 route

commit f7a2d6e3d2aba06ffa5022c6b5d75f2300e58f71
Author: mcuthbert <mcuthbert@apple.com>
Date:   Tue Dec 12 10:27:14 2017 -0800

    Fixed sql bug caused when searching challenges by owner.

commit f890a77867a5c0d8e147a9f2ca789fa759d9123d
Author: mcuthbert <mcuthbert@apple.com>
Date:   Tue Dec 12 10:07:58 2017 -0800

    Adding keyword API in favor of deprecated tag API.

commit 9ac0eb01fcd4f708f055c070a62dd27aaaecaf74
Author: mcuthbert <mcuthbert@apple.com>
Date:   Mon Dec 11 15:23:01 2017 -0800

    Added display_name and owner_id for projects

commit a1ab0ee3d52e71cd685b0d0a66afb02382b9ce74
Author: mcuthbert <mcuthbert@apple.com>
Date:   Mon Dec 11 10:00:28 2017 -0800

    Updated ExtendedFind API to include bounding box intersection search.

commit 880b182a9d58523425fb3e2c0506d71fffbd94d9
Author: mcuthbert <mcuthbert@apple.com>
Date:   Fri Dec 8 15:51:55 2017 -0800

    Various updates including: Adding API functions listManagedChallenges and listFeaturedChallenges. Added ability to save/unsave tasks to a users profile. Adding bounding box for challenge.

commit 657703787990cfc29886351d0430098b4a5793d0
Author: mcuthbert <mcuthbert@apple.com>
Date:   Thu Dec 7 14:59:22 2017 -0800

    Removing any UI related changes for the tasks within a bounding box.

commit 874798ad9e0f23fca7c06e9d45bb1c06939c831c
Author: mcuthbert <mcuthbert@apple.com>
Date:   Mon Dec 4 13:23:53 2017 -0800

    Adding back in PR61 code

commit 1f33ff4cfac72766b4e0f7a925acf3e8ded2c701
Merge: 1d14dbe 057b2c6
Author: Michael Cuthbert <mcuthbert@apple.com>
Date:   Wed Nov 29 14:15:27 2017 -0800

    Merge pull request #60 from mcuthbert/master

    Adding a proximity API option, so that when retrieving the next task …

commit 057b2c615198aed2b00edc7e40e9e0101c6bd5b8
Author: mcuthbert <mcuthbert@apple.com>
Date:   Tue Nov 28 16:16:12 2017 -0800

    Adding a proximity API option, so that when retrieving the next task you can look for the next closest available task.

commit 1d14dbe8b292a321f3ff042a10a87304845e088e
Merge: af3a3bd 1e33892
Author: Michael Cuthbert <mcuthbert@apple.com>
Date:   Fri Nov 17 14:49:57 2017 -0800

    Merge pull request #59 from mcuthbert/master

    Added button to allow user to extract comments for a specific challen…

commit 1e33892b00e2824bbaf93aecf9900c67d25f31fb
Author: mcuthbert <mcuthbert@apple.com>
Date:   Thu Nov 16 21:27:38 2017 -0800

    Added button to allow user to extract comments for a specific challenge. Fixed bug that caused json to fail when properties in geojson contains array.

commit af3a3bd4ac71f97d61d0784140c03668f53773e8
Merge: a8cbe48 e84c714
Author: Michael Cuthbert <mcuthbert@apple.com>
Date:   Tue Nov 14 09:35:50 2017 -0800

    Merge pull request #58 from mcuthbert/master

    Added API to unsave challenge from users profile.

commit e84c714b4678bc289528070c5fea71c422e248be
Author: mcuthbert <mcuthbert@apple.com>
Date:   Mon Nov 13 14:17:33 2017 -0800

    Added API to unsave challenge from users profile.

commit a8cbe4884fe663ee4564a07e2cfa3aadd41a47ab
Merge: a10e216 9faa836
Author: Michael Cuthbert <mcuthbert@apple.com>
Date:   Wed Nov 1 10:31:09 2017 -0700

    Merge pull request #57 from mcuthbert/master

    Fixed bug that was capturing the incorrect query string parameter, an…

commit 9faa8368cffdaf099bc64f8ec7a80187b9a81c4f
Author: mcuthbert <mcuthbert@apple.com>
Date:   Tue Oct 31 16:46:26 2017 -0700

    Fixed bug that was capturing the incorrect query string parameter, and checkin_comment was not being parsed correctly.

commit a10e216458f66cb138ea97be5906872ba8acb227
Merge: d26d6e1 c1e6de8
Author: Michael Cuthbert <mcuthbert@apple.com>
Date:   Wed Oct 25 11:58:33 2017 -0700

    Merge pull request #56 from mcuthbert/master

    Fixing SQL generation bug for the extendedFind function. Inserting pr…

commit c1e6de8480a047ca71653b9f6e53c8a0be7df694
Author: mcuthbert <mcuthbert@apple.com>
Date:   Wed Oct 25 10:02:21 2017 -0700

    Removed line that was accidentally included in checkin.

commit 3ebdf93eef367c97581a6c60c51c156abb6a38d3
Author: mcuthbert <mcuthbert@apple.com>
Date:   Tue Oct 24 13:13:37 2017 -0700

    Fixing SQL generation bug for the extendedFind function. Inserting project json into response for each Challenge in the extendedFind function.

commit d26d6e186eebcf7f56cf73362c751bed35f714b6
Merge: cd02020 9c93d50
Author: Michael Cuthbert <mcuthbert@apple.com>
Date:   Mon Oct 16 15:51:15 2017 -0700

    Merge pull request #55 from mcuthbert/master

    Updated the getRandomTasks function SQL.

commit 9c93d500fdac98ba26ead2fbd9a2edde9551abec
Author: mcuthbert <mcuthbert@apple.com>
Date:   Mon Oct 16 14:11:48 2017 -0700

    Removing some references to the Survey object that had previously been deleted.

commit 8048ee6f53ac9e560cf5553c5b9147ed4a7ff850
Author: mcuthbert <mcuthbert@apple.com>
Date:   Fri Oct 13 20:04:18 2017 -0700

    Updated the getRandomTasks function SQL.

commit cd02020fd9adcc9883ef9c1b4fcb9028d5d26ddf
Merge: 78ebe72 84e76ef
Author: Michael Cuthbert <mcuthbert@apple.com>
Date:   Thu Oct 5 13:09:29 2017 -0700

    Merge pull request #54 from mcuthbert/master

    API Updates

commit 84e76efbcfa82d47d132fb1dbcbedc6ac26fe677
Author: mcuthbert <mcuthbert@apple.com>
Date:   Tue Oct 3 16:21:46 2017 -0700

    Added API to get all the comments for a Challenge
    Added optional Fuzzy searches in the ExtendedFind API.

commit 78ebe72018f4c7baceff192541f0e143fc11c5e4
Merge: f336639 8ff46c8
Author: Michael Cuthbert <mcuthbert@apple.com>
Date:   Mon Oct 2 10:53:48 2017 -0700

    Merge pull request #53 from mcuthbert/master

    Cleaned up Surveys. Surveys are now integrated more closely with Chal…

commit 8ff46c8489a2d113ebb32a528311de2686e1ba47
Author: mcuthbert <mcuthbert@apple.com>
Date:   Sat Sep 30 17:11:07 2017 -0700

    Cleaned up Surveys. Surveys are now integrated more closely with Challenges making them essentially the same object. Also added survey metrics.

commit f3366392527f74b188ce83b7f61504a34a1ce524
Merge: 2e55814 b75d94a
Author: Michael Cuthbert <mcuthbert@apple.com>
Date:   Tue Sep 26 08:40:19 2017 -0700

    Merge pull request #52 from mcuthbert/master

    Update to API for tags

commit b75d94a72a3122c9f51a314a2dfcea52caa6d9d7
Author: mcuthbert <mcuthbert@apple.com>
Date:   Thu Sep 21 15:02:08 2017 -0700

    Fixed zoom issue, so now will correctly zoom to the bounds of the task.
    If JOSM not open the edit button will default to opening in ID.
    Injecting tags into Challenge API requests.
    Priorities are returned as JSON instead of escaped strings.
    Updated swagger documentation so can use "Try it out" feature correctly

commit 06cb5f8ffdd58e315b17447d2c4cc47d08beb65c
Merge: 2e55814 a38851a
Author: mcuthbert <mcuthbert@apple.com>
Date:   Fri Sep 15 14:28:30 2017 -0700

    Merge from external Github.com site

commit 2e55814d233a2095a021279fda9619ab1b1edc7c
Merge: 073e188 3ada940
Author: Michael Cuthbert <mcuthbert@apple.com>
Date:   Wed Aug 23 09:30:42 2017 -0700

    Merge pull request #51 from mcuthbert/master

    The sqlLimit function should not be using 0, which basically means do…

commit 3ada9402f707fdb6570ad4cb133d0def3a026bd9
Author: mcuthbert <mcuthbert@apple.com>
Date:   Wed Aug 23 09:29:22 2017 -0700

    The sqlLimit function should not be using 0, which basically means don't include anything.

commit 073e188053895b380f459864009e58584fd3d6b2
Merge: 8b20b87 e630550
Author: Michael Cuthbert <mcuthbert@apple.com>
Date:   Thu Aug 10 15:35:47 2017 -0700

    Merge pull request #50 from mcuthbert/master

    Updating default value for the task reset to be 14 days instead of 7 …

commit e63055076a23dd31f6a10dd5ffb725d0a2eccb01
Author: mcuthbert <mcuthbert@apple.com>
Date:   Thu Aug 10 15:35:27 2017 -0700

    Updating default value for the task reset to be 14 days instead of 7 days.

commit 8b20b872d61c8c4b9aa8ac272b32b4cf379882a2
Merge: f71da5d 5ff086e
Author: Michael Cuthbert <mcuthbert@apple.com>
Date:   Thu Aug 10 15:34:10 2017 -0700

    Merge pull request #49 from mcuthbert/master

    Minor bug fixes

commit 5ff086e09b2b06ab49372797c5abfdc389a273e2
Author: mcuthbert <mcuthbert@apple.com>
Date:   Thu Aug 10 15:33:00 2017 -0700

    Fixed a caching issue that was causing updates to be based on expired data.

commit 7069b662807ff092030241c562ed6d7ac0ea40a9
Author: mcuthbert <mcuthbert@apple.com>
Date:   Thu Aug 10 10:33:23 2017 -0700

    Fixed issue when building the properties file for update to the database.

commit f71da5db7335af1948c659efb745a0e9815fc744
Merge: f0063a4 96d12dd
Author: Michael Cuthbert <mcuthbert@apple.com>
Date:   Fri Jul 28 13:55:35 2017 -0700

    Merge pull request #48 from mcuthbert/master

    Updated the TagDAL to make sure that it sets the name string to lower…

commit 96d12dddff98baad6f3d91ae433beba6bc18514c
Author: mcuthbert <mcuthbert@apple.com>
Date:   Fri Jul 28 13:45:07 2017 -0700

    Updated the TagDAL to make sure that it sets the name string to lowercase.

commit f0063a4072f49908d0973881acd39911482d4994
Merge: 3fdd97d 05db0a2
Author: Michael Cuthbert <mcuthbert@apple.com>
Date:   Thu Jul 27 11:58:11 2017 -0700

    Merge pull request #47 from mcuthbert/master

    Make sure no empty tags are added.

commit 05db0a2c0cf07ee9abc198d603a39157ac85af49
Author: mcuthbert <mcuthbert@apple.com>
Date:   Thu Jul 27 11:57:34 2017 -0700

    Make sure no empty tags are added.

commit 3fdd97d42e2b397c1cb4bae2a23048ab1f3d0e38
Merge: 52cb5f0 0504c75
Author: Michael Cuthbert <mcuthbert@apple.com>
Date:   Thu Jul 27 10:45:20 2017 -0700

    Merge pull request #46 from mcuthbert/master

    Added an extended find operation that allows users to search based on…

commit 0504c752c6bc88e62ee655c6e64d7f053634dee3
Author: mcuthbert <mcuthbert@apple.com>
Date:   Wed Jul 26 16:02:08 2017 -0700

    Added an extended find operation that allows users to search based on various criteria.
    Also fixes tag API for searching for challenges based on tags.

commit 52cb5f06ed4242c496be9098c650921d85db3ff3
Merge: a455ac5 4c18de0
Author: Michael Cuthbert <mcuthbert@apple.com>
Date:   Wed Jul 19 15:22:45 2017 -0700

    Merge pull request #45 from mcuthbert/master

    Adding User API to update the settings and APIKey for a user.

commit 4c18de01f45160f32e9ef4dc486aa3b58fa7b3fb
Author: mcuthbert <mcuthbert@apple.com>
Date:   Wed Jul 19 15:22:19 2017 -0700

    Adding User API to update the settings and APIKey for a user.

commit a455ac5a457f6d4f3ae5dffd92365c3130135242
Merge: b757840 3407229
Author: Michael Cuthbert <mcuthbert@apple.com>
Date:   Wed Jul 19 15:21:06 2017 -0700

    Merge pull request #44 from mcuthbert/master

    Removing directoryView, added onlyEnabled flag for Project, Challenge…

commit 3407229e092c47ec98a32f3b05a4485ae152b661
Author: mcuthbert <mcuthbert@apple.com>
Date:   Tue Jul 18 21:14:08 2017 -0700

    Removing directoryView, added onlyEnabled flag for Project, Challenge and Survey List APIs.

commit b757840ea7abf0e1470573c4c0685832a7851690
Merge: 3db238f 383b4b9
Author: Michael Cuthbert <mcuthbert@apple.com>
Date:   Mon Jun 12 11:02:43 2017 -0700

    Merge pull request #43 from mcuthbert/master

    When cloning set name to empty string. Issue #260

commit 383b4b90595dbf632f624636f344b8a0fa638636
Author: mcuthbert <mcuthbert@apple.com>
Date:   Mon Jun 12 11:01:55 2017 -0700

    When cloning set name to empty string. Issue #260

commit 3db238f92f225abf36f844c81c42d2336d637713
Merge: fc8c2f3 f58804d
Author: Michael Cuthbert <mcuthbert@apple.com>
Date:   Mon Jun 12 10:31:47 2017 -0700

    Merge pull request #42 from mcuthbert/master

    Added editing button in child level for parent.

commit f58804d2ad5d3ac5fcebc71962fff451927612cf
Author: mcuthbert <mcuthbert@apple.com>
Date:   Mon Jun 12 10:30:58 2017 -0700

    Added editing button in child level for parent.
    Added ability for challenge owners to jump to Admin UI when looking at tasks. Issue #288

commit fc8c2f34bdb854496bf7d685cf9d2fde13defed8
Merge: 69dc2cb 22c04ed
Author: Michael Cuthbert <mcuthbert@apple.com>
Date:   Fri Jun 9 15:46:16 2017 -0700

    Merge pull request #41 from mcuthbert/master

    Fixed issue with setting status of task to skipped or toohard if alre…

commit 22c04edb425b96a7c464f2e343fdc1a077557ba7
Author: mcuthbert <mcuthbert@apple.com>
Date:   Fri Jun 9 15:45:26 2017 -0700

    Fixed issue with setting status of task to skipped or toohard if already set to one of those status'.
    Fixed incorrect color for "Too hard to fix" bar in metrics. Issue #307

commit 69dc2cb25483be6c4615fe2a48e955709637df3b
Merge: 1907d32 c6739c4
Author: Michael Cuthbert <mcuthbert@apple.com>
Date:   Fri Jun 9 15:30:37 2017 -0700

    Merge pull request #40 from mcuthbert/master

    Fixing issue with priorities that wasn't parsing the property json co…

commit c6739c4eb4353c5453a52487db121af022a6019d
Author: mcuthbert <mcuthbert@apple.com>
Date:   Fri Jun 9 15:29:22 2017 -0700

    Fixing issue with priorities that wasn't parsing the property json correctly and therefore not setting the priority correctly. Issue #317

commit 1907d328bd4d51feb381090b28db8b528e88a6f3
Merge: e745a81 4f8c4c8
Author: Michael Cuthbert <mcuthbert@apple.com>
Date:   Fri Jun 9 15:09:25 2017 -0700

    Merge pull request #39 from mcuthbert/master

    Fixed issue where extra leading and trailing quotes included in tags.…

commit 4f8c4c8efab97739164201e8d2edfa1da9ef648b
Author: mcuthbert <mcuthbert@apple.com>
Date:   Fri Jun 9 15:06:00 2017 -0700

    Fixed issue where extra leading and trailing quotes included in tags. Issue #242
    Added default text in Task Admin list for instruction if none specified. Issue #270

commit e745a819798c1afd516514b9c7f50ffe2323c2fa
Merge: 1a666df 54e66c8
Author: Michael Cuthbert <mcuthbert@apple.com>
Date:   Thu May 11 13:34:41 2017 -0700

    Merge pull request #37 from mcuthbert/master

    Adding a Directory view of the available challenges.

commit 54e66c8a36d2ba9e14b8815213495a35418ba40f
Author: mcuthbert <mcuthbert@apple.com>
Date:   Thu May 11 13:33:34 2017 -0700

    Fixed incorrect tab handling.

commit e7dce529d73c5d575ede02c71fd5e408969314bd
Author: mcuthbert <mcuthbert@apple.com>
Date:   Fri May 5 15:12:44 2017 -0700

    Adding a Directory view of the available challenges.

commit 1a666df8faa79d281e48c0f9cd73ea7febf6eaf7
Merge: 8649910 f539a48
Author: Michael Cuthbert <mcuthbert@apple.com>
Date:   Thu May 4 12:00:56 2017 -0700

    Merge pull request #36 from mcuthbert/master

    Adding activity timeline for users.

commit f539a487d81aa9bea1370cd2c45a871dc1d46b0a
Author: mcuthbert <mcuthbert@apple.com>
Date:   Thu May 4 08:51:39 2017 -0700

    Adding activity timeline for users.

commit 8649910800e4098c3e9d24be24b2541220ca91d2
Merge: 57a2895 84c1403
Author: Michael Cuthbert <mcuthbert@apple.com>
Date:   Thu Apr 27 13:24:01 2017 -0700

    Merge pull request #35 from mcuthbert/master

    Updated date time for comment history.

commit 84c14035e873fef93ef7ed7746270511f0824b45
Author: mcuthbert <mcuthbert@apple.com>
Date:   Wed Apr 26 22:00:56 2017 -0700

    Updated date time for comment history.
    Added configurable option to login to MapRoulette using OSM username and APIKey

commit 57a28954f27070a9538e6c7b145d1b7b02da3d6e
Merge: 18bf091 7c2e362
Author: Michael Cuthbert <mcuthbert@apple.com>
Date:   Wed Apr 26 21:49:07 2017 -0700

    Merge pull request #34 from mcuthbert/master

    A bit of code cleanup. Added new Data API's to retrieve status inform…

commit 7c2e362a3775894214589a857744892864f4e3b5
Merge: 38b448d 18bf091
Author: mcuthbert <mcuthbert@apple.com>
Date:   Tue Apr 25 13:45:45 2017 -0700

    Merge remote-tracking branch 'upstream/master'

commit 38b448d3a8608dbfe11a70f470586598cc39f7b4
Author: mcuthbert <mcuthbert@apple.com>
Date:   Tue Apr 25 13:32:14 2017 -0700

    A bit of code cleanup. Added new Data API's to retrieve status information. General Activity and Daily summary.

commit 18bf0916d07cf850e2db1ba5b75de95383089303
Merge: cc35534 87f7bf1
Author: Michael Cuthbert <mcuthbert@apple.com>
Date:   Thu Apr 20 10:16:16 2017 -0700

    Merge pull request #33 from mcuthbert/master

    Updates around removing stale tasks.

commit 87f7bf16bd0072809600a40e2c92ae03d20f4d2d
Author: mcuthbert <mcuthbert@apple.com>
Date:   Wed Apr 19 16:48:47 2017 -0700

    Adding interval for cleanOldTasks job

commit e613cddce6736fc005df92d0cd52870a0401ef05
Author: mcuthbert <mcuthbert@apple.com>
Date:   Wed Apr 19 16:42:42 2017 -0700

    Adding ability to run scheduled jobs on demand.
    Added update tasks in the Challenge, so that stale tasks can be removed as needed.

commit cc355348e8bcdf526881edaf727f8e62132ff7c0
Merge: 592778c 0e67e45
Author: Michael Cuthbert <mcuthbert@apple.com>
Date:   Mon Apr 17 13:58:31 2017 -0700

    Merge pull request #32 from mcuthbert/master

    Upgraded play-swagger to handle environment variables to take the host.

commit 0e67e45d14fe4a99c743aaa421146d8115fab2d0
Author: mcuthbert <mcuthbert@apple.com>
Date:   Mon Apr 17 13:53:56 2017 -0700

    Upgraded play-swagger to handle environment variables to take the host.

commit 592778c2658ce0541c6a1e004e64190cd6e65b9b
Merge: 08e5003 1bc210c
Author: Michael Cuthbert <mcuthbert@apple.com>
Date:   Mon Apr 17 09:26:27 2017 -0700

    Merge pull request #31 from mcuthbert/master

    Updated postman for deleting all tasks in a Challenge.

commit 1bc210cccf9320a15b575bc30648c39be026e65c
Author: mcuthbert <mcuthbert@apple.com>
Date:   Mon Apr 17 09:24:03 2017 -0700

    Updated postman for deleting all tasks in a Challenge.

commit 08e5003b1a89794631b1b75fb82e5ca8dab357fd
Merge: c5f6594 5ad3eb1
Author: Michael Cuthbert <mcuthbert@apple.com>
Date:   Mon Apr 17 09:15:35 2017 -0700

    Merge pull request #30 from mcuthbert/master

    Adding API to allow users to delete all the tasks in a challenge.

commit 5ad3eb1bac49aab99fd43e640689644b2e34bed3
Author: mcuthbert <mcuthbert@apple.com>
Date:   Mon Apr 17 09:15:04 2017 -0700

    Adding API to allow users to delete all the tasks in a challenge.

commit c5f659484fe4bd0558cb4bf350cbb07028941c0a
Merge: 1d70d06 3545c47
Author: Michael Cuthbert <mcuthbert@apple.com>
Date:   Thu Apr 13 16:05:24 2017 -0700

    Merge pull request #29 from mcuthbert/master

    Fix last_updated failure

commit 3545c472bb0c3deebb3f93aa3df47aa5af392fe6
Merge: 0bda2f3 1d70d06
Author: mcuthbert <mcuthbert@apple.com>
Date:   Thu Apr 13 16:03:24 2017 -0700

    Merge remote-tracking branch 'upstream/master'

commit 0bda2f32b422169bf5f8fc282ecaadc8b62847fd
Author: mcuthbert <mcuthbert@apple.com>
Date:   Thu Apr 13 16:02:17 2017 -0700

    Fix issue related to null last_update values when no tasks are available.

commit 1d70d063f987415a32266d706142fdfee66ba14e
Merge: 4300e67 f4feed9
Author: Michael Cuthbert <mcuthbert@apple.com>
Date:   Thu Apr 13 15:45:40 2017 -0700

    Merge pull request #28 from mcuthbert/master

    Fixing wrapping for task instructions in admin and edit.

commit f4feed9008511e1bb09ef27e7d6fae3ae4d921d4
Author: mcuthbert <mcuthbert@apple.com>
Date:   Thu Apr 13 15:44:03 2017 -0700

    Fixing wrapping for task instructions in admin and edit.

commit 4300e6701218b4dc42e8cb16aae75992539ba49a
Merge: 4ee269c 06172c4
Author: Michael Cuthbert <mcuthbert@apple.com>
Date:   Thu Apr 13 15:42:09 2017 -0700

    Merge pull request #27 from mcuthbert/master

    Adding commenting UI. A user can add comments before setting task sta…

commit 06172c48316e4af41047f4f86899b5dad00b41f9
Author: mcuthbert <mcuthbert@apple.com>
Date:   Thu Apr 13 14:39:04 2017 -0700

    Adding commenting UI. A user can add comments before setting task status and view comments on current tasks.

commit 4ee269c0065db46d01c273f98fbca19f6b4221bc
Merge: b2924ad 2497119
Author: Michael Cuthbert <mcuthbert@apple.com>
Date:   Wed Apr 12 09:17:02 2017 -0700

    Merge pull request #26 from mcuthbert/master

    Adding a reset task instruction for challenges.

commit 2497119ba8691a5ea6af0a39161c0eaa60447153
Author: mcuthbert <mcuthbert@apple.com>
Date:   Wed Apr 12 09:12:50 2017 -0700

    Adding a reset task instruction for challenges.

commit b2924ad0e41e1c6ac3a5da80f6183236378878d8
Merge: f799203 9227282
Author: Michael Cuthbert <mcuthbert@apple.com>
Date:   Tue Apr 11 15:46:50 2017 -0700

    Merge pull request #25 from mcuthbert/master

    Removing old API documentation and pointing users to the new Swagger …

commit 9227282eea594fa5983307e8e38598740de502dd
Author: mcuthbert <mcuthbert@apple.com>
Date:   Tue Apr 11 15:46:17 2017 -0700

    Removing old API documentation and pointing users to the new Swagger API Documentation

commit f799203b22487d89d26711e87b14960a29ec9f7d
Author: Michael Cuthbert <mcuthbert@apple.com>
Date:   Tue Apr 11 15:43:36 2017 -0700

    Checkin Comments for Challenges (#24)

    * Added comment API to allow users to comment on Tasks.

    * Added link in MapRoulette to go directly to API Documentation.

    * Adding checkin comments for Challenges.

commit f60236119973441ae04a7e36f81c71bc697c82fd
Author: Michael Cuthbert <mcuthbert@apple.com>
Date:   Tue Apr 11 15:19:18 2017 -0700

    Added comment API to allow users to comment on Tasks. (#23)

    * Added comment API to allow users to comment on Tasks.

    * Added link in MapRoulette to go directly to API Documentation.

commit 38b6d660add539d60a62d208c4e1f1e17ca74908
Author: Michael Cuthbert <mcuthbert@apple.com>
Date:   Mon Apr 10 19:56:40 2017 -0700

    Added LastUpdate field for Challenges. Updated Task instructions with created and modified dates. Location for task remains on screen instead of disappearing after 10 seconds. (#22)

commit bff6d915a7a774c6d982d432fedd2a026a72520f
Author: Michael Cuthbert <mcuthbert@apple.com>
Date:   Mon Apr 10 12:54:28 2017 -0700

    API Documentation Update (#21)

    * check for overpass query before acting on it

    * Revert "Moved Next&Prev buttons at the bottom."

    This reverts commit 64e1aaac2b02e0da39f092e83068ebb2af1c45c3.

    * trivial -- changing 'Map Roulette' to correct 'MapRoulette' spelling

    * fixing Complete button in challenge wizard

    * style tweaks, fixes #235

    * fixes

    * fix illegal characters

    * Update dev setup instructions in README.

    - Add instructions for registering app with OSM to get consumer and
    secret keys.

    - Fix the environment variable names (which now start with MR_) in
    Mac and Linux sections.

    - Document the MR_OSM_SERVER environment variable for those who
    wish to connect to a development OSM server.

    - Include the commands for installing postgres and postgis via
    homebrew in Mac section, just for completeness.

    * Include sample dev.conf configuration in README

    * Increase space between button controls.

    * Adjust mapping.js.task.alreadyfixed button label.

    * Enable hotkeys and add hotkeys cheat sheet.

    * Fix visibility of hot keys popover.

    * link creating challenges tutorial

    Link the github wiki pages which seem to have some 'creating challenges' tutorial info

    * german translation, and correcting some typos in english messages

    * ignore any keystore files

    * disable travis until we fix the tests

    * remove copyright message, fixes #282

    * add contact info / tweak footer, fixes #275

    * update german texts for result controls

    * Disable hotkeys in input/textarea/select fields.

    * bump to 2.0.3

    * Added function for super user that will allow them reset all the API keys
    Updated the Auth handling so that the order of authentication is: 1) Dev Mode enabled 2) ApiKey suppled 3) oauth Tokens. This will mean that if you supply an apiKey it will override the current oauth tokens in the session.

    * Removing old Swagger annotation based documentation, replacing with new route file based documentation.

commit 4ad8907acd894f0cfae7aae2c3f621c6e1d9f9cb
Author: Michael Cuthbert <mcuthbert@apple.com>
Date:   Thu Mar 23 13:21:31 2017 -0700

    Various Fixes (#18)

    * check for overpass query before acting on it

    * Revert "Moved Next&Prev buttons at the bottom."

    This reverts commit 64e1aaac2b02e0da39f092e83068ebb2af1c45c3.

    * trivial -- changing 'Map Roulette' to correct 'MapRoulette' spelling

    * fixing Complete button in challenge wizard

    * style tweaks, fixes #235

    * fixes

    * fix illegal characters

    * Update dev setup instructions in README.

    - Add instructions for registering app with OSM to get consumer and
    secret keys.

    - Fix the environment variable names (which now start with MR_) in
    Mac and Linux sections.

    - Document the MR_OSM_SERVER environment variable for those who
    wish to connect to a development OSM server.

    - Include the commands for installing postgres and postgis via
    homebrew in Mac section, just for completeness.

    * Include sample dev.conf configuration in README

    * Increase space between button controls.

    * Adjust mapping.js.task.alreadyfixed button label.

    * Enable hotkeys and add hotkeys cheat sheet.

    * Fix visibility of hot keys popover.

    * link creating challenges tutorial

    Link the github wiki pages which seem to have some 'creating challenges' tutorial info

    * german translation, and correcting some typos in english messages

    * ignore any keystore files

    * disable travis until we fix the tests

    * remove copyright message, fixes #282

    * add contact info / tweak footer, fixes #275

    * update german texts for r…
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

3 participants