Merge pull request #1907 from gpazo/fixent-install
[xtuple] / .gitignore
2014-09-17 Steve HackbarthMerge pull request #1784 from garyhgohoos/23593-2
2014-09-17 Steve HackbarthMerge pull request #1843 from xtuple/4_6_x
2014-09-12 krauseoMerge pull request #1 from shackbarth/keith1
2014-09-11 Gil MoskowitzMerge pull request #1743 from garyhgohoos/24315
2014-09-08 Steve HackbarthMerge branch 'node10-fix' into 23257-qr-final
2014-09-05 Steve HackbarthMerge pull request #1824 from krauseo/master
2014-09-02 Linda NicholsMerge pull request #1817 from julesstp/22351-MultipleSi...
2014-09-02 Steve HackbarthMerge pull request #1767 from julesstp/22351-MultipleSi...
2014-08-30 malfredo32Merge remote-tracking branch 'origin/master' into 4_7_x
2014-08-29 Steve HackbarthMerge pull request #1747 from garyhgohoos/23255
2014-08-28 Linda NicholsMerge remote-tracking branch 'XTUPLE/4_7_x' into popup...
2014-08-28 garyhgohoosfix merge conflicts
2014-08-28 Travis WebbMerge pull request #1782 from shackbarth/23549-linguist
2014-08-27 Steve HackbarthMerge pull request #1791 from tjwebb/fix-jquery-route
2014-08-26 Travis WebbMerge branch 'fix-jquery-route' into node-10
2014-08-26 Travis Webb- fixes #1790
2014-04-10 Ben ThompsonMerge branch 'master' into xtdata
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 Linda NicholsMerge pull request #1357 from shackbarth/23086-fix
2014-04-02 Steve Hackbarthissue #23086: tool for exploding manifests
2014-03-22 malfredo32Merge pull request #1 from xtuple/master
2014-01-17 Ben ThompsonFix merge conflicts
2013-12-01 John RogelstadMerge pull request #1082 from bendiy/discovery_cache
2013-11-26 Ben ThompsonMerge branch 'uuid_to_uuid_type' into new_21190
2013-11-25 julesstpMerge remote-tracking branch 'xtuple/master' into 21508...
2013-11-23 Linda NicholsMerge branch 'master' into 22031
2013-11-22 Steve Hackbarthmerge
2013-11-22 shackbarthMerge pull request #1089 from elevow/move_tests
2013-11-22 elevowupdated based on feedback
2013-11-22 elevowinclude old ignored files; updated release notes
2013-11-22 elevowupdated gitignore for test folder update
2013-11-22 John RogelstadMerge pull request #1087 from jrogelstad/21508-WorkOrder
2013-11-18 tjwebbMerge branch 'master' of github.com:xtuple/xtuple into...
2013-11-18 Ben ThompsonMerge branch 'xtuple' into new_21190
2013-11-18 John RogelstadMerge pull request #1065 from jgunderson/fixdatamart
2013-11-16 John RogelstadMerge pull request #1049 from jgunderson/21859-1
2013-11-16 John RogelstadMerge pull request #1064 from julesstp/21508-WorkOrder
2013-11-15 Dave CramerMerge branch 'master' of github.com:xtuple/xtuple
2013-11-15 John RogelstadMerge pull request #1056 from jgunderson/exportlabel
2013-11-15 John RogelstadMerge pull request #1057 from davecramer/master
2013-11-14 Steve HackbarthMerge remote-tracking branch 'XTUPLE/master' into 21684...
2013-11-14 Linda Nicholsmerge Travis
2013-11-14 Linda NicholsMerge pull request #1055 from tjwebb/21664-billing...
2013-11-14 tjwebbMerge branch 'master' into 21664-billing-cash-receipt
2013-11-12 tjwebbminor cleanup and syntax fixes
2013-11-12 Steve Hackbarthmerge
2013-11-09 jgundersonMerge branch 'xtuple'
2013-11-06 julesstpmerge master
2013-11-06 John RogelstadMerge branch 'master' into rhdemo
2013-11-05 John RogelstadMerge pull request #1009 from tjwebb/jshintrc
2013-11-05 John RogelstadMerge pull request #975 from jgunderson/21807
2013-11-05 John RogelstadMerge pull request #1022 from bendiy/false-use-undefined
2013-11-05 John RogelstadMerge pull request #986 from bendiy/auto_nkey
2013-11-04 Ben ThompsonMerge branch 'auto_nkey' into new_21190
2013-11-04 Ben ThompsonStill evil.
2013-11-04 Ben ThompsonFix merge conflict with #1021.
2013-11-04 Linda NicholsMerge branch 'master' into 21628
2013-11-04 Steve HackbarthMerge remote-tracking branch 'XTUPLE/master' into 21684
2013-11-04 Linda Nicholsresolved conflict
2013-11-04 tjwebbMerge branch '21628' of github.com:lynnaloo/xtuple...
2013-11-03 John RogelstadMerge pull request #1010 from tjwebb/gitignore
2013-11-03 tjwebbMerge branch 'master' of github.com:xtuple/xtuple
2013-11-03 tjwebbMerge branch 'gitignore'
2013-11-03 tjwebbupdated gitignore
2013-10-30 Ben ThompsonMerge branch 'xtuple'
2013-10-29 Steve HackbarthMerge remote-tracking branch 'XTUPLE/tags/R1_4_6' into...
2013-10-26 jgundersonMerge branch 'xtuple'
2013-10-24 John RogelstadResolve conflicts
2013-10-24 John RogelstadMerge branch 'xtuple'
2013-10-23 Linda NicholsMerge pull request #967 from xtuple/billing
2013-10-23 Steve HackbarthMerge remote-tracking branch 'XTUPLE/master' into 21684
2013-10-22 Linda Nicholsmerge from master
2013-10-22 Steve Hackbarthmerge
2013-10-22 Linda Nicholsmerged master into billing and resolved conflicts
2013-10-22 Linda Nicholsmerge master
2013-10-21 tjwebbMerge remote-tracking branch 'upstream/billing'
2013-10-21 Linda Nicholsmerrrrrrgeeeeee
2013-10-21 John RogelstadMerge pull request #950 from tjwebb/INCDT-Feature-21585
2013-10-21 tjwebbMerge branch 'INCDT-Feature-21585' into 21664-Feature
2013-10-21 tjwebbMerge branch 'billing' of github.com:xtuple/xtuple...
2013-10-16 tjwebbMerge branch 'master' of github.com:xtuple/xtuple into...
2013-10-16 tjwebbMerge branch 'billing' of github.com:xtuple/xtuple...
2013-10-15 tjwebbMerge remote-tracking branch 'upstream/master' into...
2013-10-15 tjwebbMerge remote-tracking branch 'upstream/billing' into...
2013-10-14 tjwebbsimplified locking
2013-08-12 Mike O'DonnellUpdate .gitignore
2013-08-11 mikerodonnell89Merge branch 'master' into 18488
2013-08-07 mikerodonnell89remove gitignore stuff
2013-08-07 mikerodonnell89more translations
2013-08-07 mikerodonnell89Merge remote-tracking branch 'XTUPLE/master' into 18488
2013-08-06 mikeadded stuff to gitignore
2013-07-26 John RogelstadMerge pull request #639 from bendiy/20820
2013-07-25 shackbarthMerge pull request #627 from bendiy/20820
2013-07-18 shackbarthMerge pull request #597 from bendiy/20820
2013-07-17 mikerodonnell89fix merge conflict
2013-07-17 mikerodonnell89fixed merge conflict
2013-07-17 julesstpMerge xtuple/master
2013-07-16 jcarlinMerge pull request #15 from xtuple/master
next