lp:~coopebm1/sloecode/wiki-merge-proposal

Branch merges

Propose for merging

No branches dependent on this one.

Ready for review for merging into lp:sloecode

Thomi Richards: Pending requested 2012-09-19

Diff: 2926 lines (+2321/-63)

57 files modified

.bzrignore (+1/-0)
debian/README.Debian (+38/-0)
debian/apache-config/sloecode (+37/-0)
debian/changelog (+39/-0)
debian/compat (+1/-0)
debian/control (+28/-0)
debian/copyright (+1/-0)
debian/dbtemplate.ini (+11/-0)
debian/po/POTFILES.in (+2/-0)
debian/po/templates.pot (+76/-0)
debian/postinst (+95/-0)
debian/postrm (+32/-0)
debian/prerm (+12/-0)
debian/pycompat (+1/-0)
debian/rules (+11/-0)
debian/sloecode.config (+25/-0)
debian/sloecode.dirs (+10/-0)
debian/sloecode.init (+66/-0)
debian/sloecode.install (+11/-0)
debian/sloecode.links (+1/-0)
debian/sloecode.templates (+24/-0)
debian/sloecode.wsgi (+4/-0)
debian/source/lintian-overrides (+2/-0)
development.ini (+7/-1)
sloecode/bzr/display.py (+7/-3)
sloecode/bzr/factory.py (+23/-18)
sloecode/config/environment.py (+0/-1)
sloecode/config/routing.py (+11/-2)
sloecode/controllers/admin/project.py (+8/-9)
sloecode/controllers/admin/wiki.py (+91/-0)
sloecode/controllers/project.py (+8/-12)
sloecode/controllers/wiki.py (+145/-0)
sloecode/lib/base.py (+2/-0)
sloecode/lib/helpers.py (+3/-0)
sloecode/model/__init__.py (+1/-0)
sloecode/model/meta.py (+10/-2)
sloecode/model/template.py (+72/-0)
sloecode/public/css/smoothness/jquery-ui-1.8.23.custom.css (+563/-0)
sloecode/public/css/wiki.css (+239/-0)
sloecode/public/js/jquery-ui-1.8.23.custom.min.js (+69/-0)
sloecode/public/js/wiki-edit-helpers.js (+66/-0)
sloecode/sshserver/accesslog.py (+0/-1)
sloecode/templates/admin/template-edit.html (+17/-0)
sloecode/templates/admin/template-view.html (+12/-0)
sloecode/templates/admin/template-viewall.html (+13/-0)
sloecode/templates/project-details.html (+5/-0)
sloecode/templates/wiki/base.html (+21/-0)
sloecode/templates/wiki/directory.html (+31/-0)
sloecode/templates/wiki/edit.html (+42/-0)
sloecode/templates/wiki/load-template.html (+3/-0)
sloecode/templates/wiki/newfile.html (+43/-0)
sloecode/templates/wiki/page.html (+31/-0)
sloecode/templates/wiki/text.html (+5/-0)
sloecode/tests/test_project.py (+1/-1)
sloecode/tests/test_template.py (+83/-0)
sloecode/websetup.py (+2/-13)
sloecode/wikkid_view_adapters.py (+159/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

244. By Brendan Cooper on 2012-09-26

Added debian packaging stuff

243. By Brendan Cooper on 2012-09-19

Added some tests for the template model.

242. By Sam Bailey on 2012-09-14

Merged Brendan's PEP fixes into main codebase.

241. By Sam Bailey on 2012-09-13

Refactored wiki css and javascript into seperate files.

240. By Sam Bailey on 2012-09-12

Link-adding dialog closes when done on edit page.

239. By Sam Bailey on 2012-09-12

Replaced the wikkidviewadapters class structure with one file

238. By Sam Bailey on 2012-09-12

Skeleton for wikkid view adapters being done in one file

237. By Sam Bailey on 2012-09-12

Reverted un-needed PEP8 changes

236. By Sam Bailey on 2012-09-11

PEP8 fixes

235. By Sam Bailey on 2012-09-05

Added some JQuery to allow users to automatically generate links via a javascript popup when using Markdown