Merge pull request #1 from shackbarth/keith1
[xtuple] / node-datasource / views / app.ejs
2014-09-12 krauseoMerge pull request #1 from shackbarth/keith1
2014-09-11 Gil MoskowitzMerge pull request #1743 from garyhgohoos/24315
2014-09-05 Steve HackbarthMerge pull request #1824 from krauseo/master
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 garyhgohoosfix merge conflicts
2014-08-28 Linda NicholsMerge remote-tracking branch 'XTUPLE/4_7_x' into popup...
2014-08-27 julesstpMerge branch '4_7_x' of https://github.com/xtuple/xtupl...
2014-08-27 Linda NicholsMerge pull request #1794 from xtuple/master
2014-08-27 Linda NicholsMerge remote-tracking branch 'XTUPLE/master' into 4_7_x
2014-08-26 Steve HackbarthMerge pull request #1780 from andersdd/add_comment_func
2014-08-24 Linda NicholsMerge branch '4_7_1' into 18683
2014-08-23 Travis WebbMerge pull request #1775 from shackbarth/build_app_dir
2014-08-23 Travis WebbMerge pull request #1751 from shackbarth/24344-2
2014-08-23 Travis WebbMerge pull request #1766 from shackbarth/fielddev
2014-08-23 Travis WebbMerge pull request #1749 from shackbarth/permalinks
2014-08-20 Gil MoskowitzMerge pull request #1732 from garyhgohoos/24224-2
2014-08-13 Steve Hackbarthmerge with preference for npm 1 2 30
2014-08-13 Steve Hackbarthinclude jquery
2014-08-11 Steve HackbarthMerge pull request #1696 from julesstp/23852-InvoiceInv...
2014-08-08 Steve Hackbarthmerge
2014-08-06 Linda NicholsMerge pull request #1735 from shackbarth/fairgame master
2014-08-06 Gil MoskowitzMerge pull request #1736 from shackbarth/release
2014-08-06 Steve HackbarthMerge pull request #1733 from xtuple/4_6_x
2014-08-06 Steve HackbarthMerge pull request #1734 from shackbarth/460merge
2014-08-06 Steve HackbarthMerge remote-tracking branch 'XTUPLE/master' into 460merge
2014-07-31 Travis WebbMerge pull request #1711 from shackbarth/jsdoc
2014-07-31 Travis WebbMerge pull request #1719 from shackbarth/23962-css2
2014-07-30 Steve Hackbarthserve extension css to the browser
2014-03-22 malfredo32Merge pull request #1 from xtuple/master
2014-02-26 vinaysinguMerge pull request #12 from xtuple/master
2014-02-25 shackbarthMerge pull request #1290 from xtuple/1_7_2
2014-02-10 John RogelstadMerge branch 'master' into 22669
2014-02-10 shackbarthMerge pull request #1264 from xtuple/1_7_x
2014-02-10 Linda Nicholsline-ending normalization
2014-02-10 Ben ThompsonMerge branch 'xtuple'
2014-02-10 shackbarthMerge pull request #1255 from jgunderson/22442
2014-02-10 shackbarthMerge pull request #1260 from jrogelstad/22669
2014-02-10 shackbarthMerge pull request #1257 from lynnaloo/line_endings_deux
2014-02-10 Linda Nicholsnormalized line-endings
2013-10-14 Travis WebbMerge pull request #941 from xtuple/tags/R1_4_5
2013-10-13 Travis WebbMerge pull request #940 from xtuple/tags/R1_4_5
2013-10-08 John RogelstadMerge pull request #933 from lynnaloo/21614
2013-10-08 Steve Hackbarthmerge
2013-10-08 Linda Nicholsmerged master and billing
2013-10-08 julesstpmerge
2013-10-07 tjwebbMerge branch 'master' of github.com:xtuple/xtuple into...
2013-10-07 tjwebbMerge branch 'jrogelstad-21605' into HEAD
2013-10-07 John RogelstadMerge branch '21601'
2013-10-07 Linda Nicholsmerge from master
2013-10-04 John RogelstadMerge branch 'master' into 21605
2013-10-04 Ben ThompsonMerge branch 'xtuple'
2013-10-04 jgunderson21586, xmla route for olap data
2013-10-04 jgundersonMerge branch 'master' of github.com:xtuple/xtuple into...
2013-10-04 John RogelstadMerge pull request #910 from shackbarth/21448-err
2013-10-03 Steve HackbarthMerge remote-tracking branch 'XTUPLE/master' into 21448-err
2013-10-03 Steve Hackbarthmerge
2013-10-02 Steve Hackbarthserve up locale info from route
2013-07-17 mikerodonnell89fix merge conflict
2013-07-17 mikerodonnell89fixed merge conflict
2013-07-16 jcarlinMerge pull request #15 from xtuple/master
2013-07-16 John RogelstadMerge branch 'master' into 20734
2013-07-12 Steve Hackbarthmerge from 139
2013-07-11 shackbarthMerge pull request #569 from jrogelstad/20734
2013-07-11 julesstpMerging in John's branch.
2013-07-10 julesstpMerge remote-tracking branch 'origin/20734' into 20734
2013-07-10 julesstpMerge remote-tracking branch 'xtuple/master' into 20734
2013-07-10 Linda NicholsMerge branch 'master' into 20715
2013-07-10 LindaMerge pull request #564 from jrogelstad/20734
2013-07-10 John RogelstadMerge pull request #566 from shackbarth/20715-chart
2013-07-10 Steve Hackbarthissue #20715: brought in css to app
2013-07-09 julesstpMerge remote-tracking branch 'xtuple/master' into 20734
2013-07-09 jcarlinMerge pull request #12 from jrogelstad/20734
2013-07-09 John RogelstadMerge pull request #562 from bendiy/master
2013-07-09 John RogelstadMerge branch 'master' into 20734
2013-07-09 John RogelstadMerge branch 'xtuple'
2013-07-09 John RogelstadMerge pull request #557 from shackbarth/20771
2013-07-09 John RogelstadMerge pull request #558 from shackbarth/20614
2013-07-09 Steve Hackbarthissue #20614: cache the code but not the html file
2013-07-09 Steve Hackbarthissue #20614: first light
2013-07-08 julesstpMerge remote-tracking branch 'xtuple/master' into 20734
2013-07-08 LindaMerge pull request #551 from shackbarth/20614-buildclient
2013-07-08 Linda NicholsMerge remote-tracking branch 'STEVE/20614-buildclient...
2013-07-05 Steve HackbarthMerge remote-tracking branch 'XTUPLE/master' into 20614...
2013-07-05 Steve Hackbarthissue #20614: clientcodeinfo should be clientcoderelation
2013-07-04 Steve HackbarthMerge branch '20524' into 20614-buildclient
2013-07-03 Steve Hackbarthissue #20614: get relative paths for assets right
2013-07-03 Steve Hackbarthissue #20614: send js to the client
2013-07-03 Steve Hackbarthissue #20614: send css to the client
2013-06-24 julesstpmerge xtuple
2013-06-11 mikerodonnell89Merge branch 'master' of https://github.com/mikerodonne...
2013-06-11 Mike O'DonnellMerge pull request #97 from xtuple/master
2013-06-03 John Rogelstadissue #19797: Merge to master, resolve conflicts.
2013-05-30 rootMerge branch 'master' of https://github.com/julesstp...
2013-05-24 John Rogelstadresolve conflicts
2013-05-23 Linda NicholsIssue 18845: Merged old and new
2013-05-23 John RogelstadMerge pull request #35 from xtuple/master
2013-05-23 John RogelstadMerge pull request #404 from xtuple/20254-global
2013-05-22 Ben ThompsonIssue #20264 Fix merge conflict.
2013-05-22 Ben ThompsonFix merge master conflict.
next