Merge lp://staging/authpuppy/ap-auth-local-user-plugin into lp://staging/authpuppy
| Status: | Rejected | ||||
|---|---|---|---|---|---|
| Rejected by: | gbastien | ||||
| Proposed branch: | lp://staging/authpuppy/ap-auth-local-user-plugin | ||||
| Merge into: | lp://staging/authpuppy | ||||
| Diff against target: |
3429 lines (+3092/-0) (has conflicts) 58 files modified
ChangeLog (+76/-0) LICENSE (+340/-0) README (+17/-0) config/apAuthLocalUserPluginConfiguration.class.php (+34/-0) config/doctrine/schema.yml (+57/-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 (+83/-0) lib/form/doctrine/PluginapUserForm.class.php (+70/-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 (+64/-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/model/apAuthLocalUser.php (+129/-0) lib/model/apAuthLocalUserMain.class.php (+61/-0) lib/model/doctrine/PluginapUser.class.php (+150/-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/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/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/authpuppy/ap-auth-local-user-plugin | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| gbastien | Disapprove | ||
|
Review via email:
|
|||
Commit message
Add terms of service validation feature on user signup
Description of the change
Add terms of service validation feature on user signup :
- 3 new fields in configuration form : must_accept_tos (bool), tos_url(string), must_accept_
- a new field in user signup form
| gbastien (gbastien02) wrote | # |
Unmerged revisions
- 39. By gbastien
-
Finally committed some changes: german translations and behavior of change password form. Also added option to have only one connection per username, the rest are expired (bug #1029879)
- 38. By gbastien
-
0.1.6-alpha: Disable CSRF protection for signup form, implement the getErrors function of the authenticator
- 37. By gbastien
-
username cannot be blank spaces anymore (#772751)
- 36. By gbastien
-
Added proper credentials to actions; Sends the node as parameter to the signin form; Added an event to the signin form
- 35. By gbastien
-
Changed the menu behavior. Added parameter to the generateRandomP
assword to specify the possible values - 34. By gbastien
-
Added a few useful event calls to this plugin
- 33. By gbastien
-
Corrected security vulnerability (bug #775250); text before and text after are not mandatory anymore (bug #766604)
- 32. By gbastien
-
Finished remember me functionnality (#714594); can add text before and after login form (#712219); can now filter and page the user list (#708984); changed image path for navigation
- 31. By gbastien
-
Added polish translation by Robin Jones; started working on a remember me functionnality
- 30. By gbastien
-
0.1.5-dev: No old password length verification bug #674702, userid used in url instead of username (who may have special characters) bug #680281
Plugins are not to be merged with the trunk, as none of them are mandatory to run the authpuppy auth server. ap-auth-local-user is just one of the possible authentication plugin.
The changes you did to the plugin should be done in the original branch, in the plugins/ directory and not merged here.