lp:~dholbach/developer-ubuntu-com/rework-importer

Branch merges

Superseded for merging into lp:~developer-ubuntu-com-dev/developer-ubuntu-com/django-1.8-cms-2.3

Ubuntu App Developer site developers: Pending requested 2015-12-22

Diff: 1625 lines (+953/-399)

28 files modified

TODO (+13/-0)
developer_portal/admin.py (+1/-18)
developer_portal/migrations/0001_initial.py (+0/-9)
developer_portal/models.py (+0/-21)
developer_portal/settings.py (+2/-0)
locale/de.po (+2/-2)
locale/en_GB.po (+2/-2)
locale/es.po (+2/-2)
locale/ug.po (+2/-2)
locale/zh_CN.po (+2/-2)
md_importer/admin.py (+36/-0)
md_importer/management/commands/import-external-docs-branches.py (+35/-335)
md_importer/management/importer/article.py (+118/-0)
md_importer/management/importer/publish.py (+64/-0)
md_importer/management/importer/repo.py (+168/-0)
md_importer/management/importer/source.py (+60/-0)
md_importer/migrations/0001_initial.py (+46/-0)
md_importer/models.py (+54/-0)
md_importer/tests/__init__.py (+8/-0)
md_importer/tests/data/link-test/file1.md (+5/-0)
md_importer/tests/data/link-test/file2.md (+3/-0)
md_importer/tests/test_branch_fetch.py (+42/-0)
md_importer/tests/test_branch_import.py (+67/-0)
md_importer/tests/test_link_rewrite.py (+44/-0)
md_importer/tests/test_snappy_import.py (+70/-0)
md_importer/tests/test_utils.py (+33/-0)
md_importer/tests/utils.py (+67/-0)
requirements.txt (+7/-6)

api

Superseded for merging into lp:developer-ubuntu-com

Ubuntu App Developer site developers: Pending requested 2015-11-17

Diff: 886 lines (+636/-75) (has conflicts)

12 files modified

TODO (+7/-0)
developer_portal/admin.py (+22/-4)
developer_portal/management/commands/import-external-docs-branches.py (+42/-56)
developer_portal/management/importer/article.py (+126/-0)
developer_portal/management/importer/local_branch.py (+132/-0)
developer_portal/management/importer/publish.py (+60/-0)
developer_portal/management/importer/source.py (+51/-0)
developer_portal/migrations/0002_rework_importer.py (+59/-0)
developer_portal/migrations/0003_track_imported_articles.py (+24/-0)
developer_portal/models.py (+46/-15)
developer_portal/settings.py (+20/-0)
requirements.txt (+47/-0)

api

Propose for merging

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1506861: Markdown article importer messes up article tree	Critical	Fix Released
Bug #1511677: [md-importer] Figure out how to display images	Medium	Fix Released

Link a bug report

Related blueprints

301. By Daniel Holbach on 2016-01-18

update TODO

300. By Daniel Holbach on 2016-01-16

fix clean up of imported articles, add a test

299. By Daniel Holbach on 2016-01-15

break out the process of importing a branch into its own module, add a first simple test for it

298. By Daniel Holbach on 2016-01-15

use repo instead of branch consistently

297. By Daniel Holbach on 2016-01-15

use UTC for ImportedArticle.last_import, simplify ImportedArticle cleanup

296. By Daniel Holbach on 2016-01-15

add actual page object to repo.pages

295. By Daniel Holbach on 2016-01-15

update .pot file

294. By Daniel Holbach on 2016-01-15

make update-mtemplate work again, simplify it

293. By Daniel Holbach on 2016-01-15

add misc tests - forgot to 'bzr add'

292. By Daniel Holbach on 2016-01-15

update TODO