Merge lp://staging/~brenard/authpuppy/ap-auth-local-user-plugin into lp://staging/authpuppy
Proposed by
Benjamin Renard
| Status: | Merged |
|---|---|
| Merge reported by: | Benjamin Renard |
| Merged at revision: | not available |
| Proposed branch: | lp://staging/~brenard/authpuppy/ap-auth-local-user-plugin |
| Merge into: | lp://staging/authpuppy |
| Diff against target: |
3748 lines (+3381/-0) (has conflicts) 64 files modified
ChangeLog (+76/-0) LICENSE (+340/-0) README (+17/-0) config/apAuthLocalUserPluginConfiguration.class.php (+34/-0) config/doctrine/schema.yml (+85/-0) config/plugin.yml (+3/-0) config/routing.yml (+50/-0) i18n/fr/messages.xml (+225/-0) i18n/pl/messages.xml (+201/-0) info.yml (+7/-0) lib/filter/doctrine/PluginapUserFormFilter.class.php (+61/-0) lib/filter/doctrine/autogenerated/apUserFormFilter.class.php (+14/-0) lib/filter/doctrine/autogenerated/base/BaseapUserFormFilter.class.php (+62/-0) lib/form/apAuthLocalUserConfigureForm.php (+98/-0) lib/form/doctrine/PluginapUserForm.class.php (+70/-0) lib/form/doctrine/PluginapUserHistoryForm.class.php (+13/-0) lib/form/doctrine/apAuthLocalUserForgotPasswordForm.php (+28/-0) lib/form/doctrine/apAuthLocalUserMyAccountForm.class.php (+57/-0) lib/form/doctrine/apAuthLocalUserSigninForm.class.php (+71/-0) lib/form/doctrine/apAuthLocalUserSignupForm.class.php (+73/-0) lib/form/doctrine/autogenerated/apUserForm.class.php (+16/-0) lib/form/doctrine/autogenerated/base/BaseapUserForm.class.php (+53/-0) lib/migration/doctrine/001_initial_tables.class.php (+19/-0) lib/migration/doctrine/002_adding_token_and_status.php (+15/-0) lib/migration/doctrine/003_add_index.php (+21/-0) lib/migration/doctrine/004_add_lowerfield.php (+21/-0) lib/migration/doctrine/005_add_rememberme.php (+21/-0) lib/migration/doctrine/006_add_history.php (+24/-0) lib/model/apAuthLocalUser.php (+129/-0) lib/model/apAuthLocalUserMain.class.php (+61/-0) lib/model/doctrine/PluginapUser.class.php (+211/-0) lib/model/doctrine/PluginapUserHistory.class.php (+16/-0) lib/model/doctrine/PluginapUserHistoryTable.class.php (+19/-0) lib/model/doctrine/PluginapUserRememberMe.class.php (+35/-0) lib/model/doctrine/PluginapUserRememberMeTable.class.php (+33/-0) lib/model/doctrine/PluginapUserTable.class.php (+97/-0) lib/model/doctrine/autogenerated/apUser.class.php (+15/-0) lib/model/doctrine/autogenerated/apUserHistory.class.php (+15/-0) lib/model/doctrine/autogenerated/apUserRememberMe.class.php (+15/-0) lib/model/doctrine/autogenerated/apUserRememberMeTable.class.php (+11/-0) lib/model/doctrine/autogenerated/apUserTable.class.php (+11/-0) lib/model/doctrine/autogenerated/base/BaseapUser.class.php (+75/-0) lib/model/doctrine/autogenerated/base/BaseapUserHistory.class.php (+89/-0) lib/model/doctrine/autogenerated/base/BaseapUserRememberMe.class.php (+60/-0) lib/validator/apAuthLocalUserEmailValidator.class.php (+53/-0) lib/validator/apAuthLocalUserValidator.class.php (+67/-0) modules/apAuthLocalUserLogin/actions/actions.class.php (+160/-0) modules/apAuthLocalUserLogin/config/security.yml (+9/-0) modules/apAuthLocalUserLogin/templates/_apAuthLocalUserForgotPasswordForm.php (+29/-0) modules/apAuthLocalUserLogin/templates/_apAuthLocalUserMyAccountForm.php (+26/-0) modules/apAuthLocalUserLogin/templates/_apAuthLocalUserSigninForm.php (+86/-0) modules/apAuthLocalUserLogin/templates/_apAuthLocalUserSignupForm.php (+28/-0) modules/apAuthLocalUserLogin/templates/_form.php (+24/-0) modules/apAuthLocalUserLogin/templates/_formConfigure.php (+25/-0) modules/apAuthLocalUserLogin/templates/_new_password.php (+13/-0) modules/apAuthLocalUserLogin/templates/_newuserform.php (+53/-0) modules/apAuthLocalUserLogin/templates/_validate.php (+14/-0) modules/apAuthLocalUserLogin/templates/authSuccess.php (+3/-0) modules/apAuthLocalUserLogin/templates/editSuccess.php (+3/-0) modules/apAuthLocalUserLogin/templates/indexSuccess.php (+84/-0) modules/apAuthLocalUserLogin/templates/myaccountSuccess.php (+3/-0) modules/apAuthLocalUserLogin/templates/newSuccess.php (+3/-0) modules/apAuthLocalUserLogin/templates/showSuccess.php (+30/-0) modules/apAuthLocalUserLogin/templates/validateSuccess.php (+1/-0) Conflict adding file ChangeLog. Moved existing file to ChangeLog.moved. Conflict adding file LICENSE. Moved existing file to LICENSE.moved. Conflict adding file README. Moved existing file to README.moved. Conflict adding file config. Moved existing file to config.moved. Conflict adding file lib. Moved existing file to lib.moved. |
| To merge this branch: | bzr merge lp://staging/~brenard/authpuppy/ap-auth-local-user-plugin |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| AllianceCsfDev | Pending | ||
|
Review via email:
|
|||
Description of the change
I added user account history feature : all actions on user account will be log in database if user account history is enable in the configuration of the plugin.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
