rSmart/3akai-ux — pull request #48 by johne (2012-02-01 23:44:04+00:00)
Title: added email verify and lost password features

commit 70c1a9e3295e3de4a2a4c886adef7e5ed9f52c75
Author: john ellis
Date: Wed Feb 1 15:31:58 2012 -0700

added bundle property for the email settings tab

commit 7fa7d7694f770b96f81b63b82bec836f4fe6cd9d
Merge: 8ebba14 0d3679d
Author: john ellis
Date: Wed Feb 1 13:00:31 2012 -0700

Merge branch 'develop' of github.com:rSmart/3akai-ux into ACAD-145-try2

* 'develop' of github.com:rSmart/3akai-ux:
NOJIRA release/1.1.0-M1-20120130 CHANGELOG
NOJIRA release/1.1.0-M1-20120130
ACAD-622 corrected string replace call that was affecting derivation of user ID from element
NOJIRA acad-1.1.0-M1-20120124 CHANGELOG
NOJIRA release/acad-1.1.0-M1-20120124
ACAD-614 Fixing join request buttons for IE8
SAKIII-4703 fix IE8 bug in profile pages
SAKIII-4305 - Fix the fact that widgets can only be dragged to top of leftmost column.
ACAD-613 Revert "TEMPORARY: Removing the acceptterms widget from the topnavigation until the nakamura-extensions bundle is updated. Revert this commit once it is fixed."

commit 8ebba14a22cdebd7397e399d60f8b7607b7e17b0
Author: john ellis
Date: Wed Feb 1 10:31:43 2012 -0700

fixed formatting on create acct page

commit baafb6eeb15d064263f9587b22d3ed52ac0f24d7
Author: john ellis
Date: Mon Jan 30 11:55:17 2012 -0700

putting lost pwd back in

commit 7275d6c967dea3b56a010cc94f8e73122be9ebff
Author: john ellis
Date: Mon Jan 23 16:24:56 2012 -0700

Squashed commit of the following:

commit acea29d88f21f803edc77c545c993e0db6062798
Author: john ellis
Date: Thu Jan 19 14:50:48 2012 -0700

ACAD-145 fixed a merge problem

commit 7057795f7c8e569785bbbe4eff88edf218789c1c
Merge: ed776ed ac9cf1a
Author: john ellis
Date: Wed Jan 18 16:36:36 2012 -0700

Merge branch 'ACAD-145' into ACAD-145-1-1

* ACAD-145:
changed some css to support reset password
adding lostpwd to top navigation when user is anon
added stuff to verify email not existing when changing
added small section in accountprefs for email change to be injected
disabling email address in ui
ACAD-145 added messages for the email verification error screen
added emailverify widget to topnavigationy
starting to enforce uniquness in email change... NOT WORKING YET
added a required unique email

Conflicts:
dev/bundle/default.properties
dev/bundle/test.properties
dev/create_new_account.html
dev/javascript/createnewaccount.js
dev/lib/sakai/sakai.api.user.js
devwidgets/accountpreferences/accountpreferences.html
devwidgets/accountpreferences/css/accountpreferences.css
devwidgets/profilesection/profilesection.html
devwidgets/topnavigation/topnavigation.html

commit ac9cf1a14474adf57eb7c7b2aa95833ec210b42b
Author: john ellis
Date: Thu Jan 5 16:07:50 2012 -0700

changed some css to support reset password

commit 4bdffadc4d14d67a8c7f4c8ed80877cf2bcc0984
Author: john ellis
Date: Thu Jan 5 12:44:48 2012 -0700

adding lostpwd to top navigation when user is anon

commit a42c9e10b1340c3634e5a2944e5fcf0c73c293d9
Author: john ellis
Date: Mon Dec 19 17:40:39 2011 -0700

added stuff to verify email not existing when changing

commit 545364fdfb7730744d2c671371a4e48a938c3360
Merge: 2914395 7c4bfa2
Author: john ellis
Date: Thu Dec 15 15:41:06 2011 -0700

Merge branch 'develop' of github.com:rSmart/3akai-ux into ACAD-145

* 'develop' of github.com:rSmart/3akai-ux:
ACAD-56 corrected setting of height for frame; previous fix relied on timing of rendering versus timing of javascript call
NOJIRA acad-1.0.2-M4-20111208 tag

commit 2914395080cc95e6dde31eab6ffb5d71f48a1439
Merge: 9526a14 ae7bfc1
Author: john ellis
Date: Thu Dec 15 15:00:15 2011 -0700

Merge branch 'ACAD-231' into ACAD-145

* ACAD-231:
starting to enforce uniquness in email change... NOT WORKING YET
added a required unique email

Conflicts:
dev/configuration/config.js

commit 9526a146c1de228301837c983c9c375432d61c38
Author: john ellis
Date: Wed Dec 14 15:08:47 2011 -0700

added small section in accountprefs for email change to be injected

commit a8f5f4225e16a6a4c7a23b7c25b2c22e0caece23
Author: john ellis
Date: Wed Dec 7 15:32:47 2011 -0700

disabling email address in ui

commit fbb30133cc19b5857d0fa65f652d59d0fc1b2610
Author: john ellis
Date: Thu Dec 1 14:00:53 2011 -0700

ACAD-145
added messages for the email verification error screen

commit 0bc3b0dd96afcd1e5a9f7fbd071c5149044fb350
Author: john ellis
Date: Thu Nov 17 16:25:32 2011 -0700

added emailverify widget to topnavigationy

commit ae7bfc1ac9a06c2adc1875f07ee223e1530662f7
Author: john ellis
Date: Mon Nov 28 14:55:53 2011 -0700

starting to enforce uniquness in email change... NOT WORKING YET

commit c8f6da9ce70cc39b3d2d38ec98cd1af0dce8ed54
Author: john ellis
Date: Wed Nov 23 16:14:17 2011 -0700

added a required unique email