-
Notifications
You must be signed in to change notification settings - Fork 32
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.
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
upgrade to bootstrap 3; upgrade to smarty 2.6.28; upgrade to newest vers... #26
Open
straup
wants to merge
33
commits into
exflickr:master
Choose a base branch
from
cooperhewitt:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Conversation
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
Member
straup
commented
Jan 27, 2014
- upgrade to bootstrap 3
- upgrade to smarty 2.6.28
- upgrade to newest version of lib_filter
- ensure all templates use abs_root_url
- allow for trailing slashes in URLS
- move JS back in to inc_head to $(document).ready() will work
- move navigation header in to inc_head_navi.txt because bootstrap eye-bleeding...
…ersion of lib_filter; ensure all templates use abs_root_url; allow for trailing slashes in URLS
…ersion of lib_filter; ensure all templates use abs_root_url; allow for trailing slashes in URLS
…rets in to a separate file; add http_codes
Conflicts: www/include/lib_crypto_mcrypt.php
…ib_utf8 is loaded; formatting in lib_db
update lib crypto to die rather than try to invoke templates before l…
adds support to use a proxy server
fix link to flamework-tools
Changes Unknown when pulling 6ab3b96 on cooperhewitt:master into ** on exflickr:master**. |
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.