summaryrefslogtreecommitdiff
path: root/src/lib/DB.class.php
AgeCommit message (Collapse)Author
2011-10-09Merge branch 'master' into concurrent-editingLuke Shumaker
So, here's the deal: * The meat of [concurrent-editing]:Form.class got merged into [master]:DB.class * The string-generation stuff in [concurrent-editing]:Form.class didn't fit nicely anywhere anymore, so I got rid of it by makeing datatype explicit. * Users.class: declare datatypes explicitly in attrib() * index.html.php: use this new explicit data * style.scss: add a .small, which we can do because of the datatypes thing. Conflicts: src/controllers/Users.class.php
2011-10-09Move Users->[gs]etConf into a new DB.class.php, add in some wrappers for ↵Luke Shumaker
equivalent stuff with plugin and system config.