Created
March 19, 2013 18:43
-
-
Save TechNickAI/5198931 to your computer and use it in GitHub Desktop.
Rolepoint commit log
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
commit 5c496ad64ffb1af998352a04512b1b9ca148fcc7 | |
Merge: aead06d ba9d57e | |
Author: Nick Sullivan <nick@sullivanflock.com> | |
Date: Sat Mar 16 19:26:23 2013 -0700 | |
Fix conflict | |
commit aead06daa70d9a31836d712efdeb48e38679b613 | |
Author: Nick Sullivan <nick@sullivanflock.com> | |
Date: Sat Mar 16 19:19:46 2013 -0700 | |
Implement Greg's form for campaigns | |
commit 6929dca1e22b7303f51c177478d4397c690d5f90 | |
Author: Nick Sullivan <nick@sullivanflock.com> | |
Date: Sat Mar 16 17:01:06 2013 -0700 | |
Pull the template that greg made over as the campaign form | |
commit 3e0c5ea43f82ef08095e214f1f82b13a5f11d18e | |
Author: Nick Sullivan <nick@sullivanflock.com> | |
Date: Sat Mar 16 16:39:18 2013 -0700 | |
Link to matchfinder | |
commit 199539f58c5d3b26a88455675b9aa07d02446623 | |
Author: Nick Sullivan <nick@sullivanflock.com> | |
Date: Fri Mar 15 22:12:47 2013 -0700 | |
Ui for campaigns saving to the database | |
commit 2307086322498cc3f48e148adc53a08d4afae3de | |
Author: Nick Sullivan <nick@sullivanflock.com> | |
Date: Fri Mar 15 21:11:43 2013 -0700 | |
pull jobs and employee data into template | |
commit 91e66106e3149f19249fd6a3eca8538084424242 | |
Author: Nick Sullivan <nick@sullivanflock.com> | |
Date: Fri Mar 15 21:02:14 2013 -0700 | |
Proper names on the form | |
commit 7dc25eafc0249db6010b51e5e1e1ebf568f1ca88 | |
Author: Nick Sullivan <nick@sullivanflock.com> | |
Date: Fri Mar 15 21:01:50 2013 -0700 | |
Fix matchfinder now that admin requires subdomain | |
commit 08b690aec3d64a0659edb3eb17bfa05e5bb5e6f8 | |
Merge: 31b5091 9bcb047 | |
Author: Nick Sullivan <nick@sullivanflock.com> | |
Date: Fri Mar 15 14:44:35 2013 -0700 | |
Fix conflicts | |
commit 31b50910ebc441c709e4af78e0c0a8d35d35f5ca | |
Author: Nick Sullivan <nick@sullivanflock.com> | |
Date: Thu Mar 14 23:30:48 2013 -0700 | |
Backbone wired up to save the campaign model | |
commit 5afd0e086b4b79a946078af237ad40978b52788f | |
Author: Nick Sullivan <nick@sullivanflock.com> | |
Date: Wed Mar 13 23:02:43 2013 -0700 | |
Model and collection for campaigns | |
commit 9a998af6ea34a19a9d563e702994bb4888943259 | |
Author: Nick Sullivan <nick@sullivanflock.com> | |
Date: Wed Mar 13 16:29:33 2013 -0700 | |
Reuse views from referrals | |
commit eafaca1139f027eb4008ce8185bae3d9f85fe31e | |
Author: Nick Sullivan <nick@sullivanflock.com> | |
Date: Wed Mar 13 15:22:58 2013 -0700 | |
ReferralsRouter -> MatchfinderRouter | |
commit 687e00c5222d4ed9d36f237e10dbb50e37ecbea5 | |
Author: Nick Sullivan <nick@sullivanflock.com> | |
Date: Wed Mar 13 15:15:57 2013 -0700 | |
Reuse collections and models from referrals. Remove routes we don't need | |
commit 69f3738ef348d8a6add0e17e6113f595fa382958 | |
Author: Nick Sullivan <nick@sullivanflock.com> | |
Date: Wed Mar 13 14:41:41 2013 -0700 | |
Campaign form loading on step 3 | |
commit e85f3039cf91f00ac4857542a7d9173320090780 | |
Author: Nick Sullivan <nick@sullivanflock.com> | |
Date: Wed Mar 13 14:08:11 2013 -0700 | |
Pull in css from referrals | |
commit 44906f9bec5ee42c55ec110a73052aee5c5d6376 | |
Author: Nick Sullivan <nick@sullivanflock.com> | |
Date: Wed Mar 13 13:58:09 2013 -0700 | |
checkpoint commit for matchfinder front end. copy of referrals | |
commit a464af98befd54d16f200e7a658ba798882f6df2 | |
Author: Nick Sullivan <nick@sullivanflock.com> | |
Date: Wed Mar 13 00:13:34 2013 -0700 | |
Add all the necessary fields to the campaign model | |
commit 8b436420d9b0c160eb552956787a1255be75438a | |
Author: Nick Sullivan <nick@sullivanflock.com> | |
Date: Tue Mar 12 23:13:09 2013 -0700 | |
Update campaign api working, with unit test | |
commit b948405fdac8195543980224c03551a3b9314fd1 | |
Author: Nick Sullivan <nick@sullivanflock.com> | |
Date: Tue Mar 12 22:08:52 2013 -0700 | |
Matchfinder campaign api, with unit tests | |
commit 24609fbf508b64ee368ae7adef2345b6cc1adaad | |
Author: Nick Sullivan <nick@sullivanflock.com> | |
Date: Mon Mar 11 16:15:40 2013 -0700 | |
API for matchfinder campaigns, hello world stage | |
commit 0164eeec74df59a58ffe1b8d92bcd7bed5c41d0f | |
Author: Nick Sullivan <nick@sullivanflock.com> | |
Date: Mon Mar 11 14:28:29 2013 -0700 | |
Basic form for campaign | |
commit 1906b28241838fb335b6ed5cf08dcf9543a40e2a | |
Author: Nick Sullivan <nick@sullivanflock.com> | |
Date: Mon Mar 11 10:54:31 2013 -0700 | |
Bring back the matchfinder admin, it is indeed needed for creating | |
campaigns | |
This reverts commit 29ca1fb20296a513256693ea246590adb10b1994. | |
commit 29ca1fb20296a513256693ea246590adb10b1994 | |
Author: Nick Sullivan <nick@sullivanflock.com> | |
Date: Mon Mar 11 10:27:14 2013 -0700 | |
Revert "I made poopy; initial layout created for matchfinder" | |
Just kidding - the game is in the portal template, not the admin | |
template. | |
This reverts commit 1fab447ae3d2825af9f427587bf1e66db16f8f2d. | |
commit 1fab447ae3d2825af9f427587bf1e66db16f8f2d | |
Author: Nick Sullivan <nick@sullivanflock.com> | |
Date: Mon Mar 11 10:20:52 2013 -0700 | |
I made poopy; initial layout created for matchfinder | |
commit ffc0bde491596803622f7083f0bd06c661ba65e4 | |
Merge: 34d3d61 1f0d512 | |
Author: Nick Sullivan <nick@sullivanflock.com> | |
Date: Mon Mar 11 09:48:42 2013 -0700 | |
Merge branch 'analytics' into matchfinder | |
commit 34d3d618fb3e9dca143eadfbd8c662849e1f1bc4 | |
Merge: 124f0b5 74bf2e8 | |
Author: Nick Sullivan <nick@sullivanflock.com> | |
Date: Mon Mar 11 07:41:57 2013 -0700 | |
fix conflict | |
commit 124f0b5f269c4267e15a960c9e735a6fe71c31cd | |
Author: Nick Sullivan <nick@sullivanflock.com> | |
Date: Sun Mar 10 20:29:57 2013 -0700 | |
updated page with side nav | |
commit 5beee3e8eb3de187c576f95dbb4e3a0adc12d112 | |
Author: Nick Sullivan <nick@sullivanflock.com> | |
Date: Sun Mar 3 23:09:05 2013 -0800 | |
Fix syntax error that was resulting in a 500 when a company match was not found (should have returned a 404) | |
commit 4b214d3aa9040da9bbf5bbad5d7af0b6bb2c205f | |
Author: Nick Sullivan <nick@sullivanflock.com> | |
Date: Sun Mar 3 22:36:26 2013 -0800 | |
Ignore for vim swap files | |
commit 1613d9466cdc62928207c3728a54f84338eb20fd | |
Author: Nick Sullivan <nick@sullivanflock.com> | |
Date: Sun Mar 3 20:40:54 2013 -0800 | |
Initial matchfinder placeholder files | |
commit ad31bab62c8f4ed78a3890ab1156bbf0a3bc5023 | |
Author: Nick Sullivan <nick@sullivanflock.com> | |
Date: Fri Mar 1 14:24:34 2013 -0800 | |
Update install instructions for paver | |
commit 807d00669d5fc0b73a0788a50bd110d914a82c9e | |
Author: Nick Sullivan <nick@sullivanflock.com> | |
Date: Sun Mar 17 17:00:34 2013 -0700 | |
Use TestUtils post to avoid werkzeug Build Error | |
commit 2c859da7f731d0584035d78b1777e2afb982d855 | |
Merge: 61af1ca ed37833 | |
Author: Nick Sullivan <nick@sullivanflock.com> | |
Date: Sun Mar 17 16:17:00 2013 -0700 | |
fix conflict | |
commit 61af1caf9469242c52c758bc5453c2ea0750215a | |
Author: Nick Sullivan <nick@sullivanflock.com> | |
Date: Sun Mar 17 16:14:09 2013 -0700 | |
Update tests to reflect change from employee to user | |
commit ed37833450cdacd745d22331912670a7268daf5e | |
Author: Nick Sullivan <nick@sullivanflock.com> | |
Date: Sat Mar 16 22:36:20 2013 -0700 | |
Fixes for api | |
commit 915981c4a055afa0030e7b01e8644ed5c9554a51 | |
Author: Nick Sullivan <nick@sullivanflock.com> | |
Date: Sat Mar 16 20:15:23 2013 -0700 | |
Pull over commits from matchfinder branch, template + scripts for matchfinder. See pull request 379 for individual commits | |
commit 87903c91d14ac125bf60ff97b0eee3f639ec4c33 | |
Author: Nick Sullivan <nick@sullivanflock.com> | |
Date: Sat Mar 16 20:14:36 2013 -0700 | |
Pull over commits from matchfinder branch, API + unit tests for matchfinder. See pull request 379 for individual commits | |
commit 2fdbcdbbdbcfd1b83485393a48142d75316c6759 | |
Author: Nick Sullivan <nick@sullivanflock.com> | |
Date: Sat Mar 16 22:36:20 2013 -0700 | |
Fixes for api | |
commit d0c1a25dd953df1a5f473f28ed6f9a0bb079cb1d | |
Author: Nick Sullivan <nick@sullivanflock.com> | |
Date: Sat Mar 16 20:15:23 2013 -0700 | |
Pull over commits from matchfinder branch, template + scripts for matchfinder. See pull request 379 for individual commits | |
commit a5959a48386db7c66f28e06b82a566b5f49cc620 | |
Author: Nick Sullivan <nick@sullivanflock.com> | |
Date: Sat Mar 16 20:14:36 2013 -0700 | |
Pull over commits from matchfinder branch, API + unit tests for matchfinder. See pull request 379 for individual commits | |
commit ad31bab62c8f4ed78a3890ab1156bbf0a3bc5023 | |
Author: Nick Sullivan <nick@sullivanflock.com> | |
Date: Fri Mar 1 14:24:34 2013 -0800 | |
Update install instructions for paver |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment