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.

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 14 commits into from
Dec 28, 2013
Merged

CLOSE #30, CLOSE #70 #76

merged 14 commits into from
Dec 28, 2013

Conversation

StorytellerCZ
Copy link
Collaborator

Closes issues 30 and 70.
CI3 dev update
Bootstrap update
Facebook API update
Open ID update
JS visual validation for sign up

StorytellerCZ and others added 14 commits November 19, 2013 15:13
* 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
StorytellerCZ pushed a commit that referenced this pull request Dec 28, 2013
@StorytellerCZ StorytellerCZ merged commit c8e2520 into donjakobo:ci3-beta Dec 28, 2013
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants