707c47a00755e40a6879853c004ac837e6942c9a Josh Starcher josh@Josh-Starchers-MacBook-Pro-15.local http://github.com/twinge/ministry-tracker/commit/e764d2ca94874fb965f82c15b8247af69c21529a e764d2ca94874fb965f82c15b8247af69c21529a

2009-10-28T17:23:15-07:00

fix drop downs 84572e16b0fba05bcda6e351e3b568f6f141e2de Josh Starcher josh@Josh-Starchers-MacBook-Pro-15.local 048681d70dd02d8a25d6bf6ab960c4002254e172 Andrew Roth andrewroth@gmail.com http://github.com/twinge/ministry-tracker/commit/707c47a00755e40a6879853c004ac837e6942c9a 707c47a00755e40a6879853c004ac837e6942c9a

2009-10-26T12:51:35-07:00

make schedule header work on groups compare sched - refactored the js out of _timetable.html.erb and into a javascript file - added a setTimeout that updates the timetable location again, 1 second after the initial page load, to handle the change in page that the connexionbar causes 3d49ebb2781fc6e2597d00ee60d3b7a75501fb7c Andrew Roth andrewroth@gmail.com 8c6a834c701864c026cbe3e3b5f8b6891165a028 Andrew Roth andrewroth@gmail.com http://github.com/twinge/ministry-tracker/commit/048681d70dd02d8a25d6bf6ab960c4002254e172 048681d70dd02d8a25d6bf6ab960c4002254e172

2009-10-25T13:41:17-07:00

timetable header works; need to be cleaned up b88650e1f01f09d48f12ebf86e9add2e408218a3 Andrew Roth andrewroth@gmail.com c48d3835fedeab13dbccecb4c754e7635c418ded 7824e449f3f4cdb054074ffd62f5e5cb000f2b0b Andrew Roth andrewroth@gmail.com http://github.com/twinge/ministry-tracker/commit/8c6a834c701864c026cbe3e3b5f8b6891165a028 8c6a834c701864c026cbe3e3b5f8b6891165a028

2009-10-25T12:51:27-07:00

Merge branch 'dev' into sched_head efb98d459f2ec96ea56bef405c6141a6ac14f5e0 Andrew Roth andrewroth@gmail.com ffdc21b649410308eb645a2dcbf9b859363a334d 664c0227178ad6d15771173fe2f40a93338359ee Andrew Roth andrewroth@gmail.com http://github.com/twinge/ministry-tracker/commit/7824e449f3f4cdb054074ffd62f5e5cb000f2b0b 7824e449f3f4cdb054074ffd62f5e5cb000f2b0b

2009-10-22T10:49:37-07:00

Merge branch 'dev' of git@github.com:twinge/ministry-tracker into dev 9a47293ff18ea5992e89bd846124f15e61fd5835 Andrew Roth andrewroth@gmail.com e59fd9a878e36e8aec352c6cac0748a0a8ebf0b7 Andrew Roth andrewroth@gmail.com http://github.com/twinge/ministry-tracker/commit/ffdc21b649410308eb645a2dcbf9b859363a334d ffdc21b649410308eb645a2dcbf9b859363a334d

2009-10-22T10:48:26-07:00

handle attachments not stored on s3 0ef8f477c204344395f45bc9b43a5238f309b3cb Andrew Roth andrewroth@gmail.com 14bd0686118d6a3d9babbda303d220e7fe2e8e05 Josh Starcher josh@josh-starchers-mac-pro.local http://github.com/twinge/ministry-tracker/commit/664c0227178ad6d15771173fe2f40a93338359ee 664c0227178ad6d15771173fe2f40a93338359ee

2009-10-21T06:49:55-07:00

added unit tests for import e225ccd89ef4c683baa2bb25c9b9e8f06173f355 Josh Starcher josh@josh-starchers-mac-pro.local e59fd9a878e36e8aec352c6cac0748a0a8ebf0b7 Josh Starcher josh@josh-starchers-mac-pro.local http://github.com/twinge/ministry-tracker/commit/14bd0686118d6a3d9babbda303d220e7fe2e8e05 14bd0686118d6a3d9babbda303d220e7fe2e8e05

2009-10-20T19:53:32-07:00

test for emails 8e7b0ed0fc5f93f7cb73030eb43e7ca3b5aaf02a Josh Starcher josh@josh-starchers-mac-pro.local e59fd9a878e36e8aec352c6cac0748a0a8ebf0b7 Andrew Roth andrewroth@gmail.com http://github.com/twinge/ministry-tracker/commit/c48d3835fedeab13dbccecb4c754e7635c418ded c48d3835fedeab13dbccecb4c754e7635c418ded

2009-10-18T19:20:52-07:00

first pass on making an always-visible schedule header ae9607832977d5993952231d56430683bac8908b Andrew Roth andrewroth@gmail.com 63e717e71cb85ea4b06d02f76348bfd6d7a8f360 Josh Starcher josh@josh-starchers-mac-pro.local http://github.com/twinge/ministry-tracker/commit/e59fd9a878e36e8aec352c6cac0748a0a8ebf0b7 e59fd9a878e36e8aec352c6cac0748a0a8ebf0b7

2009-10-16T09:29:26-07:00

scope uniqueness of ministry name fd2c9eb69ec01e55febcff05062366a0063de465 Josh Starcher josh@josh-starchers-mac-pro.local 86a82aa48cfd340541b8600dcb934fb7ef2d5d2a Josh Starcher josh@josh-starchers-mac-pro.local http://github.com/twinge/ministry-tracker/commit/63e717e71cb85ea4b06d02f76348bfd6d7a8f360 63e717e71cb85ea4b06d02f76348bfd6d7a8f360

2009-10-15T19:25:40-07:00

order the involved roles by position a92abd85688a98acc180ca8df8175d9f7854e9ce Josh Starcher josh@josh-starchers-mac-pro.local bdb9a4184d83a1507e0993f53c216779c2175c3d Josh Starcher josh@josh-starchers-mac-pro.local http://github.com/twinge/ministry-tracker/commit/86a82aa48cfd340541b8600dcb934fb7ef2d5d2a 86a82aa48cfd340541b8600dcb934fb7ef2d5d2a

2009-10-15T19:13:20-07:00

download file from s3 before importing 9a0696ce122776afba4a9ad2770ab9f8a5546ec4 Josh Starcher josh@josh-starchers-mac-pro.local 21b5a9c4e3b9f69cc96cfe18847778cdb569e392 Josh Starcher josh@josh-starchers-mac-pro.local http://github.com/twinge/ministry-tracker/commit/bdb9a4184d83a1507e0993f53c216779c2175c3d bdb9a4184d83a1507e0993f53c216779c2175c3d

2009-10-15T19:05:04-07:00

use s3 for mass imports daed40777a8352bcd263c90990aee400b3c3e32d Josh Starcher josh@josh-starchers-mac-pro.local 45465fb02e8920f2587c3d081d7b06449c151769 Josh Starcher josh@josh-starchers-mac-pro.local http://github.com/twinge/ministry-tracker/commit/21b5a9c4e3b9f69cc96cfe18847778cdb569e392 21b5a9c4e3b9f69cc96cfe18847778cdb569e392

2009-10-15T18:58:18-07:00

call it run instead of process ff60e902979949737167f4504190591162e2c0de Josh Starcher josh@josh-starchers-mac-pro.local 8ab23d24a16919b5423764b20e1c7f94bffe471b Josh Starcher josh@josh-starchers-mac-pro.local http://github.com/twinge/ministry-tracker/commit/45465fb02e8920f2587c3d081d7b06449c151769 45465fb02e8920f2587c3d081d7b06449c151769

2009-10-15T18:22:25-07:00

