Merge lp://staging/~gepatino/ubuntu-accomplishments-web/addshare into lp://staging/ubuntu-accomplishments-web
Proposed by
Gabriel Patiño
| Status: | Merged |
|---|---|
| Merged at revision: | 156 |
| Proposed branch: | lp://staging/~gepatino/ubuntu-accomplishments-web/addshare |
| Merge into: | lp://staging/ubuntu-accomplishments-web |
| Diff against target: |
171 lines (+80/-6) 7 files modified
common/templates/base.html (+1/-1) settings.py.sample (+1/-0) users/models.py (+8/-0) users/templates/users/profile.html (+5/-1) users/tests.py (+52/-1) users/urls.py (+3/-2) users/views.py (+10/-1) |
| To merge this branch: | bzr merge lp://staging/~gepatino/ubuntu-accomplishments-web/addshare |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| ubuntu-accomplishments-web-editor-drivers | Pending | ||
|
Review via email:
|
|||
Description of the change
Added share registration feature.
If using a custom settings.py file, merge changes from settings.py.sampe (added USER_SHARES_FILE option)
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
