Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Geolocation script setup #5

Open
wants to merge 105 commits into
base: master
Choose a base branch
from
Open

Geolocation script setup #5

wants to merge 105 commits into from

Conversation

rtrvrtg
Copy link

@rtrvrtg rtrvrtg commented May 22, 2013

The geolocation JS (documentation at top of file) and its inclusion in the theme.

rtrvrtg and others added 30 commits May 21, 2013 22:45
@rtrvrtg
Merge pull request #1 from Zarabadoo/master
ebcec33 
Pulling theme updates down
Added a geolocation frontend script
2da878f
Housing modules
8a99752
remove non-docroot modules
39d58d4
Included geoloc JS in theme
43d9e0e
move .htaccess to the docroot
c4f4dab
Merge branch 'master' of https://github.com/Zarabadoo/Drupal4OK into …
1439f4b 
…Zarabadoo-master
Moved geoloc script
64baeb3
@scor
remove settings.php
7fabe02
@Zarabadoo
Move the theme into the current eworking branch.
560b9d0
@Zarabadoo
Merge branch 'housing' of github.com:japerry/Drupal4OK into housing
edf0e7c
Fonts and forms base
a783a7b
@Zarabadoo
Merge pull request Zarabadoo#6 from vml-akoebbe/housing
01b1d9f 
Fonts and forms base
remove qldfloods module
1f5bdfc
add housing have module
dacf2e7
add node_autotitles for auto generating titles for housing
bc7f5df
Merge branch 'housing' of github.com:japerry/Drupal4OK into housing
8db44fe
remove rouge sites directory outside of docroot
ebc26e7
@cfblack
Ride sharing ride request content type feature and base person info f…
dab4c3e 
…eature.
@Zarabadoo
Remove unused css files.
7c8374f
@Zarabadoo
Add a bit of padding to table cells.
18d779b
@Zarabadoo
Add in a basic design file so that crews will always have it.
0570183
Adding template folder and page.tpl.php. Edited 'heading' to an array…
0d2325e 
… including class 'element-invisible'
@rtrvrtg
Merge pull request #2 from Zarabadoo/master
1c7899b 
Change dir structure
strongarm and autonodetitle for housing_need
0bc3a49
@Zarabadoo
Merge pull request Zarabadoo#7 from mr-bun/housing
1383f4f 
Adding template folder and page.tpl.php. Edited 'heading' to an array in...
Merge branch 'housing' of https://github.com/Zarabadoo/Drupal4OK into…
f376fa1 
… Zarabadoo-housing

Conflicts:
	docroot/sites/all/themes/drupal4ok/drupal4ok.info
	docroot/sites/all/themes/drupal4ok/stylesheets/css/screen.css
	docroot/sites/all/themes/drupal4ok/stylesheets/sass/partials/_base.scss
	docroot/sites/all/themes/drupal4ok/stylesheets/sass/screen.scss
@rtrvrtg
Merge pull request #3 from Zarabadoo/housing
f39fdca 
Pull in Housing
Merge pull request #3 from Zarabadoo/housing
8736c75 
Housing
Font tweaks
adfdebd 
Menu Attribute module
vml-akoebbe and others added 30 commits May 22, 2013 09:36
comment out fancy buttons until we need it
bb6181a
@Zarabadoo
Make the menu collapsing react to clicks and not hover actions.
f0de18a
Initial theming changes for user register/login pages (templates, hoo…
93738a1 
…k_theme)
@Zarabadoo
Merge pull request #15 from vml-akoebbe/housing
4ca65d8 
Homepage theme tweaks
@mrconnerton
Adding the rules module and an update script to enable it. Updating t…
5eac7dc 
…he housing view
@Zarabadoo
Merge pull request #20 from mhazy/login-themes
790cf58 
Initial theming changes for user register/login
Merge branch 'housing' of github.com:bryanhirsch/Drupal4OK into housing
b666523
@Zarabadoo
Remove unused styles files.
91cbe2e
@Zarabadoo
Merge pull request #24 from Zarabadoo/housing
8b170f1 
Remove unused styles files.
Responsive tweaks
ef82896
Merge remote-tracking branch 'bryanhirsch/housing' into housing
e73cd39
@Zarabadoo
Merge pull request #27 from vml-akoebbe/housing
9a5e918 
Responsive tweaks
Merge branch 'housing' of github.com:bryanhirsch/Drupal4OK into housing
690d248
@mrconnerton
Updating some labels and verbage on the people that need housing view
2971198
@Zarabadoo
Merge pull request #29 from mrconnerton/housing
d9d0d16 
Updating some labels and verbage on the people that need housing view
added a help4ok rules module. initially has a redirect rule for node/…
7f36769 
…add path
Merge branch 'housing' of github.com:bryanhirsch/Drupal4OK into housing
cccb678
@Zarabadoo
Merge pull request #33 from heddn/housing
e0f261d 
Housing
@toddway
Add menu item and landing page for need a ride
849090c
@Zarabadoo
Issue #28 by Zarabadoo: Clean up spacing on small screens.
009247f
@Zarabadoo
Merge pull request #36 from Zarabadoo/housing
b6ba255 
Issue #28 by Zarabadoo: Clean up spacing on small screens.
@toddway
Merge branch 'housing' of https://github.com/bryanhirsch/Drupal4OK in…
3a84643 
…to housing
@rtrvrtg
Merge pull request #4 from Zarabadoo/housing
b3b212e 
Housing
Added pre-menu region (for login/logout links)
d042293
Tweaked menu styles
b3702e5
Merge branch 'housing' of https://github.com/bryanhirsch/Drupal4OK
3741ab1
Tweaked menu CSS settings
50ac568
Switched to base rhythm unit
3702532
IE8 css fixes?
5f2cad5
Added IE behaviour script
491e8e1
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@rtrvrtg @scor @Zarabadoo @cfblack @MrMaksimize @drastik @mrconnerton @toddway