Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: builders/Church-ensemble
base: master
...
head fork: mdarnall/churchdeploy
compare: master
Checking mergeability… Don't worry, you can still create the pull request.
This comparison is big! We're only showing the most recent 250 commits
Commits on Jun 26, 2012
@jdsimcoe jdsimcoe Updates 92016c8
@jdsimcoe jdsimcoe updates 7e40bc2
@jdsimcoe jdsimcoe updates 0559b47
@kirkstrobeck kirkstrobeck updates 2e73e17
@jdsimcoe jdsimcoe updates b4c6070
@kirkstrobeck kirkstrobeck Merge branch 'master' of https://github.com/atheycreek/churchdeploy 759fb18
@jdsimcoe jdsimcoe updates 9093bf6
@jdsimcoe jdsimcoe updates 4533eb1
@kirkstrobeck kirkstrobeck updates 1fa2b0f
@kirkstrobeck kirkstrobeck Merge branch 'master' of https://github.com/atheycreek/churchdeploy f0848d3
@kirkstrobeck kirkstrobeck updates bfa45de
@kirkstrobeck kirkstrobeck updates a490890
@jdsimcoe jdsimcoe updates 5d6be24
@kirkstrobeck kirkstrobeck updates 616a039
@kirkstrobeck kirkstrobeck Merge branch 'master' of https://github.com/atheycreek/churchdeploy 0f98121
@jdsimcoe jdsimcoe updates ae989dc
@jdsimcoe jdsimcoe updates bab5adb
@jdsimcoe jdsimcoe updates 80bc2ec
@jdsimcoe jdsimcoe updates 5a2b47e
Commits on Jun 27, 2012
@kirkstrobeck kirkstrobeck updates 12482ce
@kirkstrobeck kirkstrobeck updates 651caf6
@kirkstrobeck kirkstrobeck updates 9c4c998
@jdsimcoe jdsimcoe updates d4b813c
@jdsimcoe jdsimcoe updates 3b7c9a1
Commits on Jun 28, 2012
@jdsimcoe jdsimcoe Updates (fixed alerts) e11cd30
@jdsimcoe jdsimcoe updates 4aed0a3
@jdsimcoe jdsimcoe updates e81b2af
Commits on Jun 29, 2012
@jdsimcoe jdsimcoe updates b958171
@jdsimcoe jdsimcoe Updates 1e2c936
@jdsimcoe jdsimcoe Updates f9af557
@jdsimcoe jdsimcoe Updates (fixed Facebook) 4c41f18
@kirkstrobeck kirkstrobeck updates ed4557f
@jdsimcoe jdsimcoe Updates c1d66bf
@jdsimcoe jdsimcoe updates 4576a80
@jdsimcoe jdsimcoe updates 3112633
@jdsimcoe jdsimcoe updates 937ee80
@jdsimcoe jdsimcoe updates 28310b7
@jdsimcoe jdsimcoe updates 52de60d
@jdsimcoe jdsimcoe updates be57360
@jdsimcoe jdsimcoe updates f3bccc6
@jdsimcoe jdsimcoe updates 2fbee97
@kirkstrobeck kirkstrobeck updates b46f199
@kirkstrobeck kirkstrobeck Merge branch 'master' of https://github.com/atheycreek/churchdeploy 6ab5f61
Commits on Jun 30, 2012
@jdsimcoe jdsimcoe updates 5c466c3
@jdsimcoe jdsimcoe updates 9f7b0b4
@jdsimcoe jdsimcoe updates e7228a7
@jdsimcoe jdsimcoe Added favicon 28883d0
@kirkstrobeck kirkstrobeck updates d627ced
@kirkstrobeck kirkstrobeck updates 7b5de8e
@kirkstrobeck kirkstrobeck updates 8f6d591
@jdsimcoe jdsimcoe updates d202a1f
@kirkstrobeck kirkstrobeck updates b7e98c0
@kirkstrobeck kirkstrobeck updates a4a34a5
@jdsimcoe jdsimcoe updates f187702
@kirkstrobeck kirkstrobeck updates ce4a8a4
@kirkstrobeck kirkstrobeck updates 52e1d46
@jdsimcoe jdsimcoe updates f727b05
@jdsimcoe jdsimcoe updates 4597b17
@kirkstrobeck kirkstrobeck updates 023f851
@jdsimcoe jdsimcoe updates 4f5632e
@kirkstrobeck kirkstrobeck updates 399d9e4
@kirkstrobeck kirkstrobeck updates ef9d080
@jdsimcoe jdsimcoe new favicon 160981a
@jdsimcoe jdsimcoe updates fd8dc45
@jdsimcoe jdsimcoe updates 00b3252
@jdsimcoe jdsimcoe Updates + locations fix 09756ab
Commits on Jul 01, 2012
@jdsimcoe jdsimcoe Fixed locations better (commented out CSS hack) 8e1ce31
@jdsimcoe jdsimcoe updates 4491d6a
@kirkstrobeck kirkstrobeck updates 2b9bb0a
@kirkstrobeck kirkstrobeck fix auto redirect 4d96f51
@jdsimcoe jdsimcoe updates 2abdd45
@jdsimcoe jdsimcoe udpates 4d90b21
@kirkstrobeck kirkstrobeck updates 075d776
@kirkstrobeck kirkstrobeck updates d68da51
@kirkstrobeck kirkstrobeck updates 0d128ec
Commits on Jul 02, 2012
@kirkstrobeck kirkstrobeck updates f16f4dd
@kirkstrobeck kirkstrobeck updates 31e2b50
Commits on Jul 03, 2012
@jdsimcoe jdsimcoe updates 9528076
Commits on Jul 05, 2012
@jdsimcoe jdsimcoe updates c215b1a
@jdsimcoe jdsimcoe Twitter tweaks, logo tweaks bbef524
@jdsimcoe jdsimcoe updates f9b334c
@jdsimcoe jdsimcoe updates 9631281
Commits on Jul 06, 2012
@jdsimcoe jdsimcoe updates 99a44ad
@kirkstrobeck kirkstrobeck updates 042e8c6
@kirkstrobeck kirkstrobeck Merge branch 'master' of https://github.com/atheycreek/churchdeploy 02d1a31
@kirkstrobeck kirkstrobeck updates 6e2caaf
@kirkstrobeck kirkstrobeck updates d4376c6
@kirkstrobeck kirkstrobeck updates eef7c7b
@kirkstrobeck kirkstrobeck updates 5381c59
@jdsimcoe jdsimcoe updates ddf43c2
@jdsimcoe jdsimcoe updates 66e5f35
@kirkstrobeck kirkstrobeck nav fixes 03468aa
@kirkstrobeck kirkstrobeck Merge branch 'master' of https://github.com/atheycreek/churchdeploy e18de22
@kirkstrobeck kirkstrobeck updates e745c49
@jdsimcoe jdsimcoe updates 5f1336b
@jdsimcoe jdsimcoe updates to member-roles output for home groups 69a0ce1
@jdsimcoe jdsimcoe Styles updates 2d13fc5
@jdsimcoe jdsimcoe updates 64b1264
@jdsimcoe jdsimcoe updates 01df6b2
@kirkstrobeck kirkstrobeck updates 27762b0
@jdsimcoe jdsimcoe updates f017de9
@kirkstrobeck kirkstrobeck updates 4f82acf
@kirkstrobeck kirkstrobeck Merge branch 'master' of https://github.com/atheycreek/churchdeploy 9884cea
@kirkstrobeck kirkstrobeck updates 3ce259a
@jdsimcoe jdsimcoe updates fed6297
Commits on Jul 07, 2012
@jdsimcoe jdsimcoe Merge branch 'master' of https://github.com/atheycreek/churchdeploy 246e7bf
@jdsimcoe jdsimcoe updates ac00b21
@jdsimcoe jdsimcoe updates 23c82bc
@jdsimcoe jdsimcoe Added HTML5 audio player ed41afc
@jdsimcoe jdsimcoe updates dc841c7
@jdsimcoe jdsimcoe updates 0b592db
@jdsimcoe jdsimcoe updates 9548650
@jdsimcoe jdsimcoe style updates c07c211
@jdsimcoe jdsimcoe updates 7b91412
@jdsimcoe jdsimcoe mp3 downloads 4e9601c
@jdsimcoe jdsimcoe updates ca8779e
@jdsimcoe jdsimcoe Less-ified AudioJS CSS 7f4fc1a
@jdsimcoe jdsimcoe updates e8fd191
@jdsimcoe jdsimcoe updates 886b4f9
@jdsimcoe jdsimcoe audioJS style cleanup d94178d
@jdsimcoe jdsimcoe updates de5b5cb
@jdsimcoe jdsimcoe Re added Teaching badge names a00edfe
@jdsimcoe jdsimcoe Better HTML5 Audio 8d9c8ba
@jdsimcoe jdsimcoe updates 1f2a662
@jdsimcoe jdsimcoe Added Download popovers to the site. d7af2bb
@jdsimcoe jdsimcoe Added popover styling 6d7d3e8
Commits on Jul 10, 2012
@jdsimcoe jdsimcoe Fixed AudioJS and Popover styles a0e239b
@jdsimcoe jdsimcoe Added better common.js handling and events link shortening 9093b47
@jdsimcoe jdsimcoe updates 7a4d405
@jdsimcoe jdsimcoe updates 49386db
Commits on Jul 11, 2012
@jdsimcoe jdsimcoe short url and canonical updates 729ed4f
@jdsimcoe jdsimcoe short links now working. teachings share links. c1d9241
@kirkstrobeck kirkstrobeck shorten links 91a5f82
@kirkstrobeck kirkstrobeck hide redirect page ab11272
@jdsimcoe jdsimcoe updates ce2ab18
@jdsimcoe jdsimcoe fix to shorturls ea6b292
@jdsimcoe jdsimcoe removed 2nd call 87d3501
@kirkstrobeck kirkstrobeck remove prerender 67208dc
@kirkstrobeck kirkstrobeck Merge branch 'master' of https://github.com/atheycreek/churchdeploy 919fe4b
Commits on Jul 12, 2012
@kirkstrobeck kirkstrobeck revised timespan 3bf0e55
@jdsimcoe jdsimcoe updates 734dda8
@jdsimcoe jdsimcoe Merge branch 'master' of https://github.com/atheycreek/churchdeploy d70dfac
@jdsimcoe jdsimcoe updates be5f3bd
Commits on Jul 13, 2012
@jdsimcoe jdsimcoe updates 275d118
@jdsimcoe jdsimcoe updates d8cc1af
@jdsimcoe jdsimcoe updates 55f7e06
@jdsimcoe jdsimcoe podcast updates 6e50367
Commits on Jul 14, 2012
@jdsimcoe jdsimcoe updates 8d83fdf
@kirkstrobeck kirkstrobeck fix shortlinks, add http:// 0fc94f3
Commits on Jul 15, 2012
@jdsimcoe jdsimcoe updates ce8f8d4
@kirkstrobeck kirkstrobeck updates 278b006
@kirkstrobeck kirkstrobeck updates 857edef
Commits on Jul 16, 2012
@jdsimcoe jdsimcoe updates 6b06df6
@jdsimcoe jdsimcoe updates 7f16336
@jdsimcoe jdsimcoe updates 40d5875
@jdsimcoe jdsimcoe updates 6d895ce
@jdsimcoe jdsimcoe update b7aff95
Commits on Jul 17, 2012
@jdsimcoe jdsimcoe updates 9d3b44a
@jdsimcoe jdsimcoe updates 6ef12c1
@jdsimcoe jdsimcoe updates a7f7c06
@jdsimcoe jdsimcoe updates 8acf2ad
@jdsimcoe jdsimcoe updates 56d2fb2
@jdsimcoe jdsimcoe updates b8035f3
@jdsimcoe jdsimcoe updates 0f659cc
@jdsimcoe jdsimcoe updates 33fad92
Commits on Jul 18, 2012
@jdsimcoe jdsimcoe updates 81232b7
Commits on Jul 19, 2012
@jdsimcoe jdsimcoe updates 6a965d7
@jdsimcoe jdsimcoe updates 23b3da1
@jdsimcoe jdsimcoe updates 5aa59b6
@jdsimcoe jdsimcoe updates 2f30359
@jdsimcoe jdsimcoe updates 69b3a3f
@jdsimcoe jdsimcoe updates (alert cookies) 1a6a3e4
Commits on Jul 20, 2012
@jdsimcoe jdsimcoe podcast update e48f206
@jdsimcoe jdsimcoe updates 7b020dd
@jdsimcoe jdsimcoe updates 8ce4812
@jdsimcoe jdsimcoe alert push 5c3b3e7
@jdsimcoe jdsimcoe alert cleanup 4046133
@jdsimcoe jdsimcoe updates c27652c
Commits on Jul 21, 2012
@jdsimcoe jdsimcoe updates 645c939
@jdsimcoe jdsimcoe updates 1f0b9b5
@jdsimcoe jdsimcoe updates 57019a9
Commits on Jul 25, 2012
@jdsimcoe jdsimcoe updates d4a906a
@jdsimcoe jdsimcoe updates bb6417c
@jdsimcoe jdsimcoe updates 012b886
Commits on Jul 26, 2012
@jdsimcoe jdsimcoe updates 9896044
@jdsimcoe jdsimcoe updates 54a29e5
@jdsimcoe jdsimcoe updates 06ecc12
Commits on Jul 27, 2012
@jdsimcoe jdsimcoe major mobile style fixes e4fd93c
@jdsimcoe jdsimcoe fixed up arrow "to-top" link fbc8610
@jdsimcoe jdsimcoe mobile and font-display updates 67ce10e
Commits on Jul 28, 2012
@jdsimcoe jdsimcoe created custom Pictos font 0f6b1bc
@jdsimcoe jdsimcoe more icon font updates 9977315
Commits on Aug 01, 2012
@jdsimcoe jdsimcoe Vectorized the Athey logo and updated Custom Icon Font 887774a
@jdsimcoe jdsimcoe updated icon font f0e59ec
@jdsimcoe jdsimcoe updated icon font c987e97
@jdsimcoe jdsimcoe cleaned up mobile footer 1bfe75a
@jdsimcoe jdsimcoe updates 32af973
@jdsimcoe jdsimcoe custom bootstrap c9966eb
Commits on Aug 02, 2012
@jdsimcoe jdsimcoe updates 3cf12a7
@jdsimcoe jdsimcoe fixed icon font. No images now. ec356d5
@jdsimcoe jdsimcoe one last tweak 3ebf640
Commits on Aug 03, 2012
@jdsimcoe jdsimcoe updates 0786af3
Commits on Aug 04, 2012
@jdsimcoe jdsimcoe updates + email newsletter testing a9521be
Commits on Aug 05, 2012
@jdsimcoe jdsimcoe updates 2f0a5e7
Commits on Aug 08, 2012
@jdsimcoe jdsimcoe updates 1cd9f8e
@jdsimcoe jdsimcoe updates 304c449
@jdsimcoe jdsimcoe updates 6ea0434
Commits on Aug 09, 2012
@jdsimcoe jdsimcoe updates 0db21b7
Commits on Aug 14, 2012
@jdsimcoe jdsimcoe updates 364000a
@jdsimcoe jdsimcoe updates (added bootstrap 2.1) 8eca744
@jdsimcoe jdsimcoe updates ac3b81d
Commits on Aug 15, 2012
@jdsimcoe jdsimcoe update 5a16447
Commits on Aug 16, 2012
@jdsimcoe jdsimcoe updates ee9b8ae
@jdsimcoe jdsimcoe updates d75a67d
Commits on Aug 21, 2012
@jdsimcoe jdsimcoe updates 208e9ba
@jdsimcoe jdsimcoe alert functionality a6b98c2
@jdsimcoe jdsimcoe more alert updates 6384879
Commits on Aug 22, 2012
@jdsimcoe jdsimcoe correctes tachinas overflow issue 869c0dd
Commits on Aug 23, 2012
@jdsimcoe jdsimcoe updates fcf7acb
@jdsimcoe jdsimcoe style updates 0ab88e2
@jdsimcoe jdsimcoe improved alerts for bootstrap 2.1 to use <button> instead of <a> 98394e5
@jdsimcoe jdsimcoe removed old bootstrap a8830c0
@jdsimcoe jdsimcoe removed old bootstrap 8ab279f
@jdsimcoe jdsimcoe updates 1289ffe
@jdsimcoe jdsimcoe updates 1fea71f
@mdarnall mdarnall updating the symphony error handling b125e3e
Commits on Aug 26, 2012
@mdarnall mdarnall Adding grunt.js config for building JavaScript. Fixing a few linter
suggestions in common.js
b80731f
@mdarnall mdarnall global audiojs a0d22bf
Commits on Aug 28, 2012
@jdsimcoe jdsimcoe updates a3e9736
@jdsimcoe jdsimcoe re-added bootstrap e29d6d8
@jdsimcoe jdsimcoe updates 12cf65e
@jdsimcoe jdsimcoe updates e6ffb0c
@jdsimcoe jdsimcoe updates 5f27ac9
Commits on Aug 29, 2012
@jdsimcoe jdsimcoe bootstrap re-arrange and updates f45e313
@jdsimcoe jdsimcoe updates 8163f52
@jdsimcoe jdsimcoe updates 891e70e
@jdsimcoe jdsimcoe updates 132af25
@jdsimcoe jdsimcoe updates 0b42114
@jdsimcoe jdsimcoe design updates 75185d0
Commits on Sep 01, 2012
@mdarnall mdarnall Adding new alertManger object for managing the state of alerts for th…
…e user.
61967fa
@mdarnall mdarnall Merge remote branch 'upstream/master' a92bb10
@mdarnall mdarnall Updating our version of jquery.cookie.js
New version will do json parse/stringify for us
4fd1ed3
@mdarnall mdarnall Updated grunt file
Adds bootstrap
watch will only concat files
f1c2e82
@jdsimcoe jdsimcoe updates b07b5a6
@mdarnall mdarnall First pass at alert logic 0988e33
@mdarnall mdarnall Merge remote branch 'upstream/master' 8af3e68
@mdarnall mdarnall remove debug statements e573687
@mdarnall mdarnall Adding a simple check for native json support.
If it's not found it will also include the json2 pollyfill
a61ddea
@mdarnall mdarnall Adding the json2 library fcfaeab
Commits on Sep 07, 2012
@mdarnall mdarnall Adding lodash as a dependency of alertManager instead of filling es5 …
…for ie < 9
825c1dc