Fix merge conflict.
[xtuple] / foundation-database / manifest.js
2014-05-20 Ben ThompsonFix merge conflict.
2014-05-20 Steve HackbarthMerge pull request #1499 from garyhgohoos/23571
2014-05-20 Steve HackbarthMerge pull request #1500 from julesstp/23646
2014-05-20 Steve HackbarthMerge pull request #1501 from shackbarth/23253-gary
2014-05-20 Steve Hackbarthmerge
2014-05-20 Steve HackbarthMerge pull request #1489 from bendiy/exclusive_items 23253-gary
2014-05-19 garyhgohoosMerge remote-tracking branch 'XTUPLE/4_5_x' into 4_5_x
2014-05-16 Steve HackbarthMerge pull request #1492 from lynnaloo/fix_gridbox_test
2014-05-16 Greg PazoMerge pull request #1491 from shackbarth/23162-safe
2014-05-16 garyhgohoosMerge remote-tracking branch 'XTUPLE/4_5_x' into 4_5_x
2014-05-16 Steve HackbarthMerge pull request #1429 from julesstp/23421-BaseCurrency
2014-05-16 Steve HackbarthMerge pull request #1485 from lynnaloo/22218
2014-05-16 Steve Hackbarthissue #23162: put the safe toolkit right in the foundat...
2014-05-16 Steve HackbarthMerge remote-tracking branch 'GPAZO/23162' into 23162...
2014-05-15 garyhgohoosIssue #23253:cash based tax distribution
2014-05-14 Steve HackbarthMerge pull request #1482 from andersdd/23100
2014-05-13 Steve HackbarthMerge pull request #1436 from jgunderson/route
2014-05-13 Steve HackbarthMerge pull request #1473 from lynnaloo/23590
2014-05-13 Steve HackbarthMerge pull request #1474 from garyhgohoos/23558
2014-05-13 Ben ThompsonFix merge conflict.
2014-05-13 Steve HackbarthMerge pull request #1480 from xtuple/4_4_x
2014-05-13 Steve HackbarthMerge pull request #1478 from xtuple/4_4_x
2014-05-13 Steve HackbarthMerge pull request #1477 from tjwebb/issues/1476/fixacl v4.4.1
2014-05-12 Travis Webbrun fixacl() after build; resolves #1476
2014-05-11 Steve HackbarthMerge pull request #1469 from xtuple/4_4_x
2014-05-08 Steve HackbarthMerge pull request #1451 from bendiy/master
2014-05-05 Steve HackbarthMerge pull request #1446 from xtuple/master
2014-05-01 Ben ThompsonMove to the indexes dir.
2014-05-01 Ben ThompsonAdd indexes to taxhist and inherited tables. Plus invch...
2014-04-30 Steve HackbarthMerge pull request #1426 from julesstp/23227-ReassignWo...
2014-04-30 Steve HackbarthMerge pull request #1427 from julesstp/23204-SaleTypeWo...
2014-04-19 Steve HackbarthMerge pull request #1417 from jgunderson/install
2014-04-19 Steve HackbarthMerge pull request #1376 from shackbarth/23070
2014-04-17 Steve HackbarthMerge pull request #1410 from bendiy/xtdata
2014-04-14 Linda NicholsMerge pull request #1397 from jrogelstad/23370
2014-04-14 Linda NicholsMerge pull request #1396 from jrogelstad/23250
2014-04-14 Linda NicholsMerge pull request #1395 from jrogelstad/23323
2014-04-14 Linda NicholsMerge pull request #1393 from jrogelstad/23111
2014-04-11 Greg PazoIssue #23162:improve performance of getlocationid with...
2014-04-11 Gary HartnettMerge pull request #3 from xtuple/4_5_x
2014-04-11 Gary HartnettMerge pull request #2 from xtuple/4_4_x
2014-04-10 Steve HackbarthMerge pull request #1375 from xtuple/4_4_x
2014-04-10 Steve HackbarthMerge pull request #1374 from shackbarth/23241-reports
2014-04-10 Ben ThompsonMerge branch 'master' into xtdata
2014-04-10 Steve Hackbarthissue #23241: bring in reports from qt-client repo
2014-04-10 Steve HackbarthMerge pull request #1372 from xtuple/4_4_x
2014-04-09 Steve HackbarthMerge pull request #1371 from shackbarth/23241-unify...
2014-04-09 Steve Hackbarthissue #23241: add views last
2014-04-09 Steve Hackbarthissue #23241: add types
2014-04-09 Steve Hackbarthissue #23241: add triggers, indexes, and api views...
2014-04-09 Steve Hackbarthissue #23241: use uptodate database source
2014-04-08 Steve Hackbarthissue #23241: add views
2014-04-08 Steve Hackbarthbring in public functions
2014-04-08 Steve Hackbarthissue #23241: bring in public metasql
2014-04-07 Steve HackbarthMerge pull request #1369 from bendiy/remitto
2014-04-02 Steve HackbarthMerge pull request #1354 from bendiy/xtdata
2014-04-02 Linda NicholsMerge branch 'master' into panels-refactor
2014-04-02 Steve HackbarthMerge pull request #1356 from xtuple/v4_4_0
2014-04-01 Linda NicholsMerge pull request #1351 from shackbarth/23086-unified-44
2014-03-27 Steve HackbarthMerge remote-tracking branch 'XTUPLE/master' into 23086...
2014-03-27 Steve Hackbarthissue #23086: build database from source