Merge lp:~dholbach/developer-ubuntu-com/store-data into lp:developer-ubuntu-com
| Status: | Merged |
|---|---|
| Approved by: | David Callé on 2015-09-04 |
| Approved revision: | 160 |
| Merged at revision: | 140 |
| Proposed branch: | lp:~dholbach/developer-ubuntu-com/store-data |
| Merge into: | lp:developer-ubuntu-com |
| Diff against target: |
557 lines (+392/-6) 14 files modified
Makefile (+1/-0) developer_portal/settings.py (+2/-0) developer_portal/templatetags/text_extras.py (+26/-0) locale/developer_portal.pot (+14/-6) store_data/admin.py (+22/-0) store_data/cms_plugins.py (+19/-0) store_data/management/commands/update-gadget-snaps.py (+50/-0) store_data/management/store/api.py (+52/-0) store_data/migrations/0001_initial.py (+134/-0) store_data/models.py (+29/-0) store_data/tests.py (+3/-0) store_data/urls.py (+5/-0) store_data/views.py (+3/-0) templates/gadget_snap_list.html (+32/-0) |
| To merge this branch: | bzr merge lp:~dholbach/developer-ubuntu-com/store-data |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| David Callé | 2015-06-23 | Approve on 2015-09-04 | |
| Michael Hall | 2015-06-23 | Pending | |
|
Review via email:
|
|||
Commit Message
Add small app and management command to store data about gadget snaps (from app store).
Description of the Change
Add small app and management command to store data about gadget snaps (from app store).
| Daniel Holbach (dholbach) wrote : | # |
| David Callé (davidc3) wrote : | # |
Looks good to me, but please have a go at it Mike, I've never dealt with django DBs.
Also, one tiny diff comment.
| Daniel Holbach (dholbach) wrote : | # |
Marking as WIP as I'll push the display parts to this branch too.
| Daniel Holbach (dholbach) wrote : | # |
Up for review again, it works for me now.
- 151. By Daniel Holbach on 2015-07-01
-
add icon
| Michael Hall (mhall119) wrote : | # |
Looks good, just one change before it's done
In your GadgetSnapListP
text_enabled = True
This will allow the plug to be used inside the rich text editor, making it easier to integrate it with other page content.
- 152. By Daniel Holbach on 2015-07-02
-
add description and screenshot fields
- 153. By Daniel Holbach on 2015-07-02
-
rework api store bits to make them more extensible, add screenshot urls and description
- 154. By Daniel Holbach on 2015-07-02
-
update management command to add description and URLs
- 155. By Daniel Holbach on 2015-07-02
-
add text_enabled = True - thanks Mike
- 156. By Daniel Holbach on 2015-07-02
-
merge David Callé's beautiful work, making the gadget snap list look more beautiful
- 157. By Daniel Holbach on 2015-07-03
-
merged lp:~davidc3/developer-ubuntu-com/store_data-UI_tweaks2
- 158. By Daniel Holbach on 2015-07-03
-
update .pot file
- 159. By Daniel Holbach on 2015-07-03
-
make string translatable
- 160. By Daniel Holbach on 2015-09-04
-
merge from trunk, resolve conflicts


This solves just the data part, we'll still have to figure out how to include this in the site itself via custom plugin or whatever else.