Steve Hackbarth [Mon, 11 Aug 2014 18:25:13 +0000 (14:25 -0400)]
Merge pull request #1746 from shackbarth/4601
remove some other caratty dependencies
Steve Hackbarth [Mon, 11 Aug 2014 18:01:42 +0000 (14:01 -0400)]
shrinkwrap the dev dependencies as well
Steve Hackbarth [Mon, 11 Aug 2014 17:59:36 +0000 (13:59 -0400)]
remove some other caratty dependencies
Steve Hackbarth [Mon, 11 Aug 2014 16:36:24 +0000 (12:36 -0400)]
Merge pull request #1745 from shackbarth/4601
remove xtuple-documentation dependency
Steve Hackbarth [Mon, 11 Aug 2014 16:01:24 +0000 (12:01 -0400)]
remove xtuple-documentation dependency
BC Wilson [Mon, 11 Aug 2014 14:11:55 +0000 (10:11 -0400)]
Merge pull request #1744 from shackbarth/4601
reshrinkwrap on npm 1.2.30
Steve Hackbarth [Sun, 10 Aug 2014 13:18:47 +0000 (09:18 -0400)]
don't jshint
Steve Hackbarth [Fri, 8 Aug 2014 21:03:20 +0000 (17:03 -0400)]
reshrinkwrap on npm 1.2.30
Steve Hackbarth [Mon, 4 Aug 2014 14:34:57 +0000 (10:34 -0400)]
Merge pull request #1731 from gilmoskowitz/bump460prereqs
change prereq checks for 4.6.0 release
Gil Moskowitz [Mon, 4 Aug 2014 13:37:41 +0000 (09:37 -0400)]
change prereq checks for 4.6.0 release
Travis Webb [Sat, 2 Aug 2014 04:23:05 +0000 (00:23 -0400)]
Merge pull request #1729 from lynnaloo/chrome_patch
Update submodules
bendiy [Fri, 1 Aug 2014 21:12:14 +0000 (15:12 -0600)]
Merge pull request #1728 from bendiy/xwd-data
Issue #24225 Use isNumber cause we gots more rows now.
Linda Nichols [Fri, 1 Aug 2014 20:11:22 +0000 (20:11 +0000)]
updated submodule
Ben Thompson [Fri, 1 Aug 2014 17:57:31 +0000 (13:57 -0400)]
Issue #24225 Use isNumber cause we gots more rows now.
Steve Hackbarth [Fri, 1 Aug 2014 17:38:23 +0000 (13:38 -0400)]
Merge pull request #1727 from bendiy/xwd-data
Issue #24225 Only add a line if it's a valid sold, IPS item
Steve Hackbarth [Fri, 1 Aug 2014 17:33:57 +0000 (13:33 -0400)]
Merge pull request #1726 from xtuple/revert-1714-24224
Revert "Issue #24224:normalize margin calculations"
Ben Thompson [Fri, 1 Aug 2014 17:00:31 +0000 (13:00 -0400)]
Issue #24225 Only add a line if it's a valid sold, IPS item
Steve Hackbarth [Fri, 1 Aug 2014 15:29:20 +0000 (11:29 -0400)]
Revert "Issue #24224:normalize margin calculations"
Travis Webb [Fri, 1 Aug 2014 05:10:22 +0000 (01:10 -0400)]
Merge pull request #1724 from jmcd73/4_6_x
Copy en_US translation string to the target: if it's another en_XX langu...
James McDonald [Fri, 1 Aug 2014 04:26:15 +0000 (14:26 +1000)]
Copy en_US translation string to the target: if it's another en_XX language (e.g. en_AU)
Gil Moskowitz [Thu, 31 Jul 2014 21:47:15 +0000 (17:47 -0400)]
Merge pull request #1721 from shackbarth/bump460
bump 4.6.0
Steve Hackbarth [Thu, 31 Jul 2014 20:40:15 +0000 (16:40 -0400)]
bump 4.6.0
Travis Webb [Thu, 31 Jul 2014 18:06:43 +0000 (14:06 -0400)]
Merge pull request #1711 from shackbarth/jsdoc
issue #24067: split out jsdoc
Travis Webb [Thu, 31 Jul 2014 18:06:32 +0000 (14:06 -0400)]
Merge pull request #1719 from shackbarth/23962-css2
issue #23962: compile and serve extension css
Gil Moskowitz [Thu, 31 Jul 2014 16:19:15 +0000 (12:19 -0400)]
Merge pull request #1692 from garyhgohoos/24154
Issue #24154:remove redundant create supply order logic handled by trigg...
Gil Moskowitz [Thu, 31 Jul 2014 15:02:50 +0000 (11:02 -0400)]
Merge pull request #1714 from garyhgohoos/24224
Issue #24224:normalize margin calculations
requires https://github.com/xtuple/qt-client/pull/421
garyhgohoos [Thu, 31 Jul 2014 13:55:15 +0000 (09:55 -0400)]
Issue #24154:add error checking to coitem trigger
Gil Moskowitz [Thu, 31 Jul 2014 13:28:53 +0000 (09:28 -0400)]
Merge pull request #1710 from garyhgohoos/24230
Issue #24230:change actual account balance calculation
Gil Moskowitz [Thu, 31 Jul 2014 12:59:01 +0000 (08:59 -0400)]
Merge pull request #1709 from garyhgohoos/24233
Issue #24233:do not calculate net price when product category pricing
Gil Moskowitz [Thu, 31 Jul 2014 12:12:51 +0000 (08:12 -0400)]
Merge pull request #1691 from garyhgohoos/24199
Issue #24199:exclude when gltrans_deleted
Gil Moskowitz [Thu, 31 Jul 2014 12:09:27 +0000 (08:09 -0400)]
Merge pull request #1720 from shackbarth/readme
point to github io api docs
Steve Hackbarth [Thu, 31 Jul 2014 03:10:58 +0000 (23:10 -0400)]
correct path
Steve Hackbarth [Thu, 31 Jul 2014 03:09:40 +0000 (23:09 -0400)]
point to github io api docs
bendiy [Wed, 30 Jul 2014 19:01:21 +0000 (13:01 -0600)]
Merge pull request #1718 from lynnaloo/haxtuple-rest
Added "id" fields with orm type to Discovery Doc resources
Steve Hackbarth [Wed, 30 Jul 2014 17:46:16 +0000 (13:46 -0400)]
jshint
Steve Hackbarth [Wed, 30 Jul 2014 16:50:48 +0000 (12:50 -0400)]
don't insert junk into clientcode table
Steve Hackbarth [Wed, 30 Jul 2014 16:44:52 +0000 (12:44 -0400)]
serve extension css to the browser
Steve Hackbarth [Wed, 30 Jul 2014 16:23:58 +0000 (12:23 -0400)]
issue #23962: undo workaround
Steve Hackbarth [Wed, 30 Jul 2014 16:23:26 +0000 (12:23 -0400)]
issue #23962: compile extension css into the database
Steve Hackbarth [Wed, 30 Jul 2014 16:17:30 +0000 (12:17 -0400)]
prepwork
Linda Nichols [Wed, 30 Jul 2014 15:48:02 +0000 (11:48 -0400)]
Merge pull request #1713 from shackbarth/23966
issue #23966: apply opacity hack on resize
Linda Nichols [Wed, 30 Jul 2014 15:46:14 +0000 (15:46 +0000)]
Merge remote-tracking branch 'XTUPLE/4_5_x' into haxtuple-rest
Linda Nichols [Wed, 30 Jul 2014 15:46:00 +0000 (15:46 +0000)]
Merge remote-tracking branch 'XTUPLE/4_6_X' into haxtuple-rest
Linda Nichols [Wed, 30 Jul 2014 15:41:54 +0000 (15:41 +0000)]
added id fields with orm type to discovery doc
garyhgohoos [Tue, 29 Jul 2014 20:30:06 +0000 (16:30 -0400)]
Issue #24224:normalize margin calculations
Steve Hackbarth [Tue, 29 Jul 2014 18:40:25 +0000 (14:40 -0400)]
issue #23966: apply opacity hack on resize
Steve Hackbarth [Mon, 28 Jul 2014 20:35:59 +0000 (16:35 -0400)]
move out spec generation code
Steve Hackbarth [Mon, 28 Jul 2014 20:10:45 +0000 (16:10 -0400)]
move out jsdoc api templates etc
garyhgohoos [Mon, 28 Jul 2014 19:42:23 +0000 (15:42 -0400)]
Issue #24230:change actual account balance calculation
Steve Hackbarth [Mon, 28 Jul 2014 19:17:59 +0000 (15:17 -0400)]
Merge pull request #1708 from jgunderson/map1
fix filter icon style
garyhgohoos [Mon, 28 Jul 2014 16:13:01 +0000 (12:13 -0400)]
Issue #24233:do not calculate net price when product category pricing
Linda Nichols [Sun, 27 Jul 2014 17:44:11 +0000 (17:44 +0000)]
Merge remote-tracking branch 'XTUPLE/master' into 4_6_x
jgunderson [Fri, 25 Jul 2014 17:01:29 +0000 (13:01 -0400)]
fix filter icon style
jgunderson [Fri, 25 Jul 2014 15:06:52 +0000 (11:06 -0400)]
Merge branch 'xtuple46' into map1
jgunderson [Fri, 25 Jul 2014 15:05:04 +0000 (11:05 -0400)]
style changes for maps
Linda Nichols [Thu, 24 Jul 2014 19:57:29 +0000 (15:57 -0400)]
Merge pull request #1707 from bendiy/discovery
Fix Discovery Document problem breaking Google API Python library. Docum...
Ben Thompson [Thu, 24 Jul 2014 19:19:15 +0000 (15:19 -0400)]
Fix Discovery Document problem breaking Google API Python library. Document ?resources[]=Contact option.
Steve Hackbarth [Wed, 23 Jul 2014 20:53:37 +0000 (16:53 -0400)]
Merge pull request #1698 from shackbarth/chrome-fix
backport chrome fix to 4.5
Steve Hackbarth [Wed, 23 Jul 2014 18:33:14 +0000 (14:33 -0400)]
backport chrome fix to 4.5
Gil Moskowitz [Wed, 23 Jul 2014 17:24:50 +0000 (13:24 -0400)]
Merge pull request #1695 from shackbarth/24202
issue #24202: we are unready for Object dot observe
Travis Webb [Wed, 23 Jul 2014 02:48:41 +0000 (22:48 -0400)]
Merge pull request #1697 from shackbarth/buildapp
build_app should inspect dot-backups for extensions after pg_restore
Steve Hackbarth [Tue, 22 Jul 2014 22:24:55 +0000 (18:24 -0400)]
more cleanup
Steve Hackbarth [Tue, 22 Jul 2014 22:20:35 +0000 (18:20 -0400)]
init database before build client
Steve Hackbarth [Tue, 22 Jul 2014 22:04:33 +0000 (18:04 -0400)]
cleanup
Steve Hackbarth [Tue, 22 Jul 2014 21:59:09 +0000 (17:59 -0400)]
inpect backups for extensions
Steve Hackbarth [Tue, 22 Jul 2014 17:24:24 +0000 (13:24 -0400)]
issue #24202: we are unready for Object dot observe
Steve Hackbarth [Tue, 22 Jul 2014 16:04:27 +0000 (12:04 -0400)]
Merge pull request #1694 from gilmoskowitz/bump460beta_gil
use package version numbers the updater can understand
Gil Moskowitz [Tue, 22 Jul 2014 14:57:54 +0000 (10:57 -0400)]
use package version numbers the updater can understand
Greg Pazo [Mon, 21 Jul 2014 21:02:43 +0000 (17:02 -0400)]
Merge pull request #1693 from gilmoskowitz/bump460beta_gil
updates in anticipation of 4.6.0-beta release
Gil Moskowitz [Mon, 21 Jul 2014 20:13:29 +0000 (16:13 -0400)]
updates in anticipation of 4.6.0-beta release
garyhgohoos [Mon, 21 Jul 2014 19:47:16 +0000 (15:47 -0400)]
Issue #24154:remove redundant create supply order logic handled by trigger
garyhgohoos [Mon, 21 Jul 2014 18:31:17 +0000 (14:31 -0400)]
Issue #24199:exclude when gltrans_deleted
Gil Moskowitz [Mon, 21 Jul 2014 17:53:50 +0000 (13:53 -0400)]
Merge pull request #1687 from shackbarth/upgrade_test
test an upgrade from 4.4.0
Gil Moskowitz [Mon, 21 Jul 2014 17:53:10 +0000 (13:53 -0400)]
Merge pull request #1689 from garyhgohoos/24177
Issue #24177:change group by
Gil Moskowitz [Mon, 21 Jul 2014 17:52:40 +0000 (13:52 -0400)]
Merge pull request #1690 from garyhgohoos/24194
Issue #24194:add invoice doc type
Gil Moskowitz [Mon, 21 Jul 2014 17:49:03 +0000 (13:49 -0400)]
Merge pull request #1686 from shackbarth/upgrade_test
test an upgrade from 4.4.0
garyhgohoos [Mon, 21 Jul 2014 15:56:58 +0000 (11:56 -0400)]
Issue #24194:add invoice doc type
garyhgohoos [Mon, 21 Jul 2014 14:36:44 +0000 (10:36 -0400)]
Issue #24177:change group by
Steve Hackbarth [Sat, 19 Jul 2014 02:23:39 +0000 (22:23 -0400)]
Merge pull request #1684 from xtuple/4_5_x
4 5 x
Steve Hackbarth [Sat, 19 Jul 2014 02:00:46 +0000 (22:00 -0400)]
Merge pull request #1681 from shackbarth/bump46beta
bump 4.6.0-beta
Steve Hackbarth [Sat, 19 Jul 2014 01:58:07 +0000 (21:58 -0400)]
test an upgrade from 4.4.0
Linda Nichols [Fri, 18 Jul 2014 21:31:17 +0000 (17:31 -0400)]
Merge pull request #1683 from bendiy/4_6_x
Allow both JWT grant types.
Steve Hackbarth [Fri, 18 Jul 2014 21:18:35 +0000 (17:18 -0400)]
Merge remote-tracking branch 'XTUPLE/4_6_x' into bump46beta
Ben Thompson [Fri, 18 Jul 2014 21:09:12 +0000 (17:09 -0400)]
Allow both JWT grant types 4realz.
Ben Thompson [Fri, 18 Jul 2014 21:08:01 +0000 (17:08 -0400)]
Allow both JWT grant types.
Gil Moskowitz [Fri, 18 Jul 2014 21:04:05 +0000 (17:04 -0400)]
Merge pull request #1680 from shackbarth/24069
issue #24069: make client assets available immediately upon npm extension install
Gil Moskowitz [Fri, 18 Jul 2014 19:30:06 +0000 (15:30 -0400)]
Merge pull request #1682 from garyhgohoos/24187
Issue #24187:release pr using default itemsrc and add to unreleased po
Gil Moskowitz [Fri, 18 Jul 2014 19:16:00 +0000 (15:16 -0400)]
Merge pull request #1677 from shackbarth/haxtuple2
added xtupleU and haxTuple links to readme
garyhgohoos [Fri, 18 Jul 2014 19:04:10 +0000 (15:04 -0400)]
Issue #24187:release pr using default itemsrc and add to unreleased po
Gil Moskowitz [Fri, 18 Jul 2014 19:02:13 +0000 (15:02 -0400)]
Merge pull request #1664 from garyhgohoos/24144
Issue #24144:call postItemlocSeries which posts G/L
Gil Moskowitz [Fri, 18 Jul 2014 18:31:06 +0000 (14:31 -0400)]
Merge pull request #1654 from garyhgohoos/24111
Issue #24111:fix markup pricing and margins with yom conversion
goes with https://github.com/xtuple/qt-client/pull/408
Gil Moskowitz [Fri, 18 Jul 2014 18:24:16 +0000 (14:24 -0400)]
Merge pull request #1676 from shackbarth/24104-npm
issue #24104: bugfixes to npm extension install
Steve Hackbarth [Fri, 18 Jul 2014 18:15:23 +0000 (14:15 -0400)]
Merge pull request #1674 from garyhgohoos/24005-2
Issue #24005:sql script to fix flcol_report_id
Steve Hackbarth [Fri, 18 Jul 2014 17:49:23 +0000 (13:49 -0400)]
bump 4.6.0-beta
Steve Hackbarth [Fri, 18 Jul 2014 15:49:39 +0000 (11:49 -0400)]
issue #24069: make client assets available immediately upon npm extension install
Steve Hackbarth [Thu, 17 Jul 2014 19:09:54 +0000 (15:09 -0400)]
added xtupleU and haxTuple links to readme
garyhgohoos [Thu, 17 Jul 2014 18:27:45 +0000 (14:27 -0400)]
Issue #24005:move execution of patch to before setting of version
Steve Hackbarth [Thu, 17 Jul 2014 18:21:42 +0000 (14:21 -0400)]
Merge pull request #1656 from gilmoskowitz/issue23878
issue #23878 - merge bankrec functions
Gil Moskowitz [Thu, 17 Jul 2014 17:55:14 +0000 (13:55 -0400)]
add back a corrected explicit cash receipt application and check the proper tax records more completely. gltrans checks are imperfect but close enough.
Steve Hackbarth [Thu, 17 Jul 2014 14:50:30 +0000 (10:50 -0400)]
issue #24104: add comment
projects / xtuple / log