improve importer to use delayed job 23809418a655abed11d94ba01df18d1e75181488 Josh Starcher josh@josh-starchers-mac-pro.local b66a0aadb82dc396e7896a3d92dab62e055ffdae a9f6f640ce795b1535ee6fa2ea33b13a15d3cc04 Josh Starcher josh@josh-starchers-mac-pro.local http://github.com/twinge/ministry-tracker/commit/8ab23d24a16919b5423764b20e1c7f94bffe471b 8ab23d24a16919b5423764b20e1c7f94bffe471b

2009-10-15T07:49:08-07:00

Merge branch 'dev' of github.com:twinge/ministry-tracker into dev c75be5c64a25fa00757ded7893f4c9a8da7f043a Josh Starcher josh@josh-starchers-mac-pro.local eb28d5d56c22c76820bceddb46f29dda2f127642 Josh Starcher josh@josh-starchers-mac-pro.local http://github.com/twinge/ministry-tracker/commit/b66a0aadb82dc396e7896a3d92dab62e055ffdae b66a0aadb82dc396e7896a3d92dab62e055ffdae

2009-10-15T07:48:49-07:00

add more target area types 5af53cd14abfb2ffc87467857a7dee46314892c7 Josh Starcher josh@josh-starchers-mac-pro.local ebeae681b2e3f14e4176e248f4a7ccb2c5a98ea6 Andrew Roth andrewroth@gmail.com http://github.com/twinge/ministry-tracker/commit/a9f6f640ce795b1535ee6fa2ea33b13a15d3cc04 a9f6f640ce795b1535ee6fa2ea33b13a15d3cc04

2009-10-13T13:29:12-07:00

add permission to email from directory 2ab6b7512fba8b29ff2f7c68de4624d2f88533e8 Andrew Roth andrewroth@gmail.com b432b24cefadbc0768180ca430b5ffc8316425bd Andrew Roth andrewroth@gmail.com http://github.com/twinge/ministry-tracker/commit/ebeae681b2e3f14e4176e248f4a7ccb2c5a98ea6 ebeae681b2e3f14e4176e248f4a7ccb2c5a98ea6

2009-10-13T00:20:08-07:00

go back to clean schema dcba11a5892aec0d801e626361fb0da83d660bb9 Andrew Roth andrewroth@gmail.com 973171a28f60aef1b37448316761547172d42e87 Andrew Roth andrewroth@gmail.com http://github.com/twinge/ministry-tracker/commit/b432b24cefadbc0768180ca430b5ffc8316425bd b432b24cefadbc0768180ca430b5ffc8316425bd

2009-10-13T00:13:48-07:00

add permission for student leaders and up to email 3a61c38f6a666ce1db9fb63644081e7fc659afea Andrew Roth andrewroth@gmail.com 0818dd402b11d6afb22a8f2b1b8d586ee3603e5b Josh Starcher josh@Josh-Starchers-MacBook-Pro-15.local http://github.com/twinge/ministry-tracker/commit/973171a28f60aef1b37448316761547172d42e87 973171a28f60aef1b37448316761547172d42e87

2009-10-11T20:16:12-07:00

mend b8767a87689433e72b2e25fdbb9b47c24df2dca4 Josh Starcher josh@Josh-Starchers-MacBook-Pro-15.local b806a91398f3e22b7c043c8510a8716cf3b7797c Josh Starcher josh@Josh-Starchers-MacBook-Pro-15.local http://github.com/twinge/ministry-tracker/commit/0818dd402b11d6afb22a8f2b1b8d586ee3603e5b 0818dd402b11d6afb22a8f2b1b8d586ee3603e5b

2009-10-11T20:15:44-07:00

back to tobi's version of delayed_job 85d5f52292cc51d8c56943c7b80e8d2c8e8e3d8f Josh Starcher josh@Josh-Starchers-MacBook-Pro-15.local 9c46c99815c8e8c1df0a9cc02be0a1608a668f98 Josh Starcher josh@Josh-Starchers-MacBook-Pro-15.local http://github.com/twinge/ministry-tracker/commit/b806a91398f3e22b7c043c8510a8716cf3b7797c b806a91398f3e22b7c043c8510a8716cf3b7797c

2009-10-11T19:42:10-07:00

