Created
October 16, 2012 10:17
-
-
Save jacquescrocker/3898502 to your computer and use it in GitHub Desktop.
Git log for DeployButton.com
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 b5f461edc696b17a7e2fa5c7ce652a7f2618d67c | |
Author: Ash Bhoopathy <[email protected]> | |
Date: Sun Oct 14 16:56:33 2012 -0700 | |
wtf lroem | |
commit 4f2b1c9d32e0fd636fde822d9f611179422f3f46 | |
Author: Ash Bhoopathy <[email protected]> | |
Date: Sun Oct 14 16:49:20 2012 -0700 | |
404 and 500 errors | |
commit 51fc91ec3da0f7643bb228a1acaf34051ff9bbdf | |
Merge: b2835bd 5889b75 | |
Author: Ash Bhoopathy <[email protected]> | |
Date: Sun Oct 14 16:43:28 2012 -0700 | |
Merge branch 'master' of github.com:railsrumble/r12-team-236 | |
commit b2835bd08107c006fab36763b146d86aa1255245 | |
Author: Ash Bhoopathy <[email protected]> | |
Date: Sun Oct 14 16:43:24 2012 -0700 | |
500 message | |
commit 5889b7575e6af78064b29d6db3afd34000c44d63 | |
Author: Jacques Crocker <[email protected]> | |
Date: Sun Oct 14 16:42:45 2012 -0700 | |
remove force domain | |
commit 4ceb8f342383f3de08291bc0106d7e9d6add01c4 | |
Merge: b17f879 681c3de | |
Author: Jacques Crocker <[email protected]> | |
Date: Sun Oct 14 16:40:37 2012 -0700 | |
Merge branch 'master' of github.com:railsrumble/r12-team-236 | |
commit b17f879dae7f75d68bb45caa1d712f9108d8f03f | |
Author: Jacques Crocker <[email protected]> | |
Date: Sun Oct 14 16:40:33 2012 -0700 | |
tweaks | |
commit 681c3de14ec8f3aeade703c29e5744922ef521e1 | |
Author: humanbagel <[email protected]> | |
Date: Sun Oct 14 16:40:03 2012 -0700 | |
fix dropbox | |
commit 32219c1a5d1f62d103ae140ddcfc8f2d1ab4092e | |
Author: humanbagel <[email protected]> | |
Date: Sun Oct 14 16:36:41 2012 -0700 | |
fix configure-> deploy state and deploy->finish state | |
commit fffe95ef340e747c5ceb5d0122b855cdc411403e | |
Author: Jacques Crocker <[email protected]> | |
Date: Sun Oct 14 16:23:04 2012 -0700 | |
fix retarded new project script | |
commit c0a980e1a7247166e1f84418ec8d4e158b56c8f7 | |
Author: Jacques Crocker <[email protected]> | |
Date: Sun Oct 14 16:21:26 2012 -0700 | |
tweak again | |
commit fa58869646e9a4d668eaf32ef0117a9d01b637d2 | |
Author: Jacques Crocker <[email protected]> | |
Date: Sun Oct 14 16:19:02 2012 -0700 | |
moving down the button | |
commit 8d4b7e8e1f2ce37e56d510e514447c383e7f1ab7 | |
Merge: 4de6963 7d449e1 | |
Author: Ash Bhoopathy <[email protected]> | |
Date: Sun Oct 14 16:16:05 2012 -0700 | |
Merge branch 'master' of github.com:railsrumble/r12-team-236 | |
commit 4de696320dc3e2842aaa59c1db8ad9e8e3ac05c8 | |
Author: Ash Bhoopathy <[email protected]> | |
Date: Sun Oct 14 16:16:00 2012 -0700 | |
demo tweaks and cleanup | |
commit 7d449e105ca587e6b1e715eab252dc0870005845 | |
Author: Jacques Crocker <[email protected]> | |
Date: Sun Oct 14 16:15:35 2012 -0700 | |
add google analytics | |
commit f25a46f1beb9347ccc26c932e680463c171b240e | |
Author: Jacques Crocker <[email protected]> | |
Date: Sun Oct 14 16:12:46 2012 -0700 | |
fix intercom | |
commit b78ee47d794c5f0d20815ad36dbc2d6fecb59afa | |
Author: Jacques Crocker <[email protected]> | |
Date: Sun Oct 14 16:10:27 2012 -0700 | |
tweask | |
commit fe0bc69537f223aa40162851980f8d3560fa9023 | |
Merge: 06b32ac 11d7699 | |
Author: humanbagel <[email protected]> | |
Date: Sun Oct 14 15:58:24 2012 -0700 | |
Merge branch 'master' of github.com:railsrumble/r12-team-236 | |
commit 06b32ac9fab4c79c68f66d4ee6c08115b31d74c3 | |
Author: humanbagel <[email protected]> | |
Date: Sun Oct 14 15:58:19 2012 -0700 | |
rsync deploy | |
commit 11d76991f7d5e8317d7534d1d940c445ac841e0f | |
Merge: f8da85b 4881645 | |
Author: Ash Bhoopathy <[email protected]> | |
Date: Sun Oct 14 15:51:03 2012 -0700 | |
Merge branch 'master' of github.com:railsrumble/r12-team-236 | |
commit f8da85bbe945684053eaba94efb3a393073666f4 | |
Author: Ash Bhoopathy <[email protected]> | |
Date: Sun Oct 14 15:50:57 2012 -0700 | |
demo tweaks | |
commit 488164549c243241d7a84fb56d4df636be9dafd3 | |
Merge: d330dd1 cebe19b | |
Author: Jacques Crocker <[email protected]> | |
Date: Sun Oct 14 15:50:45 2012 -0700 | |
Merge branch 'master' of github.com:railsrumble/r12-team-236 | |
commit d330dd14007aa10bba818720caff54dad4b18eed | |
Author: Jacques Crocker <[email protected]> | |
Date: Sun Oct 14 15:50:41 2012 -0700 | |
cut down on dupes of new projects | |
commit cebe19b6b155c0f7c6f0b56324b276eee141132a | |
Merge: 910d4d0 d895cfb | |
Author: humanbagel <[email protected]> | |
Date: Sun Oct 14 15:46:03 2012 -0700 | |
Merge branch 'master' of github.com:railsrumble/r12-team-236 | |
commit 910d4d0942a3b9c02ea020fa6d3a0a9a4097040d | |
Author: humanbagel <[email protected]> | |
Date: Sun Oct 14 15:45:57 2012 -0700 | |
capistrano deploy | |
commit d895cfb176d2e47d13d4765bdf7b8a7d40f7cb62 | |
Merge: 0b0adc1 4871078 | |
Author: Jacques Crocker <[email protected]> | |
Date: Sun Oct 14 15:35:43 2012 -0700 | |
Merge branch 'master' of github.com:railsrumble/r12-team-236 | |
commit 0b0adc160c32efa747af0e7a134284ade0b68aed | |
Author: Jacques Crocker <[email protected]> | |
Date: Sun Oct 14 15:35:39 2012 -0700 | |
add demo_deploy code | |
commit 4871078d688465b6a30316a7537d739240b2510e | |
Merge: 152f66c 39b4656 | |
Author: Ash Bhoopathy <[email protected]> | |
Date: Sun Oct 14 15:31:24 2012 -0700 | |
Merge branch 'master' of github.com:railsrumble/r12-team-236 | |
commit 39b46561d6a19da02691a8aa209dabe5bf26112a | |
Merge: c44ca34 ba0ab34 | |
Author: humanbagel <[email protected]> | |
Date: Sun Oct 14 15:30:10 2012 -0700 | |
Merge branch 'master' of github.com:railsrumble/r12-team-236 | |
commit c44ca34a02e51b2089634136979a58762c64dce3 | |
Author: humanbagel <[email protected]> | |
Date: Sun Oct 14 15:30:03 2012 -0700 | |
deploy_complete! | |
commit 152f66ce2ea2b94639cbe8892fcf596588c2ebf0 | |
Merge: fd7cbed ba0ab34 | |
Author: Ash Bhoopathy <[email protected]> | |
Date: Sun Oct 14 15:28:49 2012 -0700 | |
Merge branch 'master' of github.com:railsrumble/r12-team-236 | |
commit fd7cbed094dfdbe20d9576665487039deeee481f | |
Author: Ash Bhoopathy <[email protected]> | |
Date: Sun Oct 14 15:28:42 2012 -0700 | |
brokeazz | |
commit ba0ab348d1ce10b339f2d5c710be40517ebfc54a | |
Author: Jacques Crocker <[email protected]> | |
Date: Sun Oct 14 15:24:58 2012 -0700 | |
fix | |
commit e228fb51de9cdca0081fce54a3583a66f460b2b5 | |
Merge: 1b4ee83 b593d6a | |
Author: humanbagel <[email protected]> | |
Date: Sun Oct 14 15:20:00 2012 -0700 | |
Merge branch 'master' of github.com:railsrumble/r12-team-236 | |
commit 1b4ee838d32eda856f5bc09b72429b782d0cb6dd | |
Author: humanbagel <[email protected]> | |
Date: Sun Oct 14 15:19:53 2012 -0700 | |
removing encryption for heroku key | |
commit b593d6a5d99a7861465ea63071c27ee6ed095ca7 | |
Author: Jacques Crocker <[email protected]> | |
Date: Sun Oct 14 15:16:28 2012 -0700 | |
adding target for carousel click | |
commit 25f7cd9d10e1f226e656a29f3cb691411b3d37f1 | |
Author: Jacques Crocker <[email protected]> | |
Date: Sun Oct 14 15:14:37 2012 -0700 | |
adding missing home | |
commit f0baa8d9713222e14b7c6e0f59713d5ea2d520ac | |
Author: Jacques Crocker <[email protected]> | |
Date: Sun Oct 14 15:14:06 2012 -0700 | |
setup | |
commit de01ff1db1ce9408824d2d74bcf69b4735545915 | |
Merge: 29cb1a1 580271f | |
Author: Jacques Crocker <[email protected]> | |
Date: Sun Oct 14 15:13:13 2012 -0700 | |
Merge branch 'master' of github.com:railsrumble/r12-team-236 | |
commit 29cb1a18e7c759017075b66e45a58d14fbdce901 | |
Author: Jacques Crocker <[email protected]> | |
Date: Sun Oct 14 15:13:08 2012 -0700 | |
complete demo flow | |
commit 580271f906796272af635c5164fea2e9e2dafab3 | |
Author: Ash Bhoopathy <[email protected]> | |
Date: Sun Oct 14 15:10:27 2012 -0700 | |
tweaks, fixes to front page | |
commit 421e307c75c36ff62e8150bd5081745c9632a684 | |
Merge: cd9e158 0982918 | |
Author: Ash Bhoopathy <[email protected]> | |
Date: Sun Oct 14 15:03:21 2012 -0700 | |
Merge branch 'master' of github.com:railsrumble/r12-team-236 | |
commit cd9e1587652dcc6e31bb9481ddbc50952d3d5535 | |
Author: Ash Bhoopathy <[email protected]> | |
Date: Sun Oct 14 15:03:14 2012 -0700 | |
front page tweaks | |
commit 09829181fd671ec5f05b8a186bb191417f253f33 | |
Author: humanbagel <[email protected]> | |
Date: Sun Oct 14 14:44:39 2012 -0700 | |
stupid : | |
commit cc39fd3fe95c58e2ac2903f50c232cac47687ee8 | |
Merge: 011ac4f 4c07e17 | |
Author: humanbagel <[email protected]> | |
Date: Sun Oct 14 14:44:16 2012 -0700 | |
Merge branch 'master' of github.com:railsrumble/r12-team-236 | |
commit 011ac4f4c85038d1879b659935922f9714eeeb9c | |
Author: humanbagel <[email protected]> | |
Date: Sun Oct 14 14:44:11 2012 -0700 | |
ssh deploy | |
commit 4c07e1729149ca340140ad68317517d67bb37bcf | |
Author: Jacques Crocker <[email protected]> | |
Date: Sun Oct 14 14:30:08 2012 -0700 | |
demo link get instead of post | |
commit f1bfe8faae79292cb910b00ccc49b7cd9005dd3d | |
Author: Jacques Crocker <[email protected]> | |
Date: Sun Oct 14 14:23:54 2012 -0700 | |
tweak | |
commit 0e04744c0bd9c0b3c432a8f6060011b773ceeb41 | |
Merge: 556c662 49e839a | |
Author: Jacques Crocker <[email protected]> | |
Date: Sun Oct 14 14:23:17 2012 -0700 | |
Merge branch 'master' of github.com:railsrumble/r12-team-236 | |
commit 556c662d271c61ae96f0d13a8cb1072932f40d15 | |
Author: Jacques Crocker <[email protected]> | |
Date: Sun Oct 14 14:23:13 2012 -0700 | |
cleanup demo depoy page | |
commit 49e839af022cfcec81ea12c69ef7de7e6097cf94 | |
Merge: 53b2d77 833e8c6 | |
Author: humanbagel <[email protected]> | |
Date: Sun Oct 14 14:22:06 2012 -0700 | |
Merge branch 'master' of github.com:railsrumble/r12-team-236 | |
commit 53b2d77f08b55d14b3f872f7d62b1b3314dc2a09 | |
Author: humanbagel <[email protected]> | |
Date: Sun Oct 14 14:22:01 2012 -0700 | |
state and log for deploy worker heroku | |
commit 833e8c635d090e089226371433ed4bff09f1c79b | |
Author: Jacques Crocker <[email protected]> | |
Date: Sun Oct 14 14:20:44 2012 -0700 | |
removing useless railsrumble hide button | |
commit 97c530a01b25091b6b83c1f3b5774034ae163ef2 | |
Merge: 5c0025e 35b6c3f | |
Author: Jacques Crocker <[email protected]> | |
Date: Sun Oct 14 14:19:11 2012 -0700 | |
Merge branch 'master' of github.com:railsrumble/r12-team-236 | |
commit 5c0025e148dfd4637da60ce9f614190c0cb6ac75 | |
Author: Jacques Crocker <[email protected]> | |
Date: Sun Oct 14 14:19:08 2012 -0700 | |
better deploy button handling | |
commit 35b6c3f3035718bf5f270d17218bfc4403b8d7f9 | |
Merge: 911c901 85dad59 | |
Author: humanbagel <[email protected]> | |
Date: Sun Oct 14 14:11:27 2012 -0700 | |
Merge branch 'master' of github.com:railsrumble/r12-team-236 | |
commit 911c9010141028677db4038754a653d114697d0a | |
Author: humanbagel <[email protected]> | |
Date: Sun Oct 14 14:11:23 2012 -0700 | |
forgot the ! | |
commit 85dad595baf23b008327bb7bf59b44fd8dded98f | |
Merge: 7021a42 b81b47d | |
Author: Jacques Crocker <[email protected]> | |
Date: Sun Oct 14 14:09:47 2012 -0700 | |
Merge branch 'master' of github.com:railsrumble/r12-team-236 | |
commit 7021a4251d6b150251191158b07644d4abf9df4f | |
Author: Jacques Crocker <[email protected]> | |
Date: Sun Oct 14 14:09:43 2012 -0700 | |
demo intro copy | |
commit b81b47d3aefe772837a4c1527238f10a6c5ae8d3 | |
Author: humanbagel <[email protected]> | |
Date: Sun Oct 14 14:04:27 2012 -0700 | |
remove debug | |
commit 07d3bdd53583974a034f575e9f97406d979854e8 | |
Merge: ad9fa40 d763113 | |
Author: Jacques Crocker <[email protected]> | |
Date: Sun Oct 14 14:02:32 2012 -0700 | |
Merge branch 'master' of github.com:railsrumble/r12-team-236 | |
commit ad9fa408147a5bc80b840ee5978fccd235442d7a | |
Author: Jacques Crocker <[email protected]> | |
Date: Sun Oct 14 14:02:29 2012 -0700 | |
setup demo intro | |
commit d763113b6b63a2cf3595a03bd02b626eba7ddc34 | |
Merge: df3a013 860c63d | |
Author: Ash Bhoopathy <[email protected]> | |
Date: Sun Oct 14 14:02:00 2012 -0700 | |
merge fix | |
commit df3a0136846942219c9b48121f767db2348a8ced | |
Author: Ash Bhoopathy <[email protected]> | |
Date: Sun Oct 14 14:00:46 2012 -0700 | |
merge fix | |
commit 860c63ddf209d496fe8362c5c9077ee53f078ebd | |
Author: humanbagel <[email protected]> | |
Date: Sun Oct 14 13:59:24 2012 -0700 | |
remove debug | |
commit d76646ae74564558ab427e63eb10c8e376246d94 | |
Author: Ash Bhoopathy <[email protected]> | |
Date: Sun Oct 14 13:58:34 2012 -0700 | |
planet, deploy with, and "vote for us" | |
commit 48a55393b8f7881847422e7c705d064c511ef352 | |
Merge: 8499434 d26858d | |
Author: humanbagel <[email protected]> | |
Date: Sun Oct 14 13:56:10 2012 -0700 | |
Merge branch 'master' of github.com:railsrumble/r12-team-236 | |
commit 849943480f289450e6a613ae2a721a90de7267ac | |
Author: humanbagel <[email protected]> | |
Date: Sun Oct 14 13:56:04 2012 -0700 | |
moving higher-level log and state methods to project | |
commit d26858dd4ff314fbc73975fa2d9169ea74b67247 | |
Author: Jacques Crocker <[email protected]> | |
Date: Sun Oct 14 13:46:00 2012 -0700 | |
better tenant user ssh config | |
commit 0d4941e4dafc7078d803804477fb54d7c31001d2 | |
Author: Jacques Crocker <[email protected]> | |
Date: Sun Oct 14 13:38:48 2012 -0700 | |
bug fix | |
commit e5548baab46f1b6794121b68bc823d1463f69918 | |
Merge: 98c94e5 dfd2c06 | |
Author: Jacques Crocker <[email protected]> | |
Date: Sun Oct 14 13:34:27 2012 -0700 | |
Merge branch 'master' of github.com:railsrumble/r12-team-236 | |
commit 98c94e54dfd8e3fc6d46f6688cdd999e5cf1cbd5 | |
Author: Jacques Crocker <[email protected]> | |
Date: Sun Oct 14 13:34:23 2012 -0700 | |
password input | |
commit dfd2c06f37845d30e21219130ad7bbe208a476b3 | |
Merge: c4dcb07 25521f9 | |
Author: Ash Bhoopathy <[email protected]> | |
Date: Sun Oct 14 13:33:32 2012 -0700 | |
Merge branch 'master' of github.com:railsrumble/r12-team-236 | |
commit c4dcb0711f081e7d6abf6e85e95b217e050c8ed1 | |
Author: Ash Bhoopathy <[email protected]> | |
Date: Sun Oct 14 13:33:27 2012 -0700 | |
tweaks | |
commit 25521f991abd96e267811317ca18151138339c5a | |
Author: humanbagel <[email protected]> | |
Date: Sun Oct 14 13:28:20 2012 -0700 | |
remove in-progress class when state changed to not in_progress | |
commit e8aeb8199e4105131d3fb2430fae2a64b0582b06 | |
Author: humanbagel <[email protected]> | |
Date: Sun Oct 14 13:16:29 2012 -0700 | |
remove extraneous state msg for sync_code | |
commit 22af798baf9271fd07b17f7563b17496bf26d018 | |
Merge: 68d77d7 ceafea4 | |
Author: humanbagel <[email protected]> | |
Date: Sun Oct 14 13:13:42 2012 -0700 | |
Merge branch 'master' of github.com:railsrumble/r12-team-236 | |
commit 68d77d70d6ca84daca6e96cf0b48830e8920bc6a | |
Author: humanbagel <[email protected]> | |
Date: Sun Oct 14 13:13:36 2012 -0700 | |
state msgs for setup | |
commit ceafea469364d68e8880868ab7a46778bf3cde23 | |
Merge: 0e51aec dfe9bf1 | |
Author: Ash Bhoopathy <[email protected]> | |
Date: Sun Oct 14 13:09:10 2012 -0700 | |
Merge branch 'master' of github.com:railsrumble/r12-team-236 | |
commit 0e51aec03c7c097f499472df04d4de76b63a44a7 | |
Author: Ash Bhoopathy <[email protected]> | |
Date: Sun Oct 14 13:09:06 2012 -0700 | |
carousel step: why? | |
commit dfe9bf1712b144e089ecebe8f7b58d55647971c2 | |
Author: Jacques Crocker <[email protected]> | |
Date: Sun Oct 14 13:00:45 2012 -0700 | |
setting up mailto link | |
commit 7f6ad8f9375fd346c9b8c8ba5cd2d92775f25e7d | |
Author: Jacques Crocker <[email protected]> | |
Date: Sun Oct 14 12:52:04 2012 -0700 | |
wire up modals (some real shit) | |
commit 304e0299f148b8353426c56d2a905727d42007ed | |
Merge: 82ef3cf f7af0bc | |
Author: Jacques Crocker <[email protected]> | |
Date: Sun Oct 14 12:21:05 2012 -0700 | |
Merge branch 'master' of github.com:railsrumble/r12-team-236 | |
commit 82ef3cff6f0e9c1db5765a20bd679eb2003c9951 | |
Author: Jacques Crocker <[email protected]> | |
Date: Sun Oct 14 12:21:01 2012 -0700 | |
add project setup modal | |
commit f7af0bc6a44d8ff0f68958dd1b34961e8edbab1f | |
Merge: ce2739f bed25fe | |
Author: Ash Bhoopathy <[email protected]> | |
Date: Sun Oct 14 12:03:44 2012 -0700 | |
Merge branch 'master' of github.com:railsrumble/r12-team-236 | |
commit ce2739fe309b14e2e58fc0bc16f4a5d64301433a | |
Author: Ash Bhoopathy <[email protected]> | |
Date: Sun Oct 14 12:03:39 2012 -0700 | |
carousel tweaks, getting there | |
commit bed25fef3f20a96abf539c05f7fe00b454d0c3e5 | |
Author: Jacques Crocker <[email protected]> | |
Date: Sun Oct 14 12:01:00 2012 -0700 | |
cleanup project sidebar | |
commit b88cdfb580b063f931286873d1813c06d8f6791e | |
Author: Jacques Crocker <[email protected]> | |
Date: Sun Oct 14 11:46:29 2012 -0700 | |
tweak log display | |
commit 8d376050bd9e7d10e3427702e17e1e2fb52655ee | |
Merge: c6ea2dc 1918ab8 | |
Author: Jacques Crocker <[email protected]> | |
Date: Sun Oct 14 11:43:46 2012 -0700 | |
Merge branch 'master' of github.com:railsrumble/r12-team-236 | |
commit c6ea2dcd8c98a8f912e8c4d0fcc430fb6d2f47d0 | |
Author: Jacques Crocker <[email protected]> | |
Date: Sun Oct 14 11:43:42 2012 -0700 | |
add state_msg | |
commit 1918ab8313b488d28ba3ca69c38fc249684d9f96 | |
Author: Ash Bhoopathy <[email protected]> | |
Date: Sun Oct 14 11:43:29 2012 -0700 | |
subtle background on carousel | |
commit 1401cce043da3be5eba44a942b27b5aaf01ce61f | |
Author: Jacques Crocker <[email protected]> | |
Date: Sun Oct 14 11:42:20 2012 -0700 | |
tweak deploy process | |
commit 7caef9ecf9dd7e601d1e6cb28c97a8253d75414e | |
Merge: e71af15 4aaba39 | |
Author: Jacques Crocker <[email protected]> | |
Date: Sun Oct 14 11:32:07 2012 -0700 | |
Merge branch 'master' of github.com:railsrumble/r12-team-236 | |
commit e71af15285e665e305f396a08460c0e68a54b95e | |
Author: Jacques Crocker <[email protected]> | |
Date: Sun Oct 14 11:32:04 2012 -0700 | |
auto scroll logs to the bottom | |
commit 4aaba39ba168b14f73ce5efa18a1aa3821f53154 | |
Merge: 9b4ed90 79596b7 | |
Author: humanbagel <[email protected]> | |
Date: Sun Oct 14 11:31:21 2012 -0700 | |
Merge branch 'master' of github.com:railsrumble/r12-team-236 | |
commit 9b4ed907253ef84bb65dca73e3356a08846fa768 | |
Author: humanbagel <[email protected]> | |
Date: Sun Oct 14 11:30:50 2012 -0700 | |
saving repo_name as part of destination_path to handle changing repo settings | |
commit 79596b70e3e8bfaf9c06fe07ce5a9f634e1d4ffa | |
Merge: e6c3e72 81b133c | |
Author: Jacques Crocker <[email protected]> | |
Date: Sun Oct 14 11:24:05 2012 -0700 | |
Merge branch 'master' of github.com:railsrumble/r12-team-236 | |
commit e6c3e726cf44fb64cacaed88912e550767a1d98f | |
Author: Jacques Crocker <[email protected]> | |
Date: Sun Oct 14 11:24:01 2012 -0700 | |
wire up live project page (using pusher) | |
commit 81b133c7d11bb4120b0fa35c8c58bf70d925d043 | |
Merge: 1c3f21c 45cf988 | |
Author: humanbagel <[email protected]> | |
Date: Sun Oct 14 11:10:52 2012 -0700 | |
Merge branch 'master' of github.com:railsrumble/r12-team-236 | |
commit 1c3f21c9ba46e2e3e44c601c67b3a1da8ffbeef3 | |
Author: humanbagel <[email protected]> | |
Date: Sun Oct 14 11:10:24 2012 -0700 | |
heroku working sometimes | |
commit 45cf9885ea7e0f8805e095b307f5debf764c0a92 | |
Author: Jacques Crocker <[email protected]> | |
Date: Sun Oct 14 11:01:02 2012 -0700 | |
fix | |
commit 3ee67e02c00e6695968ed30553a4f285067e36cc | |
Author: Jacques Crocker <[email protected]> | |
Date: Sun Oct 14 10:56:01 2012 -0700 | |
cleanup flash messsages | |
commit a2751e8dda04ecb635b4346edd4cc1d57632c0fd | |
Author: Jacques Crocker <[email protected]> | |
Date: Sun Oct 14 10:55:34 2012 -0700 | |
fix logout and flash message styling | |
commit e7eb3fcd3b843e745d4dcb57f4e41b0729928944 | |
Author: Jacques Crocker <[email protected]> | |
Date: Sun Oct 14 10:16:41 2012 -0700 | |
fixes | |
commit fe6870eb49cd4f2d16088f70e4f9027bfa11b76a | |
Author: Jacques Crocker <[email protected]> | |
Date: Sun Oct 14 09:58:49 2012 -0700 | |
regen sprites | |
commit c8f621db0d264cc7e6b5b8fa801740fde58df3a1 | |
Author: Jacques Crocker <[email protected]> | |
Date: Sun Oct 14 09:58:43 2012 -0700 | |
tweaks / cleanup | |
commit 3c6815304a65b5ec60b60ccb94ca79001298757b | |
Author: Jacques Crocker <[email protected]> | |
Date: Sun Oct 14 09:40:40 2012 -0700 | |
style sidebar | |
commit 396f262cb73c666f7babeaa7ee45bf9fb1f395ca | |
Author: Jacques Crocker <[email protected]> | |
Date: Sun Oct 14 09:00:22 2012 -0700 | |
style project status | |
commit 97f8e1450d5f9453e6589a4f6266c7177dea332d | |
Author: Jacques Crocker <[email protected]> | |
Date: Sun Oct 14 08:39:01 2012 -0700 | |
styling project page | |
commit 8c2e92023035465f3134d1427fda24315fe60332 | |
Author: Jacques Crocker <[email protected]> | |
Date: Sun Oct 14 07:23:24 2012 -0700 | |
adding check strategy helper | |
commit 7fdb7d2d7b08955c7c18c61eb4373ed0196104b1 | |
Author: Jacques Crocker <[email protected]> | |
Date: Sun Oct 14 07:07:57 2012 -0700 | |
fix | |
commit 048c5dcd88a3bf77b17082c3aa970b98e62678fd | |
Merge: b4d951c dcbdd59 | |
Author: Jacques Crocker <[email protected]> | |
Date: Sun Oct 14 06:54:24 2012 -0700 | |
Merge branch 'master' of github.com:railsrumble/r12-team-236 | |
commit b4d951cdbb66955703500352315ccfb3b2b54493 | |
Author: Jacques Crocker <[email protected]> | |
Date: Sun Oct 14 06:54:20 2012 -0700 | |
revamp user-nav | |
commit dcbdd5956d9e308676f68059fd2050a3c382a134 | |
Merge: 7baa1e2 3ac9b7a | |
Author: humanbagel <[email protected]> | |
Date: Sun Oct 14 06:22:18 2012 -0700 | |
Merge branch 'master' of github.com:railsrumble/r12-team-236 | |
commit 7baa1e298f5fa58491338e4d57136c6daeff8fdb | |
Author: humanbagel <[email protected]> | |
Date: Sun Oct 14 06:22:10 2012 -0700 | |
in case no pre or post deploy hooks | |
commit 3ac9b7a5641a5ab11ded57c5b1ea24e876345935 | |
Author: Jacques Crocker <[email protected]> | |
Date: Sun Oct 14 06:09:37 2012 -0700 | |
slice assets | |
commit 50e1756bc446d114c37efd86e293c81e9e3edef1 | |
Author: Jacques Crocker <[email protected]> | |
Date: Sun Oct 14 05:57:27 2012 -0700 | |
cleanup settings | |
commit bdebb5d7c20777d6e24faec1967e4a3aaf3aead3 | |
Author: Jacques Crocker <[email protected]> | |
Date: Sun Oct 14 05:47:05 2012 -0700 | |
settings cleanup | |
commit 3bb7bfe55462ed8fe1bfde375e893c3414f78f69 | |
Author: Jacques Crocker <[email protected]> | |
Date: Sun Oct 14 05:06:50 2012 -0700 | |
expose mask on onboarding | |
commit a257acd2a5f0acccc24f1b5042f0b0c50b6208b0 | |
Author: Jacques Crocker <[email protected]> | |
Date: Sun Oct 14 04:58:21 2012 -0700 | |
updating | |
commit d9e6498af7929a7314ad2b9bdfe355903a03af76 | |
Author: Jacques Crocker <[email protected]> | |
Date: Sun Oct 14 04:37:16 2012 -0700 | |
fix | |
commit 35c95c19423e4e7a8c53fbf8910ffd98f2b3ff58 | |
Author: Jacques Crocker <[email protected]> | |
Date: Sun Oct 14 04:36:48 2012 -0700 | |
regen | |
commit 54b72264d6843a03c89bcfbcc83400f7a1b32888 | |
Merge: 65219aa dd4bc27 | |
Author: Jacques Crocker <[email protected]> | |
Date: Sun Oct 14 04:35:59 2012 -0700 | |
Merge remote-tracking branch 'origin/master' | |
Conflicts: | |
app/assets/stylesheets/_sprites.sass | |
commit 65219aae67a36a848018a0cc1b21b4ce80d0e3df | |
Author: Jacques Crocker <[email protected]> | |
Date: Sun Oct 14 04:35:35 2012 -0700 | |
updates | |
commit dd4bc27e189684e96f689a6d42ece158e9fd1ee9 | |
Merge: 803ee42 a32d14a | |
Author: Ash Bhoopathy <[email protected]> | |
Date: Sun Oct 14 04:34:10 2012 -0700 | |
plenty of merge fails | |
commit 803ee42f6457cfb5911ac50fd776326e16c2a6d6 | |
Author: Ash Bhoopathy <[email protected]> | |
Date: Sun Oct 14 04:32:48 2012 -0700 | |
carat sprite | |
commit a32d14a626e8f3932510d4d1aff68798f2240955 | |
Merge: 770613a a85ed39 | |
Author: humanbagel <[email protected]> | |
Date: Sun Oct 14 04:21:01 2012 -0700 | |
Merge branch 'master' of github.com:railsrumble/r12-team-236 | |
commit 770613a47c82f47ae32af1e571ed4ce7919d396e | |
Author: humanbagel <[email protected]> | |
Date: Sun Oct 14 04:20:55 2012 -0700 | |
fixed permission error on sync_code | |
commit a85ed39417ec57d6054275217bd30aad954bae0b | |
Author: Jacques Crocker <[email protected]> | |
Date: Sun Oct 14 04:16:41 2012 -0700 | |
style strategy select boxes | |
commit fdbc6f3596dc24597c9bbdb5468e14f3986b7cd1 | |
Author: Ash Bhoopathy <[email protected]> | |
Date: Sun Oct 14 04:06:56 2012 -0700 | |
front page fixes | |
commit af051ec9c5a9a7c733da93adc4d9d117e796e860 | |
Merge: 5dfd4c6 d7bb272 | |
Author: Jacques Crocker <[email protected]> | |
Date: Sun Oct 14 04:04:07 2012 -0700 | |
Merge branch 'master' of github.com:railsrumble/r12-team-236 | |
commit 5dfd4c61f6e7441e17a7ee2c3dfdb10924148d78 | |
Author: Jacques Crocker <[email protected]> | |
Date: Sun Oct 14 04:04:04 2012 -0700 | |
style onboarding project nav | |
commit d7bb272c3af5459cff5dff63e812820a61641fe9 | |
Author: humanbagel <[email protected]> | |
Date: Sun Oct 14 03:49:09 2012 -0700 | |
adding public key | |
commit 327c4ce5a47b9f4f074e5a0f33a780936a5feb45 | |
Author: Jacques Crocker <[email protected]> | |
Date: Sun Oct 14 03:45:25 2012 -0700 | |
adding my public key | |
commit 32f4e0b7feb04ee689e5580f91275c82a362b438 | |
Author: Jacques Crocker <[email protected]> | |
Date: Sun Oct 14 03:44:14 2012 -0700 | |
add debug_keys | |
commit 404cb80f1d6c19531ca1dcaacb4d0d39a617fa51 | |
Merge: 080b845 c77a4fe | |
Author: Ash Bhoopathy <[email protected]> | |
Date: Sun Oct 14 03:38:33 2012 -0700 | |
Merge branch 'master' of github.com:railsrumble/r12-team-236 | |
commit 080b8452bda060debbd5eb3fee4c654cefd21e19 | |
Author: Ash Bhoopathy <[email protected]> | |
Date: Sun Oct 14 03:38:29 2012 -0700 | |
forgot we had css3 stuff | |
commit c77a4fe219d18a5d3f3c5f65cf323a917049fcba | |
Author: Jacques Crocker <[email protected]> | |
Date: Sun Oct 14 03:31:04 2012 -0700 | |
fix | |
commit 7286ad004045998c2df8b723c836afb49b851c26 | |
Author: Jacques Crocker <[email protected]> | |
Date: Sun Oct 14 03:30:19 2012 -0700 | |
regen sprites | |
commit eb81e4f1784e038b604ea2b885addc224b3f5bc1 | |
Merge: e016ea8 c995cba | |
Author: Ash Bhoopathy <[email protected]> | |
Date: Sun Oct 14 03:28:50 2012 -0700 | |
Merge branch 'master' of github.com:railsrumble/r12-team-236 | |
commit e016ea8e30ea3e3cf1e5256e0ec55a81e0ba4b36 | |
Merge: c9e91e1 46c245e | |
Author: Ash Bhoopathy <[email protected]> | |
Date: Sun Oct 14 03:28:30 2012 -0700 | |
merge + large deploy button for jc | |
commit c995cba6ef3e235eed3e9acbae7a8d1ea6690a71 | |
Author: Jacques Crocker <[email protected]> | |
Date: Sun Oct 14 03:28:23 2012 -0700 | |
style password curtain | |
commit c9e91e13da071a7c6ff4adae58aebac95e9d45a4 | |
Author: Ash Bhoopathy <[email protected]> | |
Date: Sun Oct 14 03:20:00 2012 -0700 | |
spiriting and moving some stuff | |
commit 46c245e1cca5fd5b60c1fbf3276b0529910c49be | |
Merge: 97e92b0 130ad22 | |
Author: Jacques Crocker <[email protected]> | |
Date: Sun Oct 14 03:18:23 2012 -0700 | |
Merge branch 'master' of github.com:railsrumble/r12-team-236 | |
commit 97e92b076e840322e0b849842e2771dfc952478e | |
Author: Jacques Crocker <[email protected]> | |
Date: Sun Oct 14 03:18:19 2012 -0700 | |
adding intro curtain | |
commit 130ad2219e231e5dff962770555e605bb5685977 | |
Author: humanbagel <[email protected]> | |
Date: Sun Oct 14 02:59:15 2012 -0700 | |
remove debugger | |
commit fc43884d95e01e902178c7cd6998183029c988c5 | |
Merge: e1c31cb 1cc0a7c | |
Author: humanbagel <[email protected]> | |
Date: Sun Oct 14 02:56:38 2012 -0700 | |
Merge branch 'master' of github.com:railsrumble/r12-team-236 | |
commit e1c31cbe9e3d6121eead69b05a96e7e8c2424d70 | |
Author: humanbagel <[email protected]> | |
Date: Sun Oct 14 02:56:30 2012 -0700 | |
should fix sync_code | |
commit 1cc0a7c25cc57c46ab45aada3a5f4d66c02893a7 | |
Author: Jacques Crocker <[email protected]> | |
Date: Sun Oct 14 02:50:37 2012 -0700 | |
adding curtain design | |
commit 61d8588d14bb6ec8e0e13109b0dbab36ff704094 | |
Merge: 799c1e6 b6e4467 | |
Author: Jacques Crocker <[email protected]> | |
Date: Sun Oct 14 02:38:42 2012 -0700 | |
Merge branch 'master' of github.com:railsrumble/r12-team-236 | |
commit 799c1e63ae563e97364ae88943dd1e278a07fb24 | |
Author: Jacques Crocker <[email protected]> | |
Date: Sun Oct 14 02:38:38 2012 -0700 | |
fixing sprites | |
commit b6e4467622597cb6ac5aa16706601f762e93691c | |
Merge: 1edfc23 b3e4f98 | |
Author: Ash Bhoopathy <[email protected]> | |
Date: Sun Oct 14 02:33:58 2012 -0700 | |
Merge branch 'master' of github.com:railsrumble/r12-team-236 | |
commit 1edfc2358d285b68364bbca6689a5829434004f3 | |
Author: Ash Bhoopathy <[email protected]> | |
Date: Sun Oct 14 02:33:54 2012 -0700 | |
checking in to merge and get sprites | |
commit b3e4f98d60a14eaccc11e3a50b953ad65faf45a7 | |
Author: Jacques Crocker <[email protected]> | |
Date: Sun Oct 14 02:32:37 2012 -0700 | |
fixing sprites | |
commit fcad8e728059f87e2b1a4fcd425ae8cb621d113d | |
Merge: 2218b55 5c683e0 | |
Author: Ash Bhoopathy <[email protected]> | |
Date: Sun Oct 14 02:04:23 2012 -0700 | |
Merge branch 'master' of github.com:railsrumble/r12-team-236 | |
commit 2218b55ffe713d7135d13ea9191be81bc49d9761 | |
Author: Ash Bhoopathy <[email protected]> | |
Date: Sun Oct 14 02:04:17 2012 -0700 | |
finally! stupid background. | |
commit 5c683e01b663d7780de1135ce548d07f90dbe924 | |
Merge: 0bdd351 fb8f55f | |
Author: humanbagel <[email protected]> | |
Date: Sun Oct 14 01:55:53 2012 -0700 | |
Merge branch 'master' of github.com:railsrumble/r12-team-236 | |
commit 0bdd351099c785ce34fc1971e79d0ee9067d76b0 | |
Author: humanbagel <[email protected]> | |
Date: Sun Oct 14 01:55:46 2012 -0700 | |
simple pusher hookup for log and state | |
commit fb8f55f88b225a796f69d8d34b9a4357c318923d | |
Merge: b6214cf 7e20b28 | |
Author: Ash Bhoopathy <[email protected]> | |
Date: Sun Oct 14 01:47:26 2012 -0700 | |
Merge branch 'master' of github.com:railsrumble/r12-team-236 | |
commit b6214cf2d047f751a5d1569b72d62898b5c4fd0b | |
Author: Ash Bhoopathy <[email protected]> | |
Date: Sun Oct 14 01:47:22 2012 -0700 | |
moar assets | |
commit 7e20b287f831d36c8980c4b80079d39e3c2a46dc | |
Author: Jacques Crocker <[email protected]> | |
Date: Sun Oct 14 01:30:33 2012 -0700 | |
save oauth data into project | |
commit d281bf6d3fb5eb9c7ce41d3f767c2c5aa9b0ca9e | |
Merge: f5b6a53 5a9e047 | |
Author: Jacques Crocker <[email protected]> | |
Date: Sun Oct 14 01:25:24 2012 -0700 | |
Merge branch 'master' of github.com:railsrumble/r12-team-236 | |
commit f5b6a5358587262fb351307f0624323b026a1554 | |
Author: Jacques Crocker <[email protected]> | |
Date: Sun Oct 14 01:25:20 2012 -0700 | |
update project repo settings | |
commit 5a9e047837f7b0eed2e82f559c11a6fde4024856 | |
Merge: b163ace f61837c | |
Author: Ash Bhoopathy <[email protected]> | |
Date: Sun Oct 14 01:11:40 2012 -0700 | |
Merge branch 'master' of github.com:railsrumble/r12-team-236 | |
getting rid of retina | |
commit b163acea39b1a0bbb10e8a6fecd36b2a6ff81a8d | |
Author: Ash Bhoopathy <[email protected]> | |
Date: Sun Oct 14 01:11:34 2012 -0700 | |
the people on this repo (i'm not going to say their names) are retina fascists and hate seeing things in jonny-ive-worthy fidelity :) | |
commit f61837c8f4808625a698b49a0975daa08ce749d2 | |
Author: Jacques Crocker <[email protected]> | |
Date: Sun Oct 14 00:51:25 2012 -0700 | |
tweak | |
commit f095ccecb53e0c31fcd507d44a2921cb86c268be | |
Author: Jacques Crocker <[email protected]> | |
Date: Sun Oct 14 00:41:26 2012 -0700 | |
deploy worker stuff | |
commit bdb2131fda9f1d5c112b024c50b5c000eca755a9 | |
Author: Jacques Crocker <[email protected]> | |
Date: Sun Oct 14 00:36:02 2012 -0700 | |
tweak project displays | |
commit 1457cee2462a710dd87ea00ccad0663d64b4da6d | |
Merge: e4befe1 9c89e53 | |
Author: Jacques Crocker <[email protected]> | |
Date: Sun Oct 14 00:24:21 2012 -0700 | |
Merge branch 'master' of github.com:railsrumble/r12-team-236 | |
commit e4befe18cdc2eee57c6bff232415b1e63597c7a7 | |
Author: Jacques Crocker <[email protected]> | |
Date: Sun Oct 14 00:24:15 2012 -0700 | |
cleanup projects list | |
commit 9c89e537bd6eaab7e8a3f09a87a2c047cc05d7a7 | |
Merge: c2fa0f2 9f31c3d | |
Author: Ash Bhoopathy <[email protected]> | |
Date: Sun Oct 14 00:23:38 2012 -0700 | |
Merge branch 'master' of github.com:railsrumble/r12-team-236 | |
again? | |
commit 9f31c3d433ea4958dcb3237bc2f4d2b823ab3b2b | |
Merge: 4787db8 e781f0a | |
Author: Jacques Crocker <[email protected]> | |
Date: Sun Oct 14 00:22:39 2012 -0700 | |
Merge branch 'master' of github.com:railsrumble/r12-team-236 | |
commit 4787db8a6bf5ff853a4d359dc273f77fbc33f4f6 | |
Author: Jacques Crocker <[email protected]> | |
Date: Sun Oct 14 00:22:36 2012 -0700 | |
fix up settings forms | |
commit c2fa0f2cfa9536b149885e80dec6c4dce561787c | |
Merge: 4c33f67 e781f0a | |
Author: Ash Bhoopathy <[email protected]> | |
Date: Sun Oct 14 00:22:14 2012 -0700 | |
Merge branch 'master' of github.com:railsrumble/r12-team-236 | |
I dunno, its my first checkin on this project. Don't taze me. | |
commit 4c33f67a7e2640be9a6cd6f1f9d7b5ae96620dfb | |
Author: Ash Bhoopathy <[email protected]> | |
Date: Sun Oct 14 00:22:04 2012 -0700 | |
assets initial checkin | |
commit e781f0adc31d284903787bee21a54eac961d1775 | |
Author: humanbagel <[email protected]> | |
Date: Sun Oct 14 00:04:32 2012 -0700 | |
pre and post deploy webhooks | |
commit 68a1f6fb74c4c4d002e4a4ba9b98ead907260ef3 | |
Author: Jacques Crocker <[email protected]> | |
Date: Sat Oct 13 23:58:18 2012 -0700 | |
heroku remote setup | |
commit 33beb39bb1168fbbe1b31417efd82f9df756f99d | |
Merge: 02e5af8 e45560b | |
Author: humanbagel <[email protected]> | |
Date: Sat Oct 13 22:57:49 2012 -0700 | |
Merge branch 'master' of github.com:railsrumble/r12-team-236 | |
commit 02e5af8c80b46e0f65d0a1801e9da0098355fcfe | |
Author: humanbagel <[email protected]> | |
Date: Sat Oct 13 22:57:43 2012 -0700 | |
simple post and pre deploy email hooks | |
commit e45560b0d2d2b70c1f748af1fb18efcba3aeefab | |
Author: Jacques Crocker <[email protected]> | |
Date: Sat Oct 13 22:49:17 2012 -0700 | |
deploy worker cleanup | |
commit 32b47135278f2b9ce36f5b216b29e2dc63438f76 | |
Author: Jacques Crocker <[email protected]> | |
Date: Sat Oct 13 22:01:08 2012 -0700 | |
fix tenant server selection script | |
commit 2dabb4152b3cfa35c611787fd8f3a39b33d6d655 | |
Author: Jacques Crocker <[email protected]> | |
Date: Sat Oct 13 21:45:58 2012 -0700 | |
cleanup worker | |
commit 30215e82cd95eeca7474389edfb6c6aea8c66a29 | |
Merge: 6436912 9d70c48 | |
Author: Jacques Crocker <[email protected]> | |
Date: Sat Oct 13 21:19:41 2012 -0700 | |
Merge branch 'master' of github.com:railsrumble/r12-team-236 | |
commit 9d70c483567c696403c7daad68e29b27bd65eef4 | |
Merge: 634453f 417d6b1 | |
Author: humanbagel <[email protected]> | |
Date: Sat Oct 13 21:19:23 2012 -0700 | |
Merge branch 'master' of github.com:railsrumble/r12-team-236 | |
commit 634453f9624bcb7c6b0a1471310bd0286d519e63 | |
Author: humanbagel <[email protected]> | |
Date: Sat Oct 13 21:19:18 2012 -0700 | |
by default, github_sync clones if destination doesn't exist, otherwise pulls | |
commit 178f75ce6645532ee0d5a586fc6f5a5d3e2c6d5a | |
Merge: 16abf3b 9e9ef19 | |
Author: humanbagel <[email protected]> | |
Date: Sat Oct 13 20:43:42 2012 -0700 | |
Merge branch 'master' of github.com:railsrumble/r12-team-236 | |
commit 16abf3b44e189b21d076a8618ecb090bd75c7388 | |
Author: humanbagel <[email protected]> | |
Date: Sat Oct 13 20:43:37 2012 -0700 | |
use json.parse instead of eval | |
commit 03d6cc048244602a6c880d1d4decd3d17a0921ea | |
Merge: f2050b0 2578e49 | |
Author: Jacques Crocker <[email protected]> | |
Date: Sat Oct 13 20:23:31 2012 -0700 | |
Merge branch 'master' of github.com:railsrumble/r12-team-236 | |
commit f2050b0ea266a17a6047f8eafac35fe5938c1b7f | |
Author: Jacques Crocker <[email protected]> | |
Date: Sat Oct 13 20:23:27 2012 -0700 | |
touch | |
commit 2578e499d179368f84ffbdb42a7dcfc9855fb6b8 | |
Author: humanbagel <[email protected]> | |
Date: Sat Oct 13 20:23:13 2012 -0700 | |
cleanup github sync | |
commit fa0c22d95676f90ed71bfe7109c150d62dda29f9 | |
Merge: 85dcc56 f7bf47f | |
Author: humanbagel <[email protected]> | |
Date: Sat Oct 13 20:22:24 2012 -0700 | |
Merge branch 'master' of github.com:railsrumble/r12-team-236 | |
commit 85dcc569562ca544edf7573b8501a449838ac05f | |
Author: humanbagel <[email protected]> | |
Date: Sat Oct 13 20:22:19 2012 -0700 | |
github sync | |
commit f7bf47f3002692c9c47380006f475eb23931662f | |
Author: Jacques Crocker <[email protected]> | |
Date: Sat Oct 13 20:20:56 2012 -0700 | |
tenant tweaks | |
commit 141d0e0d8deed910a805b35491911c5257a523fa | |
Author: Jacques Crocker <[email protected]> | |
Date: Sat Oct 13 20:13:47 2012 -0700 | |
cleanup | |
commit edd5010b59abf289939675477a3eae343db5d869 | |
Author: Jacques Crocker <[email protected]> | |
Date: Sat Oct 13 20:05:28 2012 -0700 | |
tweak | |
commit a7db2a23cfe90911d04e0a38b2f59ea775d83332 | |
Author: Jacques Crocker <[email protected]> | |
Date: Sat Oct 13 20:02:25 2012 -0700 | |
tweaks | |
commit 1cb35cf7bded5a3726c66ce89c2ac44c9a2da2b5 | |
Author: Jacques Crocker <[email protected]> | |
Date: Sat Oct 13 19:58:57 2012 -0700 | |
additional worker helpers | |
commit 212e7b8ed4d0e8d9d2edb55767f1cc5d307677d4 | |
Author: Jacques Crocker <[email protected]> | |
Date: Sat Oct 13 19:47:44 2012 -0700 | |
update scripts | |
commit a3e220ab6b2bf13327a9cb884e6430d993fc00d1 | |
Merge: cf53742 a33ce30 | |
Author: Jacques Crocker <[email protected]> | |
Date: Sat Oct 13 19:44:49 2012 -0700 | |
Merge branch 'master' of github.com:railsrumble/r12-team-236 | |
commit cf53742cfa6d5cd85eab8e793c44fdcf5e15d4c7 | |
Author: Jacques Crocker <[email protected]> | |
Date: Sat Oct 13 19:44:44 2012 -0700 | |
make scripts executable | |
commit a33ce3039750ca524fc5e6cabbb9fc288ccd2c1c | |
Merge: 76f9d8f 89133b7 | |
Author: humanbagel <[email protected]> | |
Date: Sat Oct 13 19:43:54 2012 -0700 | |
Merge branch 'master' of github.com:railsrumble/r12-team-236 | |
commit 76f9d8ff50941f03c6b701ad05226394f3ba2301 | |
Author: humanbagel <[email protected]> | |
Date: Sat Oct 13 19:43:49 2012 -0700 | |
auto traversal for octokit | |
commit 89133b7b3418355749f897ef988500853c540ad0 | |
Merge: 9362887 be03d09 | |
Author: Jacques Crocker <[email protected]> | |
Date: Sat Oct 13 19:43:01 2012 -0700 | |
Merge branch 'master' of github.com:railsrumble/r12-team-236 | |
commit 93628872dca02d5f1008c54f37e6a00c733dea86 | |
Author: Jacques Crocker <[email protected]> | |
Date: Sat Oct 13 19:42:58 2012 -0700 | |
tenant server setup scripts | |
commit be03d09066064ba610dc0fa59b60618cf61d2ea4 | |
Merge: 546ca80 8a352ff | |
Author: humanbagel <[email protected]> | |
Date: Sat Oct 13 19:32:39 2012 -0700 | |
Merge branch 'master' of github.com:railsrumble/r12-team-236 | |
commit 546ca8065aaccc2b835728eb5dc4c43942cdccda | |
Author: humanbagel <[email protected]> | |
Date: Sat Oct 13 19:32:34 2012 -0700 | |
return 100 repos; will work on paginate next | |
commit 8a352ff706ee957c2a8c174550effeae4d1101cf | |
Author: Jacques Crocker <[email protected]> | |
Date: Sat Oct 13 19:22:01 2012 -0700 | |
testing tenant scripts | |
commit 8a236f048954bde15c6a29de7d1072a60c201a9f | |
Author: Jacques Crocker <[email protected]> | |
Date: Sat Oct 13 18:37:28 2012 -0700 | |
worker updates | |
commit 9d5f79e341b54d35a78ed312e03b9e3a9547b5ed | |
Author: humanbagel <[email protected]> | |
Date: Sat Oct 13 18:33:53 2012 -0700 | |
adding dropbox-api dependcy for tenant scripts | |
commit cd1bd96fc5cfe24e347b97c11232ee5c06791af4 | |
Merge: 04f0225 fe9aa48 | |
Author: Jacques Crocker <[email protected]> | |
Date: Sat Oct 13 18:32:56 2012 -0700 | |
Merge branch 'master' of github.com:railsrumble/r12-team-236 | |
commit 04f0225be866071ba9ad676403d7007acf4fbfb2 | |
Author: Jacques Crocker <[email protected]> | |
Date: Sat Oct 13 18:32:53 2012 -0700 | |
tenant script updates | |
commit fe9aa484bdf5ffbfbb8c996829bf90e4d1e5cf41 | |
Merge: 4b9912c 3065042 | |
Author: humanbagel <[email protected]> | |
Date: Sat Oct 13 18:31:59 2012 -0700 | |
Merge branch 'master' of github.com:railsrumble/r12-team-236 | |
commit 4b9912c19b120c74248d95a560eac9d1ec281d1d | |
Author: humanbagel <[email protected]> | |
Date: Sat Oct 13 18:31:54 2012 -0700 | |
dropbox_sync | |
commit 30650421138b798ade0cf07064eb5877da588043 | |
Author: Jacques Crocker <[email protected]> | |
Date: Sat Oct 13 18:22:26 2012 -0700 | |
tweaks | |
commit 3329f50da41fc1ecb79c9d9994c420cf50a6da0f | |
Author: Jacques Crocker <[email protected]> | |
Date: Sat Oct 13 18:18:41 2012 -0700 | |
tenant server updates | |
commit d6d37ae89873b2057980d940b92ac402a47371da | |
Author: Jacques Crocker <[email protected]> | |
Date: Sat Oct 13 18:07:18 2012 -0700 | |
tweaks / fixes | |
commit 4ca2ddff3fcca2fcb8e379f2743c3cca8be202cd | |
Author: Jacques Crocker <[email protected]> | |
Date: Sat Oct 13 18:01:28 2012 -0700 | |
tenant server ssh connect | |
commit 9466b14590629bc30da34460822b31d7cbcf9f4d | |
Author: Jacques Crocker <[email protected]> | |
Date: Sat Oct 13 17:44:31 2012 -0700 | |
getting rid of custom_data | |
commit 86c0ab39b93712ec327ca2f1bc03a081fe5ed6a2 | |
Author: Jacques Crocker <[email protected]> | |
Date: Sat Oct 13 17:42:38 2012 -0700 | |
project model cleanup | |
commit bb8817630f6b6552ef2798e9055e4a5ad3ba1994 | |
Merge: 2568ff4 0e30988 | |
Author: Jacques Crocker <[email protected]> | |
Date: Sat Oct 13 17:33:49 2012 -0700 | |
Merge branch 'master' of github.com:railsrumble/r12-team-236 | |
Conflicts: | |
app/controllers/repo_controller.rb | |
app/models/project.rb | |
commit 2568ff4a53cef368fa186aa2246e137cb3ccc695 | |
Author: Jacques Crocker <[email protected]> | |
Date: Sat Oct 13 17:31:50 2012 -0700 | |
helpers | |
commit ca1974a4274072d5ae21c18dce143030586d2cfc | |
Author: Jacques Crocker <[email protected]> | |
Date: Sat Oct 13 17:31:02 2012 -0700 | |
project and state to pusher | |
commit 3b305933e00e287c47e3da7af65a80366a63ebf4 | |
Author: Jacques Crocker <[email protected]> | |
Date: Sat Oct 13 17:25:08 2012 -0700 | |
simplify states | |
commit ddd559534ff3d7c3638fd70c2e2b5e1dd2a4b204 | |
Author: Jacques Crocker <[email protected]> | |
Date: Sat Oct 13 17:23:39 2012 -0700 | |
tweak states list | |
commit 0e309887882f27252493aafaaf158cc2c949297b | |
Author: humanbagel <[email protected]> | |
Date: Sat Oct 13 16:49:26 2012 -0700 | |
setting_up state | |
commit b805d5a6d612611cb7926fa838f84e0084bac6a5 | |
Author: humanbagel <[email protected]> | |
Date: Sat Oct 13 16:39:28 2012 -0700 | |
do full set of repo hash when changing between github/dropbox | |
commit 488cc80e7d221949d05a3c4b0802f57075e3f747 | |
Author: humanbagel <[email protected]> | |
Date: Sat Oct 13 15:48:59 2012 -0700 | |
fix logic for previously saved github repo | |
commit 4d79cd6b1baa5d61c2d9cd4cc1145d3c446ed93c | |
Author: humanbagel <[email protected]> | |
Date: Sat Oct 13 15:34:30 2012 -0700 | |
redundant repo_type | |
commit 23ddce59481c42511a515646f9f7ba0cd8b046ac | |
Author: humanbagel <[email protected]> | |
Date: Sat Oct 13 14:56:33 2012 -0700 | |
updating dropbox folder selection | |
commit 8286ce89be6913b800e85ab13ed9e2fecca3949e | |
Author: humanbagel <[email protected]> | |
Date: Sat Oct 13 14:56:17 2012 -0700 | |
updating github repo selection | |
commit 7a93bf1b105b4f6b28466abf42ac81ff49584050 | |
Author: humanbagel <[email protected]> | |
Date: Sat Oct 13 14:54:40 2012 -0700 | |
filling out repo_controller, extracting repo_type into field instead of in repo hash | |
commit b3821600514b99f7627689462e64d149d803bb90 | |
Merge: 93743cb d49a8bb | |
Author: humanbagel <[email protected]> | |
Date: Sat Oct 13 13:14:59 2012 -0700 | |
Merge branch 'master' of github.com:railsrumble/r12-team-236 | |
commit 93743cbeeb759b977f570305e0f518a03effb2a6 | |
Author: humanbagel <[email protected]> | |
Date: Sat Oct 13 13:14:52 2012 -0700 | |
adding rest-client gem | |
commit d49a8bbfa921e12b124cc907ab63956cd6b0e2e3 | |
Author: Jacques Crocker <[email protected]> | |
Date: Sat Oct 13 10:53:11 2012 -0700 | |
repo selection fields | |
commit 2f2d4eec8969cfb3cda7d90a959b48e61b370d1d | |
Author: Jacques Crocker <[email protected]> | |
Date: Sat Oct 13 10:25:10 2012 -0700 | |
tweaks | |
commit 92014d67e48a5f1ba8a2d5ac13c9d52fee0a6da2 | |
Author: Jacques Crocker <[email protected]> | |
Date: Sat Oct 13 10:18:47 2012 -0700 | |
fix | |
commit f846346ff72395250a00e984e938b8d9c48308ff | |
Author: Jacques Crocker <[email protected]> | |
Date: Sat Oct 13 10:08:45 2012 -0700 | |
cleanup settings | |
commit 6fffe7f1c478249414b43491db0ca357d0425f74 | |
Author: Jacques Crocker <[email protected]> | |
Date: Sat Oct 13 09:46:35 2012 -0700 | |
refactoring controllers and views | |
commit 222e4b4d05d897a1179d97aa05491c30214ba93c | |
Author: Jacques Crocker <[email protected]> | |
Date: Sat Oct 13 09:23:42 2012 -0700 | |
work on repo selection | |
commit ba4df44b2d74b601fca49448a6c7d8400ea419ac | |
Author: Jacques Crocker <[email protected]> | |
Date: Sat Oct 13 09:08:59 2012 -0700 | |
fix heroku checking | |
commit 89967cb8bdc762ecf8468fbb6ee109c3879df04f | |
Author: Jacques Crocker <[email protected]> | |
Date: Sat Oct 13 08:43:16 2012 -0700 | |
more fucking around with net-ssh | |
commit ec6b0d51501d2f063b69a67ceeeedbc3f1771571 | |
Author: Jacques Crocker <[email protected]> | |
Date: Sat Oct 13 08:34:05 2012 -0700 | |
updates | |
commit 0603b5b4966021be36df1a48926e96fc242923c5 | |
Author: Jacques Crocker <[email protected]> | |
Date: Sat Oct 13 08:29:22 2012 -0700 | |
net-ssh is fucking satan | |
commit 1e07ca248a8dd70f8d8c2091b6277ef950b98287 | |
Author: Jacques Crocker <[email protected]> | |
Date: Sat Oct 13 07:16:12 2012 -0700 | |
fuct | |
commit a7f1df363d286bf9d58f4e4df044e4d93ecd4be3 | |
Author: Jacques Crocker <[email protected]> | |
Date: Sat Oct 13 05:40:40 2012 -0700 | |
update strategy config page | |
commit a873bfa7071cd212d44d67ee4f635f546e905a2f | |
Author: humanbagel <[email protected]> | |
Date: Sat Oct 13 04:19:24 2012 -0700 | |
redundant blank check | |
commit a52fa1ec4c7d7daac6f480588c47db7bcac05b67 | |
Merge: e1d2e3b 57c3dd3 | |
Author: humanbagel <[email protected]> | |
Date: Sat Oct 13 04:17:25 2012 -0700 | |
merged project.rb conflict | |
commit e1d2e3bf69187fb52add78729c74b10119d5a24f | |
Author: humanbagel <[email protected]> | |
Date: Sat Oct 13 04:16:26 2012 -0700 | |
adding capistrano_command field, heroku credentials, tweaking add_to_log | |
commit 57c3dd394aa9ca78e5ba8f54d58efb4cac6e3de8 | |
Author: Jacques Crocker <[email protected]> | |
Date: Sat Oct 13 04:00:17 2012 -0700 | |
tweak project fieldnames | |
commit 4ce02c105e00f0a7a141d34307aca15bde801a27 | |
Merge: 2c3913c 47c0e2e | |
Author: Jacques Crocker <[email protected]> | |
Date: Sat Oct 13 03:57:40 2012 -0700 | |
Merge branch 'master' of github.com:railsrumble/r12-team-236 | |
commit 2c3913c39fcb9f53bfe4479a255e5915a670da6b | |
Author: Jacques Crocker <[email protected]> | |
Date: Sat Oct 13 03:57:36 2012 -0700 | |
tweaks | |
commit 47c0e2eb85a18e3a5c469dc52c1ad8909c4b3bdd | |
Merge: 4321a8d fcbda72 | |
Author: humanbagel <[email protected]> | |
Date: Sat Oct 13 03:56:54 2012 -0700 | |
Merge branch 'master' of github.com:railsrumble/r12-team-236 | |
commit 4321a8dfab5898a173f3a3b5353a48870d2858cc | |
Author: humanbagel <[email protected]> | |
Date: Sat Oct 13 03:56:49 2012 -0700 | |
updating strategy_valid? | |
commit fcbda724fa8da84e2ce75aebbd0e1b5007b5b4d8 | |
Merge: b6307a5 2294b1b | |
Author: Jacques Crocker <[email protected]> | |
Date: Sat Oct 13 03:46:30 2012 -0700 | |
Merge branch 'master' of github.com:railsrumble/r12-team-236 | |
commit b6307a514a953f83b4ac566dcca878a5e45bed97 | |
Author: Jacques Crocker <[email protected]> | |
Date: Sat Oct 13 03:46:26 2012 -0700 | |
setup strategy config forms | |
commit 2294b1bbd789f2fa75495d2d7009b692c365cfa3 | |
Author: humanbagel <[email protected]> | |
Date: Sat Oct 13 03:42:31 2012 -0700 | |
add and get ssh_login | |
commit c5de15cf87d10efb8cf9372969425fe1a6cbbf4e | |
Merge: 6f5abc8 41a810e | |
Author: humanbagel <[email protected]> | |
Date: Sat Oct 13 03:32:52 2012 -0700 | |
Merge branch 'master' of github.com:railsrumble/r12-team-236 | |
commit 6f5abc8d5f7ab4bfa8230465538b8c3c8b6a30de | |
Author: humanbagel <[email protected]> | |
Date: Sat Oct 13 03:32:47 2012 -0700 | |
add_to_log for project | |
commit 41a810e274bf05a65cf8bb820c0f670a8e9a0422 | |
Merge: 5c41c01 f44385c | |
Author: Jacques Crocker <[email protected]> | |
Date: Sat Oct 13 03:11:19 2012 -0700 | |
Merge branch 'master' of github.com:railsrumble/r12-team-236 | |
commit 5c41c0188797eefaa46a1d6cb9c883a3d689d210 | |
Author: Jacques Crocker <[email protected]> | |
Date: Sat Oct 13 03:11:16 2012 -0700 | |
update instructions | |
commit f44385cf3ec525f2f910d988860f10cbfec1e529 | |
Merge: 9ab3d1c c0fa13a | |
Author: humanbagel <[email protected]> | |
Date: Sat Oct 13 02:39:18 2012 -0700 | |
Merge branch 'master' of github.com:railsrumble/r12-team-236 | |
commit 9ab3d1ccaa2619afe2767a098451b452a953fc7f | |
Author: humanbagel <[email protected]> | |
Date: Sat Oct 13 02:39:13 2012 -0700 | |
encrypted heroku credentials | |
commit c0fa13a4610c174db3eaf463db2e6f71d4e29a01 | |
Merge: 3d4d963 2d36ebf | |
Author: Jacques Crocker <[email protected]> | |
Date: Sat Oct 13 02:27:46 2012 -0700 | |
Merge branch 'master' of github.com:railsrumble/r12-team-236 | |
commit 3d4d963712e6885fd4bae02e20c6cacffa36f515 | |
Author: Jacques Crocker <[email protected]> | |
Date: Sat Oct 13 02:27:43 2012 -0700 | |
adding in heroku onboarding instructions | |
commit 2d36ebf28e0b0c61a20741469891fe49cdcbaf4c | |
Author: humanbagel <[email protected]> | |
Date: Sat Oct 13 02:02:53 2012 -0700 | |
deleting hooks_worker | |
commit b8e508aac00b7a8490ca066c3a9ecfd2e4397645 | |
Author: humanbagel <[email protected]> | |
Date: Sat Oct 13 02:02:39 2012 -0700 | |
getting rid of hooks_worker, simplifying deploy states | |
commit a8f83a561299e06d171c141e0eab4ae1141bbc5c | |
Merge: 73db4d1 cb5cac5 | |
Author: humanbagel <[email protected]> | |
Date: Sat Oct 13 01:44:05 2012 -0700 | |
Merge branch 'master' of github.com:railsrumble/r12-team-236 | |
commit 73db4d16d02b687db3578bd12d4618801925f256 | |
Author: humanbagel <[email protected]> | |
Date: Sat Oct 13 01:44:00 2012 -0700 | |
stub for hooks_worker | |
commit a3d169c1f6d7ca69cb8e8cdf66f23cf206f95410 | |
Author: humanbagel <[email protected]> | |
Date: Sat Oct 13 01:43:42 2012 -0700 | |
predeploy, deploy and postdeploy with state | |
commit cb5cac56df4d0bcb71dcc96b984e1696d05638d7 | |
Author: Jacques Crocker <[email protected]> | |
Date: Sat Oct 13 01:16:32 2012 -0700 | |
wire up deployment strategy settings | |
commit c54cb3573c649811e309327e07839e40a05b5221 | |
Merge: 767fd33 f3f8670 | |
Author: Jacques Crocker <[email protected]> | |
Date: Sat Oct 13 00:52:01 2012 -0700 | |
Merge branch 'master' of github.com:railsrumble/r12-team-236 | |
commit 767fd33db5f98957115b3db03e4881a6a0f5a97b | |
Author: Jacques Crocker <[email protected]> | |
Date: Sat Oct 13 00:51:57 2012 -0700 | |
deploy strategy styling | |
commit f3f8670b44685b33ced2cabf1593156d5f466989 | |
Author: humanbagel <[email protected]> | |
Date: Sat Oct 13 00:39:07 2012 -0700 | |
strategy_valid? and repo_valid? | |
commit d671072c43b102d8f9c1b8c3f0ab72821ce5ab2a | |
Merge: c524c57 76ea9e4 | |
Author: humanbagel <[email protected]> | |
Date: Sat Oct 13 00:09:34 2012 -0700 | |
Merge branch 'master' of github.com:railsrumble/r12-team-236 | |
commit c524c57dfa0dbe1f3c707551b846a7180d59d84d | |
Author: humanbagel <[email protected]> | |
Date: Sat Oct 13 00:09:29 2012 -0700 | |
stub for deploy! | |
commit 76ea9e44da7ad59884cbe10d44b9d220e13195b8 | |
Author: Jacques Crocker <[email protected]> | |
Date: Sat Oct 13 00:00:11 2012 -0700 | |
prod fix | |
commit 2165e938a5cd9931c14b20f64d17d9661849390d | |
Author: Jacques Crocker <[email protected]> | |
Date: Fri Oct 12 23:50:57 2012 -0700 | |
project stubs | |
commit e213da6e1adf13fb9c3921de13e48e569ad66aa3 | |
Merge: 6bf5f42 8828bd4 | |
Author: Jacques Crocker <[email protected]> | |
Date: Fri Oct 12 23:46:06 2012 -0700 | |
Merge branch 'master' of github.com:railsrumble/r12-team-236 | |
commit 6bf5f420299de4174083d40f2c6a076fd62ed457 | |
Author: Jacques Crocker <[email protected]> | |
Date: Fri Oct 12 23:46:02 2012 -0700 | |
fix prod assets | |
commit 31e86e98aafba17c56a5e5bfe399cfecc76de1e2 | |
Author: Jacques Crocker <[email protected]> | |
Date: Fri Oct 12 23:44:03 2012 -0700 | |
tweak analytics | |
commit 8828bd49e017fdffb6dc4c611c2e352ec3caf507 | |
Author: humanbagel <[email protected]> | |
Date: Fri Oct 12 23:43:14 2012 -0700 | |
stub for deploy_worker | |
commit 63e050daa66159e8acb53f8d3861e930574279a9 | |
Merge: 809a600 506b32f | |
Author: humanbagel <[email protected]> | |
Date: Fri Oct 12 23:28:40 2012 -0700 | |
Merge branch 'master' of github.com:railsrumble/r12-team-236 | |
commit 809a6006fe0535868e9dc54368bc78af002f46d2 | |
Author: humanbagel <[email protected]> | |
Date: Fri Oct 12 23:28:28 2012 -0700 | |
display for project, added appname as field | |
commit 7dee054e9ef2b6c8b00f94d931f6c5d610f9fd6b | |
Author: humanbagel <[email protected]> | |
Date: Fri Oct 12 23:27:13 2012 -0700 | |
dropbox for dev | |
commit 506b32f4aacb959f7048274006be3a574eed3785 | |
Merge: 1942dc2 b71c2c9 | |
Author: Jacques Crocker <[email protected]> | |
Date: Fri Oct 12 23:17:38 2012 -0700 | |
Merge branch 'master' of github.com:railsrumble/r12-team-236 | |
commit 1942dc261a4a3ce68a11014153f466c1a6eb5c62 | |
Author: Jacques Crocker <[email protected]> | |
Date: Fri Oct 12 23:17:35 2012 -0700 | |
style home screen | |
commit b71c2c9f0a9c7e098b608355b4fcc1c5cca78ef5 | |
Author: humanbagel <[email protected]> | |
Date: Fri Oct 12 23:06:34 2012 -0700 | |
array of projects | |
commit c7ad5c9c297afab0c878c455b384df62b20345f6 | |
Author: humanbagel <[email protected]> | |
Date: Fri Oct 12 23:04:24 2012 -0700 | |
projects for authentication | |
commit 5dfd1a5822e01ad11dd9590f10eb8f7f89c3f7e4 | |
Merge: 7b1ae22 a25da3d | |
Author: humanbagel <[email protected]> | |
Date: Fri Oct 12 22:54:04 2012 -0700 | |
Merge branch 'master' of github.com:railsrumble/r12-team-236 | |
commit 7b1ae22a957959897f79b1d05a8910809cd3f2d6 | |
Author: humanbagel <[email protected]> | |
Date: Fri Oct 12 22:53:59 2012 -0700 | |
adding relationships and fields to project | |
commit a25da3de29512d5e6f16214062bd9bbd056a4fd8 | |
Merge: dfc1e28 c36bf6b | |
Author: Jacques Crocker <[email protected]> | |
Date: Fri Oct 12 22:45:28 2012 -0700 | |
Merge branch 'master' of github.com:railsrumble/r12-team-236 | |
commit dfc1e28abbe48f402a1e723fd0787f30100cc628 | |
Author: Jacques Crocker <[email protected]> | |
Date: Fri Oct 12 22:45:24 2012 -0700 | |
add projects list in session | |
commit c36bf6b0bfa58fe79b65c559936617054e0107ca | |
Merge: c4351e7 ccb16da | |
Author: humanbagel <[email protected]> | |
Date: Fri Oct 12 22:40:33 2012 -0700 | |
Merge branch 'master' of github.com:railsrumble/r12-team-236 | |
commit c4351e753a3c57a0da260e472910a1537e230fe4 | |
Author: humanbagel <[email protected]> | |
Date: Fri Oct 12 22:40:28 2012 -0700 | |
display for authentication | |
commit ccb16da3c2aeb42884acab21a9284eef9c36ba85 | |
Merge: 0c0978f 98c3684 | |
Author: Jacques Crocker <[email protected]> | |
Date: Fri Oct 12 22:34:51 2012 -0700 | |
Merge branch 'master' of github.com:railsrumble/r12-team-236 | |
commit 0c0978ff9b2a0eb52edb36bdd1f53a2b91735192 | |
Author: Jacques Crocker <[email protected]> | |
Date: Fri Oct 12 22:34:41 2012 -0700 | |
user-nav tweaks | |
commit 98c3684a69d5f485bf3d767848f6ab0fadc34488 | |
Merge: e9e27b1 9d38b79 | |
Author: humanbagel <[email protected]> | |
Date: Fri Oct 12 22:23:39 2012 -0700 | |
Merge branch 'master' of github.com:railsrumble/r12-team-236 | |
commit e9e27b10283fcbe76e1251460a33a619cfcf3de2 | |
Author: humanbagel <[email protected]> | |
Date: Fri Oct 12 22:23:32 2012 -0700 | |
adding dropbox-api | |
commit 9d38b79eb9b267c52e6e23975ec1b10b15403759 | |
Author: Jacques Crocker <[email protected]> | |
Date: Fri Oct 12 22:12:50 2012 -0700 | |
cleanup bootstrap docs | |
commit 99f9a1dafd3991004d73c6fa324ee16b51b6449b | |
Author: Jacques Crocker <[email protected]> | |
Date: Fri Oct 12 22:11:06 2012 -0700 | |
additional bootstrap docs | |
commit 46cae092d3458174959ffee15bd57e9252f79a0b | |
Author: Jacques Crocker <[email protected]> | |
Date: Fri Oct 12 21:56:14 2012 -0700 | |
auth and user-nav | |
commit 769580727c45d9294884d9b563507921e8aeef1c | |
Author: Jacques Crocker <[email protected]> | |
Date: Fri Oct 12 21:55:59 2012 -0700 | |
get rid of copycopter logging | |
commit c3b052c26d9d73ffd87bed957b0d6c3e7e3d35d6 | |
Merge: e6f83dd 26dbc97 | |
Author: Jacques Crocker <[email protected]> | |
Date: Fri Oct 12 21:47:07 2012 -0700 | |
Merge branch 'master' of github.com:railsrumble/r12-team-236 | |
commit e6f83dd646e7bd8455ccf7542e49fb1f9019f177 | |
Author: Jacques Crocker <[email protected]> | |
Date: Fri Oct 12 21:47:03 2012 -0700 | |
add stubs for controller actions | |
commit 26dbc97d54ed1bfac21c82a85f058909cd40792d | |
Merge: dff661a c2bdaa2 | |
Author: humanbagel <[email protected]> | |
Date: Fri Oct 12 21:44:57 2012 -0700 | |
Merge branch 'master' of github.com:railsrumble/r12-team-236 | |
commit dff661a4d253e6663c4f74503a279269f298d4eb | |
Author: humanbagel <[email protected]> | |
Date: Fri Oct 12 21:44:46 2012 -0700 | |
adding octokit for github api | |
commit c2bdaa20acb99e847e156fc8e44292f0a12b3080 | |
Author: Jacques Crocker <[email protected]> | |
Date: Fri Oct 12 21:33:25 2012 -0700 | |
interface setup and client debug tools | |
commit b382f2d7f8cc35b6a9ed1cd9ef51f93651c3763b | |
Author: Jacques Crocker <[email protected]> | |
Date: Fri Oct 12 21:03:36 2012 -0700 | |
project create route | |
commit 6574d557aaa3ef210d5bbe4ae8dd216c99d31825 | |
Author: Jacques Crocker <[email protected]> | |
Date: Fri Oct 12 21:02:00 2012 -0700 | |
cleanup project creation code | |
commit f3ac632c0d4924946dbf1a404a0014a14d1b8660 | |
Merge: 36bad47 f305b0b | |
Author: Jacques Crocker <[email protected]> | |
Date: Fri Oct 12 20:52:37 2012 -0700 | |
Merge branch 'master' of github.com:railsrumble/r12-team-236 | |
commit 36bad47344e75dfb0fc1f8ef12638546dd942ad7 | |
Author: Jacques Crocker <[email protected]> | |
Date: Fri Oct 12 20:52:34 2012 -0700 | |
adding project model | |
commit f305b0bace83e4bf99e670cff2b268d7c13f5b9b | |
Author: humanbagel <[email protected]> | |
Date: Fri Oct 12 20:46:37 2012 -0700 | |
typo | |
commit 069660553923d2ef88dafe195a67efcb31fe793f | |
Author: humanbagel <[email protected]> | |
Date: Fri Oct 12 20:41:09 2012 -0700 | |
deleting dupe auth controller | |
commit 3eeb06658a96507d259c81ea0f089ebe2dc3bca8 | |
Author: humanbagel <[email protected]> | |
Date: Fri Oct 12 20:40:55 2012 -0700 | |
tweaking authentications controller | |
commit 1e49a380050602294fd2e9a526adf52bb6bd8682 | |
Merge: 8317d85 a6073b5 | |
Author: Jacques Crocker <[email protected]> | |
Date: Fri Oct 12 20:30:09 2012 -0700 | |
Merge branch 'master' of github.com:railsrumble/r12-team-236 | |
Conflicts: | |
config/routes.rb | |
commit 8317d855c5a71c628b045ffeebb6982fcde5d12d | |
Author: Jacques Crocker <[email protected]> | |
Date: Fri Oct 12 20:28:39 2012 -0700 | |
setting up controllers | |
commit a6073b5ee724af92732769cbdade94fb405a7e73 | |
Merge: 5d4e895 5576a9d | |
Author: humanbagel <[email protected]> | |
Date: Fri Oct 12 20:27:05 2012 -0700 | |
Merge branch 'master' of github.com:railsrumble/r12-team-236 | |
commit 5d4e8951a9ca3b1d99cc0649c3ecc35b5e010e19 | |
Author: humanbagel <[email protected]> | |
Date: Fri Oct 12 20:26:01 2012 -0700 | |
adding auth_controller | |
commit 989874b4754dfbf23708a05c673ca78ef25213e6 | |
Author: humanbagel <[email protected]> | |
Date: Fri Oct 12 20:25:34 2012 -0700 | |
adding auth route | |
commit eddadecad655475581c66798ee40fb1d1672e9a8 | |
Author: humanbagel <[email protected]> | |
Date: Fri Oct 12 20:25:23 2012 -0700 | |
tweak github strategy | |
commit 5576a9d819b330a416e29cbd4277714c38b680b3 | |
Author: Jacques Crocker <[email protected]> | |
Date: Fri Oct 12 20:17:40 2012 -0700 | |
design controller / routes | |
commit b4792f2cca0828333e78c3f7a2485b374af2805b | |
Author: Jacques Crocker <[email protected]> | |
Date: Fri Oct 12 20:15:46 2012 -0700 | |
deploy tweaks | |
commit 6dee034f24a5825b6dc8b265f150dff092cfba26 | |
Author: humanbagel <[email protected]> | |
Date: Fri Oct 12 20:13:19 2012 -0700 | |
adding authentication model | |
commit 5f68bd139f5c4e9104859b73c931c426c71ffbe3 | |
Author: Jacques Crocker <[email protected]> | |
Date: Fri Oct 12 20:13:05 2012 -0700 | |
remove force ssl | |
commit 46306a13a410d8cfd255189ea3ca79e560f5b94a | |
Author: humanbagel <[email protected]> | |
Date: Fri Oct 12 20:11:31 2012 -0700 | |
adding prune to util | |
commit b8a257260803f3bc25268a9fc54e2295ee6bac79 | |
Author: Jacques Crocker <[email protected]> | |
Date: Fri Oct 12 20:04:38 2012 -0700 | |
cleanup asset setup | |
commit 174530e11c7149f61d982c296f7058d321b313a8 | |
Author: humanbagel <[email protected]> | |
Date: Fri Oct 12 20:03:37 2012 -0700 | |
vendoring oauth and oauth2 strategies | |
commit cb3d517d61cbc66754868d3e569a29688af9516f | |
Author: humanbagel <[email protected]> | |
Date: Fri Oct 12 19:34:11 2012 -0700 | |
adding github and dropbox strategies | |
commit 56731c77376893a2692492762c6b5157bd518db1 | |
Author: humanbagel <[email protected]> | |
Date: Fri Oct 12 19:33:08 2012 -0700 | |
adding dropbox and github keys and secrets | |
commit 96c069a125f1f10600cf0ffbbf86ef627696bc6b | |
Author: Jacques Crocker <[email protected]> | |
Date: Fri Oct 12 19:26:04 2012 -0700 | |
adding bootstrap and sprite libraries | |
commit 98e84b58dd832e9042d980dc2bacbbcf591e9969 | |
Author: humanbagel <[email protected]> | |
Date: Fri Oct 12 19:21:12 2012 -0700 | |
setting up omniauth | |
commit 968d49472a00175de89e384500e8a7599e03c6e7 | |
Author: Jacques Crocker <[email protected]> | |
Date: Fri Oct 12 19:07:19 2012 -0700 | |
cleanup | |
commit db96913695576557026c069808d75122ef088505 | |
Author: Jacques Crocker <[email protected]> | |
Date: Fri Oct 12 17:59:08 2012 -0700 | |
project setup and stubs, testing resque | |
commit 1ac1005ea11831028841814c0877312c1128576c | |
Author: Jacques Crocker <[email protected]> | |
Date: Fri Oct 12 17:36:10 2012 -0700 | |
configuration / dependency setup | |
commit afc0214ec4cb22fb9f2dfee847edd7dd90fe6378 | |
Author: Jacques Crocker <[email protected]> | |
Date: Fri Oct 12 17:17:59 2012 -0700 | |
bundling and removing active_record | |
commit c61f1e0546f669ada00e0307b1059ab903f4a478 | |
Author: Jacques Crocker <[email protected]> | |
Date: Fri Oct 12 17:11:59 2012 -0700 | |
adding rvmrc | |
commit b68bb12c9557db0c7fb26745d6c951c6c2d274ff | |
Author: Jacques Crocker <[email protected]> | |
Date: Fri Oct 12 17:09:55 2012 -0700 | |
rails 3.2.8 new generated project | |
commit 66727bf985f8ea8d356c04f9d5f6113fded9b7f9 | |
Author: Jacques Crocker <[email protected]> | |
Date: Fri Oct 12 17:09:24 2012 -0700 | |
first commit |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment