Commit Graph
11 Commits
Author SHA1 Message Date
Mustufa Rangwala (OpenERP) 0def7e63f4 [MERGE] Merge from main addons
bzr revid: mra@tinyerp.com-20120816045516-0btt11bg3wow7oor
2012-08-16 10:25:16 +05:30
Vo Minh Thu 2376fe0add [MERGE] merged view changes: the type is now a functional field derived from the arch.
bzr revid: vmt@openerp.com-20120814121117-dent4ctz89kdcabi
2012-08-14 14:11:17 +02:00
Vo Minh Thu 9822629548 [MERGE] merged trunk.
bzr revid: vmt@openerp.com-20120813160657-ilujdek8ys4fzhp9
2012-08-13 18:06:57 +02:00
Mustufa Rangwala (OpenERP) 952bf3001d [MERGE] Merge from main addons
bzr revid: mra@tinyerp.com-20120813050523-wgxqhbptiy0v75eq
2012-08-13 10:35:23 +05:30
Antony Lesuisse 9211174a6f [MERGE] document_page aka wiki
it still uses the wiki syntax, switch to full html will occur after the
autosizing of cleditor

bzr revid: al@openerp.com-20120812144730-nxgxz8c77afczfr9
2012-08-12 16:47:30 +02:00
Antony Lesuisse d2a01d78a4 fixes css, demo, js
bzr revid: al@openerp.com-20120811183444-0wwagnum2tm964i6
2012-08-11 20:34:44 +02:00
Antony Lesuisse 4e4a7dcbee document_page ready
bzr revid: al@openerp.com-20120810225046-qs3liea2s76lh6v0
2012-08-11 00:50:46 +02:00
Antony Lesuisse bda8f3fb7f page mostly ok
bzr revid: al@openerp.com-20120810000908-ujg81v4mgm22glem
2012-08-10 02:09:08 +02:00
Antony Lesuisse 6097630099 [MERGE] trunk
bzr revid: al@openerp.com-20120809134703-a048me2itv73dygr
2012-08-09 15:47:03 +02:00
Antony Lesuisse b9286a8eeb page work in progress model
bzr revid: al@openerp.com-20120809131141-m9xqa24u96sbgna7
2012-08-09 15:11:41 +02:00
Antony Lesuisse 788b1bdb5b [REM] correctly rename and remove wiki
bzr revid: al@openerp.com-20120803154641-ocbydlqt7ppjecwn
2012-08-03 17:46:41 +02:00