add the ability to send emails from the directory bc3636ba8a28999a194c4e1130ebaef30bba3f88 Josh Starcher josh@Josh-Starchers-MacBook-Pro-15.local eb28d5d56c22c76820bceddb46f29dda2f127642 Josh Starcher josh@Josh-Starchers-MacBook-Pro-15.local http://github.com/twinge/ministry-tracker/commit/9c46c99815c8e8c1df0a9cc02be0a1608a668f98 9c46c99815c8e8c1df0a9cc02be0a1608a668f98

2009-10-11T12:22:22-07:00

fix tests for campuses 343ed18add465661402d056178ca628df09d2285 Josh Starcher josh@Josh-Starchers-MacBook-Pro-15.local 0507398b08305dd6e4d5a449b0b629ffa006ad0b Josh Starcher josh@josh-starchers-mac-pro.local http://github.com/twinge/ministry-tracker/commit/eb28d5d56c22c76820bceddb46f29dda2f127642 eb28d5d56c22c76820bceddb46f29dda2f127642

2009-10-11T11:28:44-07:00

use production config for s3 if RAILS_ENV can't be found f14230ef8afb21820b5810e551b4f4617731b975 Josh Starcher josh@josh-starchers-mac-pro.local f1a2e20d9b540eb0393ccae34e824f3ba9e68b85 Josh Starcher josh@josh-starchers-mac-pro.local http://github.com/twinge/ministry-tracker/commit/0507398b08305dd6e4d5a449b0b629ffa006ad0b 0507398b08305dd6e4d5a449b0b629ffa006ad0b

2009-10-11T11:16:54-07:00

better error message if amazon_s3 conf file doesn't load c134b2e4256a68d72a026b37b8ed745bb7ddb45c Josh Starcher josh@josh-starchers-mac-pro.local 1f844ca2ebbee548126dca0ccfee31101c34887a Josh Starcher josh@josh-starchers-mac-pro.local http://github.com/twinge/ministry-tracker/commit/f1a2e20d9b540eb0393ccae34e824f3ba9e68b85 f1a2e20d9b540eb0393ccae34e824f3ba9e68b85

2009-10-07T08:01:03-07:00

correct schema.rb 340e294abf8001269dd8f2914bf7f35b953a0e4c Josh Starcher josh@josh-starchers-mac-pro.local 77a8b50a3203be7714a8a4c1b855964950226b3d Josh Starcher josh@josh-starchers-mac-pro.local http://github.com/twinge/ministry-tracker/commit/1f844ca2ebbee548126dca0ccfee31101c34887a 1f844ca2ebbee548126dca0ccfee31101c34887a

2009-10-07T07:57:28-07:00

add an iso_code column to countries, and make CmtGeo use it 296c1cfd98813c63ffe44c8261783e3e13f72a80 Josh Starcher josh@josh-starchers-mac-pro.local 84b1549b24f6d56c086587728ada3c0897e1be0c Andrew Roth andrewroth@gmail.com http://github.com/twinge/ministry-tracker/commit/77a8b50a3203be7714a8a4c1b855964950226b3d 77a8b50a3203be7714a8a4c1b855964950226b3d

2009-10-06T20:20:10-07:00

use active_campuses to determine campus chosen when joining, instead of looking at the primary_campus_involvement when deciding whether or not to display the message telling the user to choose a campus, use active_campuses; primary_campus_involvement isn't fully implemented and not set reliably 6a0c9ef6344ebb578643e0c56b0eb2a145bca19f Andrew Roth andrewroth@gmail.com 7841905e0b77886f9025debc1fb71dd311c262e7 Andrew Roth andrewroth@gmail.com http://github.com/twinge/ministry-tracker/commit/84b1549b24f6d56c086587728ada3c0897e1be0c 84b1549b24f6d56c086587728ada3c0897e1be0c

2009-10-06T19:55:18-07:00

request js so test passes again b4828c09c15aa7ae33c23139df63f81b98b3ef36 Andrew Roth andrewroth@gmail.com