lp://staging/~quam-plures-core/quam-plures/qp5_final_branch

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://staging/quam-plures at revision 7663

Quam Plures Core Team: Pending requested 2013-04-01

Diff: 2497 lines (+864/-454)

44 files modified

admin.php (+3/-3)
blog2.php (+0/-42)
blog3.php (+0/-42)
blog4.php (+0/-42)
qp_config/_admin.php (+72/-7)
qp_inc/_application.php (+3/-3)
qp_inc/_core/__core.init.php (+25/-48)
qp_inc/_core/_param.funcs.php (+5/-0)
qp_inc/_core/model/__core.install.php (+2/-32)
qp_inc/_core/ui/results/_results.class.php (+12/-6)
qp_inc/blogs/blogs.ctrl.php (+1/-1)
qp_inc/blogs/model/_blog.class.php (+3/-3)
qp_inc/files/file_settings.ctrl.php (+48/-16)
qp_inc/files/files.ctrl.php (+2/-2)
qp_inc/files/model/_file.class.php (+3/-0)
qp_inc/files/model/_file.funcs.php (+5/-4)
qp_inc/files/model/_filelist.class.php (+5/-2)
qp_inc/files/model/_fileroot.class.php (+3/-3)
qp_inc/files/model/_filerootcache.class.php (+1/-1)
qp_inc/files/upload.ctrl.php (+124/-42)
qp_inc/files/views/_file_browse.view.php (+2/-2)
qp_inc/files/views/_file_browse_set.form.php (+1/-1)
qp_inc/files/views/_file_list.inc.php (+1/-1)
qp_inc/files/views/_file_settings.form.php (+32/-59)
qp_inc/generic/model/_genericelement.class.php (+1/-1)
qp_inc/generic/views/_generic_category.form.php (+1/-1)
qp_inc/plugins/_plugin.class.php (+11/-0)
qp_inc/plugins/_plugin.funcs.php (+2/-1)
qp_inc/plugins/model/_plugins_admin.class.php (+1/-0)
qp_inc/sessions/_sessions.init.php (+3/-6)
qp_inc/settings/model/_generalsettings.class.php (+9/-1)
qp_inc/templates/model/_template.class.php (+3/-0)
qp_inc/tools/views/_system_list.view.php (+2/-20)
qp_inc/users/model/_user.class.php (+28/-7)
qp_inc/users/model/_user.funcs.php (+37/-12)
qp_inc/users/model/_usersettings.class.php (+1/-1)
qp_inc/users/users.ctrl.php (+11/-0)
qp_inc/users/views/_user.form.php (+46/-20)
qp_inc/users/views/_user_list.view.php (+37/-10)
qp_install/_create_items.php (+9/-9)
qp_install/_functions_dbupgrade.php (+297/-0)
qp_plugins/smilies_plugin/_smilies.plugin.php (+6/-1)
qp_srvc/profile_update.php (+4/-1)
qp_srvc/register.php (+2/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

7668. By EdB on 2013-04-18

updating release date to today

7667. By EdB on 2013-04-18

more stuff ... not sure what but it fixes problems

7666. By EdB on 2013-04-01

tested, done, don't need the stock blogN files

7665. By EdB on 2013-04-01

tweaks

7664. By EdB on 2013-03-31

asdf

7663. By EdB on 2013-03-31

lotsa stuff, not tested at all ... probably works great :)

7662. By EdB on 2013-03-29

quam-plures/qp5_more_db_work

7661. By EdB on 2013-03-22

quam-plures/qp5_next_branch

7660. By EdB on 2013-03-18

qp5_colls-blogs_chaps-cats

7659. By EdB on 2013-03-11

merging in quam-plures/qp5_html5_templates branch