forked from pengkong/A3M-for-CodeIgniter-2.0
-
Notifications
You must be signed in to change notification settings - Fork 52
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
CLOSE #30, CLOSE #70 #76
Merged
Merged
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
* Updated CSS to Bootstrap 3 and did according changes to the views * Renamed controllers to be more SEO friendly * Renamed E-mail authentication to validation to prevent confusion * Views are now displayed into template which combines head, header and footer views into one.
@AdwinTrave, thanks for all the help porting to A3M!
Updates CodeIgniter with the most recent development Made a small theme fix on connect_create.php Fixed an issue where you were unable to login from social media
Conflicts: README.md application/controllers/account/Profile.php application/views/account/reset_password_captcha.php application/views/account/reset_password_unsuccessful.php
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.
Closes issues 30 and 70.
CI3 dev update
Bootstrap update
Facebook API update
Open ID update
JS visual validation for sign up