merge conflict
[xtuple] / scripts /
2014-06-23 Steve HackbarthMerge pull request #1609 from xtuple/4_5_x
2014-06-23 Linda NicholsMerge pull request #1596 from shackbarth/22996-signatur...
2014-06-23 Linda NicholsMerge pull request #1600 from shackbarth/22218
2014-06-23 Linda NicholsMerge pull request #1599 from shackbarth/23965-dashboards
2014-06-23 Linda NicholsMerge pull request #1606 from gilmoskowitz/i23796_privext
2014-06-20 Steve HackbarthMerge pull request #1604 from gpazo/xmlfixes
2014-06-20 Greg Pazoupdate pre-requisite checks as per monique
2014-06-20 Steve HackbarthMerge pull request #1602 from gilmoskowitz/issue23937_p...
2014-06-20 Steve HackbarthMerge pull request #1591 from bendiy/ext-pre-auth
2014-06-18 Ben ThompsonAdd prerequisite check for duplicate payco_ccpay_id...
2014-06-18 Steve HackbarthMerge remote-tracking branch 'XTUPLE/4_5_x' into HEAD
2014-06-18 Steve HackbarthMerge pull request #1580 from gilmoskowitz/23796
2014-06-17 Steve HackbarthMerge pull request #1574 from garyhgohoos/23573
2014-06-17 Steve HackbarthMerge pull request #1578 from julesstp/23288-OpenItemWBSO
2014-06-17 Steve HackbarthMerge pull request #1579 from bendiy/ext-grant
2014-06-11 Greg PazoMerge pull request #1566 from garyhgohoos/23658
2014-06-11 Greg PazoMerge pull request #1562 from garyhgohoos/23829
2014-06-11 Ben ThompsonGrant 'ADMIN' role the ext and it's dependencies.
2014-06-11 Steve HackbarthMerge pull request #1573 from bendiy/oauth-key
2014-06-10 julesstpMerge remote-tracking branch 'XTUPLE/4_5_x' into 23288...
2014-06-10 Steve HackbarthMerge pull request #1564 from bendiy/item-site-list
2014-06-06 Steve HackbarthMerge pull request #1567 from xtuple/4_5_x
2014-06-06 Steve HackbarthMerge remote-tracking branch 'origin/release' into...
2014-06-05 Steve HackbarthMerge pull request #1563 from bendiy/item-site-list
2014-06-05 Steve HackbarthMerge pull request #1559 from gpazo/fixLessThanSign
2014-06-05 Linda Nicholsfix conflicts
2014-06-05 Steve HackbarthMerge pull request #1558 from xtuple/4_5_x
2014-06-04 vagrantfix backwards queries, remove '<' and replace with...
2014-06-04 Steve HackbarthMerge pull request #1556 from xtuple/master
2014-06-03 Steve HackbarthMerge pull request #1524 from garyhgohoos/23593
2014-06-03 Steve HackbarthMerge pull request #1547 from julesstp/23602
2014-06-03 Steve HackbarthMerge pull request #1551 from garyhgohoos/23825
2014-06-03 Steve HackbarthMerge pull request #1554 from gpazo/preReqCheck
2014-06-03 julesstpMerge remote-tracking branch 'XTUPLE/4_5_x' into 23602
2014-06-03 Greg Pazocheck to see if xm schema exists, if so, disallow upgrade
2014-06-03 Linda NicholsMerge pull request #1553 from xtuple/4_5_x
2014-06-03 Linda NicholsMerge pull request #1533 from shackbarth/23548-linguist
2014-06-03 Linda NicholsMerge pull request #1527 from shackbarth/dbtest
2014-06-03 Steve HackbarthMerge pull request #1544 from bendiy/item-site-list
2014-06-03 Linda NicholsIssue #23607: Merged in changes from 4_5_x
2014-06-03 Linda NicholsMerge pull request #1548 from shackbarth/23243-xwd
2014-06-03 Steve Hackbarthissue #23243: bugfix build for mfg and xwd
2014-06-02 Greg PazoMerge pull request #1535 from shackbarth/23243-xwd
2014-06-02 Steve HackbarthMerge pull request #1531 from julesstp/23588
2014-06-02 jgundersonMerge branch 'xtuple45' into userlist
2014-06-02 Steve Hackbarthissue #23243: updated xml ids
2014-05-30 Greg PazoMerge pull request #1532 from garyhgohoos/23628
2014-05-30 jgundersonMerge branch 'xtuple45' into theme4
2014-05-29 Steve HackbarthMerge pull request #1530 from julesstp/23559-SOSyntaxError
2014-05-29 Steve Hackbarthmerge
2014-05-29 Steve Hackbarthfix typo
2014-05-29 Steve Hackbarthissue #23243: update package naming convention and...
2014-05-29 Steve Hackbarthissue #23243: support for xwd package
2014-05-28 Steve HackbarthMerge pull request #1525 from gpazo/preReqTweak
2014-05-28 Steve Hackbarthissue #23548: sort dictionaries by alpha
2014-05-27 Steve Hackbarthissue #23243: remove unused old option
2014-05-27 Steve Hackbarthissue #23243: allow the specification of a default...
2014-05-27 Steve Hackbarthissue #23548: cleanup
2014-05-27 Steve Hackbarthissue #23548: total linguist export for all languages
2014-05-25 Dave AndersonMerge remote-tracking branch 'XTUPLE/4_5_x'
2014-05-23 Greg Pazotweak pre-reqs to be more flexible yet more rigid for...
2014-05-23 Steve HackbarthMerge pull request #1520 from xtuple/4_5_x
2014-05-22 Steve HackbarthMerge pull request #1516 from julesstp/23279-OrderWidge...
2014-05-22 Linda NicholsMerge pull request #1514 from shackbarth/readme
2014-05-22 Travis WebbMerge pull request #1513 from shackbarth/readme
2014-05-22 Steve HackbarthMerge pull request #1509 from lynnaloo/22238
2014-05-20 Ben ThompsonMerge remote-tracking branch 'XTUPLE/4_5_x' into invche...
2014-05-20 Steve HackbarthMerge pull request #1490 from dpocock/4_5_x
2014-05-20 Ben ThompsonFix merge conflict.
2014-05-20 Steve HackbarthMerge pull request #1503 from xtuple/4_4_x
2014-05-20 Ben ThompsonMerge remote-tracking branch 'XTUPLE/4_5_x' into shipme...
2014-05-20 julesstpMerge remote-tracking branch 'xtuple/master' into 23279
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 #1502 from gpazo/betadawg
2014-05-20 Greg Pazoupdate version to 4.5.0Beta for new build
2014-05-20 Steve Hackbarthmerge
2014-05-20 Steve HackbarthMerge pull request #1489 from bendiy/exclusive_items 23253-gary
2014-05-20 Steve HackbarthMerge pull request #1495 from gpazo/updateVersion
2014-05-19 Greg Pazoupdate version in package.xml for 4.5.x branch
2014-05-19 Ben ThompsonMerge remote-tracking branch 'XTUPLE/4_5_x' into shipme...
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 Dave AndersonMerge branch 'master' of github.com:andersdd/xtuple
2014-05-15 Steve HackbarthMerge pull request #1481 from bendiy/exclusive_items
2014-05-14 Linda NicholsMerge pull request #1479 from shackbarth/cleanup-fail
2014-05-13 Steve HackbarthMerge pull request #1436 from jgunderson/route
2014-05-13 Steve HackbarthMerge branch 'master' into 22996-signature-capture
2014-05-13 Steve HackbarthMerge pull request #1474 from garyhgohoos/23558
2014-05-13 Ben ThompsonFix merge conflict.
2014-05-13 Steve Hackbarthissue #23627: fix red-herring build-fail message when...
2014-05-12 garyhgohoosMerge remote-tracking branch 'XTUPLE/4_5_x' into 4_5_x
2014-05-11 Steve HackbarthMerge pull request #1469 from xtuple/4_4_x
2014-05-09 Steve HackbarthMerge pull request #1460 from bendiy/shiphead_performance
next