Skip to content
Open
Changes from 1 commit
Commits
Show all changes
110 commits
Select commit Hold shift + click to select a range
c23cdb4
Added Gemfile.lock to source control because it's needed by Heroku
Sep 4, 2014
3a140d5
Revert "Added Gemfile.lock to source control because it's needed by H…
Sep 4, 2014
7961d24
beyond z customizations
adamdruppe Sep 4, 2014
c822e50
move domain to config
adamdruppe Sep 4, 2014
7069dd3
Merge pull request #1 from adamdruppe/master
sadleb Sep 19, 2014
6ea4a96
configuration and assets needed for production/staging deployment
adamdruppe Sep 23, 2014
1663a26
working configuration variables
adamdruppe Sep 23, 2014
6e29482
github comment addressing - readme and SSL option fixes
adamdruppe Sep 24, 2014
87d66a5
better example config
adamdruppe Sep 24, 2014
2cdd185
comment bad example and move domain for links out of webrick section
adamdruppe Sep 24, 2014
bb0cd11
Merge pull request #2 from adamdruppe/master
sadleb Sep 24, 2014
6b6c8a9
Production servers use postgresql. Add those defaults in the Gemfile.
Sep 25, 2014
6d20f73
Remove old test authenticator
Sep 25, 2014
f13a0bc
flow explanation
adamdruppe Sep 25, 2014
dfc551a
user db explanation
adamdruppe Sep 25, 2014
52ac9ba
clearer name instead of platform - public site is the one we did ours…
adamdruppe Sep 25, 2014
85cbac3
mmore config comment
adamdruppe Sep 25, 2014
9692cde
Merge pull request #3 from adamdruppe/master
sadleb Sep 25, 2014
96671b2
remove javascript that is useless but was maing the loading+autofocus…
adamdruppe Sep 27, 2014
1ac106f
Merge pull request #4 from adamdruppe/master
sadleb Sep 30, 2014
7378cb5
default service option in config
adamdruppe Oct 3, 2014
f63d729
analytics moved to config
adamdruppe Oct 3, 2014
6fe12a2
Merge pull request #5 from adamdruppe/master
sadleb Oct 3, 2014
e5fe15a
call logout on bz platform too to keep things straight
adamdruppe Oct 6, 2014
7e5eda3
Merge pull request #6 from adamdruppe/master
sadleb Oct 6, 2014
5c7e849
kill the redirect because it gives better interop with canvas in our …
adamdruppe Oct 7, 2014
6ab7e2a
Merge pull request #7 from adamdruppe/master
sadleb Oct 7, 2014
2e714fa
should show the log in page rather than log out to avoid template error
adamdruppe Oct 7, 2014
ba13c1e
Merge pull request #8 from adamdruppe/master
sadleb Oct 7, 2014
3e44c33
analytics update
adamdruppe Oct 7, 2014
a9c7f68
oops test code should have stayed
adamdruppe Oct 7, 2014
3a7f81e
Merge pull request #9 from adamdruppe/master
sadleb Oct 7, 2014
0edb323
Permit iframing for the resume module on canvas with a security ratio…
adamdruppe Dec 9, 2014
3f3498a
Merge pull request #10 from adamdruppe/master
sadleb Dec 9, 2014
c57c282
Remove unnecessary Log in link which looked wrong on mobile
adamdruppe Jan 12, 2015
c7239f4
Extend the gray so it looks consistent
adamdruppe Jan 12, 2015
1734ba2
Merge pull request #11 from adamdruppe/master
sadleb Jan 15, 2015
ac648b5
get to post so it doesnt log pws
adamdruppe Feb 26, 2015
2c08403
use hot dog style mobile nav menu
adamdruppe Feb 26, 2015
d69d9ad
Merge pull request #12 from adamdruppe/master
sadleb Mar 5, 2015
9772f82
Merge pull request #13 from adamdruppe/mobile
sadleb Apr 6, 2015
f5b5ab6
downcase username to ensure case insensitive emails throughout
adamdruppe Apr 8, 2015
cdcabd1
Merge pull request #14 from adamdruppe/master
sadleb Apr 8, 2015
3e59308
read login message flash from cross domain
adamdruppe Apr 21, 2015
0259417
configurable cookie domain
adamdruppe Apr 21, 2015
530f1f0
Merge pull request #15 from adamdruppe/master
sadleb Apr 21, 2015
d30db24
explain cookie_domain
adamdruppe Apr 21, 2015
aeab289
fix link to be more specific
adamdruppe Apr 30, 2015
8f8c067
Merge pull request #16 from adamdruppe/master
sadleb Apr 30, 2015
16b22d8
braven style cutover (sans h1 g image)
adamdruppe Aug 18, 2015
f7de6e0
Merge pull request #17 from adamdruppe/master
sadleb Aug 18, 2015
4f4a1b3
braven icon
adamdruppe Aug 18, 2015
49284f3
missing menu icon
adamdruppe Aug 19, 2015
e71197d
Merge pull request #18 from adamdruppe/master
sadleb Aug 19, 2015
4d6fd75
missing file and https font
adamdruppe Aug 20, 2015
1028c70
Merge pull request #19 from adamdruppe/master
sadleb Aug 20, 2015
b708963
Update beyondz.org to join.bebraven.org
Dec 10, 2015
c6f07e4
css optimization first pass
adamdruppe Dec 11, 2015
02b9741
images optimization
adamdruppe Dec 11, 2015
2dd2b4a
http -> https to skip redirects
adamdruppe Dec 11, 2015
64fd3d5
Merge conflicts from adamdruppe:master
Dec 11, 2015
9d4d5d6
Merge branch 'adamdruppe-master'
Dec 11, 2015
193d7c6
Backout change of www.beyondz.org to join.bebraven.org temporarily to…
Dec 11, 2015
2986d4c
Merge pull request #21 from adamdruppe/master
sadleb Dec 15, 2015
1da4332
remove old font
adamdruppe Dec 15, 2015
b5bd120
Change beyondz.org to join.bebraven.org
Dec 16, 2015
8c213d9
Responsive bit for login on small phone screens
adamdruppe Dec 17, 2015
914461f
simplify a bit more
adamdruppe Dec 17, 2015
9905981
Add Docker support (to be used with development repo)
Mar 14, 2016
4d09256
Add docker config
Mar 15, 2016
372d800
config tweak for docker
Mar 15, 2016
11b1264
Merge pull request #23 from sadleb/docker
sadleb Mar 15, 2016
76af90d
mobile menu script
adamdruppe Jul 13, 2016
05d7ee5
mobile menu script
adamdruppe Jul 13, 2016
b636ce6
use default so logout then login is consistent
adamdruppe Aug 5, 2016
d8464cc
use default so logout then login is consistent
adamdruppe Aug 5, 2016
5a9e215
Merge pull request #25 from adamdruppe/logout
sadleb Aug 5, 2016
3f78ce6
Merge pull request #24 from adamdruppe/little2
sadleb May 11, 2017
161a3ba
Merge pull request #22 from adamdruppe/master
sadleb May 11, 2017
54055d4
Fix Volunteer menus to match public website
May 11, 2017
c978d01
Merge pull request #26 from sadleb/master
sadleb May 11, 2017
9028689
Remove navigation menus since they don't add much value and are hard …
Jul 12, 2017
d199cc5
Merge pull request #27 from sadleb/remove_menus
sadleb Jul 12, 2017
d337c12
Missed a div in last commit. Also, format the file better
Jul 12, 2017
fc2c933
Merge pull request #28 from sadleb/missed_div
sadleb Jul 12, 2017
960f8fd
link in script for staging test (will be in separate pr)
adamdruppe Oct 26, 2017
a0ef07c
merge
adamdruppe Oct 26, 2017
50a8ce9
Merge pull request #29 from adamdruppe/little2
sadleb Nov 2, 2017
b4a343b
added docker-compose files
geethaka Mar 27, 2019
dd16680
Merge pull request #30 from geethaka/docker-compose
sadleb Apr 1, 2019
2a5136c
fix jessie eol issues
geethaka Apr 7, 2019
9b36ae9
people keep asking about this message, just telling them what they ne…
adamdruppe May 16, 2019
df32947
use service param if available in logout page's login form
bellmyer May 17, 2019
a4ffd20
Merge pull request #32 from adamdruppe/master
sadleb May 23, 2019
0be7766
Merge pull request #33 from bellmyer/allow-logout-page-service-param
sadleb May 23, 2019
c4f5961
Merge pull request #31 from geethaka/docker-compose
sadleb May 23, 2019
7e1ef51
Lock the gem versions to what we have on staging on production
sadleb May 23, 2019
ddd61c6
Update docker files to work with docker-compose v3 for a local develo…
Jul 23, 2019
1377785
Add / clarify some comments on the Docker stuff
Jul 23, 2019
b958acd
Merge pull request #39 from sadleb/docker3
sadleb Jul 23, 2019
74ed210
Cleanup our Docker dev env.
Sep 12, 2019
cbbe799
Fix up docker dev env so that changes made outside the container are …
Sep 12, 2019
e19d216
Merge pull request #41 from sadleb/docker_dev_env
sadleb Sep 12, 2019
ac998c6
Make Docker restarts/rebuilds work when new gem versions are available.
sadleb Oct 21, 2019
6103cb0
Merge pull request #42 from sadleb/dev_env
sadleb Oct 21, 2019
8fefb58
Staging and prod run Ruby 1.9.3. A prior gem I pinned was for Ruby 2.1.
sadleb Oct 21, 2019
3d69391
Merge pull request #43 from sadleb/gemversion
sadleb Oct 21, 2019
85d1014
Dev env more like staging/prod + checked in Gemfile.lock
sadleb Oct 21, 2019
4dc089e
Finally think I fixed the docker dev on rebuild/restart when gem vers…
sadleb Oct 21, 2019
2d7b6af
Merge pull request #44 from sadleb/gemversion
sadleb Oct 21, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
should show the log in page rather than log out to avoid template error
  • Loading branch information
adamdruppe committed Oct 7, 2014
commit 2e714faf67ec60f8339fb9011cc6a7bac906cdb1
2 changes: 1 addition & 1 deletion lib/casserver/server.rb
Original file line number Diff line number Diff line change
Expand Up @@ -570,7 +570,7 @@ def self.init_database!
# the redirect based on the user account type automatically.

# redirect @service, 303
render @template_engine, :logout
render @template_engine, :login
elsif @continue_url
render @template_engine, :logout
else
Expand Down