Travis Webb [Sat, 23 Aug 2014 03:16:44 +0000 (23:16 -0400)]
Merge pull request #1766 from shackbarth/fielddev
Field dev support
Travis Webb [Sat, 23 Aug 2014 03:15:57 +0000 (23:15 -0400)]
Merge pull request #1749 from shackbarth/permalinks
Permalinks
Steve Hackbarth [Fri, 22 Aug 2014 03:26:24 +0000 (22:26 -0500)]
Merge pull request #1770 from xtuple/4_6_x
4 6 x
Steve Hackbarth [Fri, 22 Aug 2014 02:56:15 +0000 (21:56 -0500)]
Merge pull request #1737 from julesstp/23956
23956: deleting a line item from an order does not refresh the line item list
Steve Hackbarth [Wed, 20 Aug 2014 15:08:12 +0000 (10:08 -0500)]
Merge remote-tracking branch 'XTUPLE/4_7_x' into fielddev
Gil Moskowitz [Wed, 20 Aug 2014 14:29:03 +0000 (10:29 -0400)]
Merge pull request #1764 from garyhgohoos/24272
Issue #24272:add filters
Gil Moskowitz [Wed, 20 Aug 2014 14:15:54 +0000 (10:15 -0400)]
Merge pull request #1750 from garyhgohoos/23741
Issue #23741:ensure no duplicate check numbers
Gil Moskowitz [Wed, 20 Aug 2014 12:11:03 +0000 (08:11 -0400)]
Merge pull request #1732 from garyhgohoos/24224-2
Issue #24224:nomalize sales reporting
I'll pick up the `select *` while working on issue #24329
Gil Moskowitz [Wed, 20 Aug 2014 12:00:36 +0000 (08:00 -0400)]
Merge pull request #1765 from shackbarth/jshint
jshint again
Steve Hackbarth [Tue, 19 Aug 2014 14:34:20 +0000 (09:34 -0500)]
rewrite create_schema in plpgsql
Steve Hackbarth [Tue, 19 Aug 2014 04:33:33 +0000 (23:33 -0500)]
create_schema function
Steve Hackbarth [Tue, 19 Aug 2014 03:37:51 +0000 (22:37 -0500)]
allow XV.appendExtension to XV.Lists
Steve Hackbarth [Tue, 19 Aug 2014 02:36:20 +0000 (21:36 -0500)]
longer smoke timeout
Steve Hackbarth [Tue, 19 Aug 2014 02:12:03 +0000 (21:12 -0500)]
use latest npm
Steve Hackbarth [Mon, 18 Aug 2014 20:39:28 +0000 (15:39 -0500)]
jshint again
garyhgohoos [Mon, 18 Aug 2014 19:53:43 +0000 (15:53 -0400)]
Issue #24272:add filters
Steve Hackbarth [Thu, 14 Aug 2014 15:23:39 +0000 (11:23 -0400)]
care about URL presentation
garyhgohoos [Wed, 13 Aug 2014 19:54:28 +0000 (15:54 -0400)]
Issue #23741:unquote language name
garyhgohoos [Wed, 13 Aug 2014 18:49:43 +0000 (14:49 -0400)]
Issue #23741:ensure no duplicate check numbers
Steve Hackbarth [Wed, 13 Aug 2014 17:58:21 +0000 (13:58 -0400)]
merge with preference for npm 1 2 30
Steve Hackbarth [Wed, 13 Aug 2014 17:41:53 +0000 (13:41 -0400)]
include jquery
Steve Hackbarth [Wed, 13 Aug 2014 17:27:43 +0000 (13:27 -0400)]
hash should survive login
Steve Hackbarth [Wed, 13 Aug 2014 16:31:51 +0000 (12:31 -0400)]
have the app change the url bar on entry and exit into workspaces
Steve Hackbarth [Wed, 13 Aug 2014 16:05:34 +0000 (12:05 -0400)]
drill down into workspace from url
Linda Nichols [Tue, 12 Aug 2014 16:56:46 +0000 (12:56 -0400)]
Merge pull request #1738 from jgunderson/money2
24106, number spinner issues
Linda Nichols [Tue, 12 Aug 2014 16:50:13 +0000 (12:50 -0400)]
Merge pull request #1716 from shackbarth/24200
issue #24200: streamline version bumping
julesstp [Mon, 11 Aug 2014 20:13:53 +0000 (16:13 -0400)]
empty commit to make TCI work
Steve Hackbarth [Mon, 11 Aug 2014 19:28:59 +0000 (15:28 -0400)]
issue #24200: make sure we have an output directory
Steve Hackbarth [Mon, 11 Aug 2014 18:04:17 +0000 (14:04 -0400)]
Merge branch '4601' into 24200
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 17:26:53 +0000 (13:26 -0400)]
Merge tag 'v4.6.0-1' into 24200
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
Steve Hackbarth [Mon, 11 Aug 2014 15:03:13 +0000 (11:03 -0400)]
Merge pull request #1696 from julesstp/23852-InvoiceInventory
#23852: (inv. in invoice) rename invoice/returnLineItemBox to lineItemBox
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 [Fri, 8 Aug 2014 19:15:19 +0000 (15:15 -0400)]
bump xml
Steve Hackbarth [Fri, 8 Aug 2014 19:05:47 +0000 (15:05 -0400)]
bump 4.7.0 beta
Steve Hackbarth [Fri, 8 Aug 2014 18:47:53 +0000 (14:47 -0400)]
no longer need these usrext inserts
Steve Hackbarth [Fri, 8 Aug 2014 18:37:50 +0000 (14:37 -0400)]
register extensions in the correct order
Steve Hackbarth [Fri, 8 Aug 2014 17:53:25 +0000 (13:53 -0400)]
issue #24200: correct path to delete_orms
Steve Hackbarth [Fri, 8 Aug 2014 16:53:23 +0000 (12:53 -0400)]
don't need winston
Steve Hackbarth [Fri, 8 Aug 2014 16:40:03 +0000 (12:40 -0400)]
fix paths
Steve Hackbarth [Fri, 8 Aug 2014 16:36:12 +0000 (12:36 -0400)]
finish chopping up build_database_util
Steve Hackbarth [Fri, 8 Aug 2014 16:19:58 +0000 (12:19 -0400)]
chop up files more
Gil Moskowitz [Fri, 8 Aug 2014 15:39:48 +0000 (11:39 -0400)]
Merge pull request #1742 from garyhgohoos/23254-3
Issue #23254:fix gain/loss calculation
Gil Moskowitz [Fri, 8 Aug 2014 15:39:15 +0000 (11:39 -0400)]
Merge pull request #1739 from garyhgohoos/23254-3
Issue #23254:fix gain/loss calculation
Steve Hackbarth [Fri, 8 Aug 2014 15:36:53 +0000 (11:36 -0400)]
merge
garyhgohoos [Thu, 7 Aug 2014 13:33:33 +0000 (09:33 -0400)]
Issue #23254:fix gain/loss calculation
julesstp [Thu, 7 Aug 2014 00:22:12 +0000 (20:22 -0400)]
remove irrelevant comments
jgunderson [Wed, 6 Aug 2014 19:53:44 +0000 (15:53 -0400)]
24106, number spinner issues
jgunderson [Wed, 6 Aug 2014 17:37:30 +0000 (13:37 -0400)]
24106, number spinner issues
julesstp [Wed, 6 Aug 2014 16:10:13 +0000 (12:10 -0400)]
unit test for delete item written
Steve Hackbarth [Wed, 6 Aug 2014 14:52:06 +0000 (10:52 -0400)]
Merge pull request #1733 from xtuple/4_6_x
4 6 x
julesstp [Mon, 4 Aug 2014 22:05:51 +0000 (18:05 -0400)]
issue #23956: delete line items remain
garyhgohoos [Mon, 4 Aug 2014 18:39:06 +0000 (14:39 -0400)]
Issue #24224:nomalize sales reporting
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.
julesstp [Fri, 1 Aug 2014 20:17:20 +0000 (16:17 -0400)]
Merge branch '4_6_x' of https://github.com/xtuple/xtuple into 4_6_x
julesstp [Fri, 1 Aug 2014 20:16:59 +0000 (16:16 -0400)]
delete line item popup to come from enyo, not backbone so that we can handle enyo stuff
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
Steve Hackbarth [Tue, 29 Jul 2014 20:40:26 +0000 (16:40 -0400)]
clean up
Steve Hackbarth [Tue, 29 Jul 2014 20:37:09 +0000 (16:37 -0400)]
register from package json or manifest js
garyhgohoos [Tue, 29 Jul 2014 20:30:06 +0000 (16:30 -0400)]
Issue #24224:normalize margin calculations
Steve Hackbarth [Tue, 29 Jul 2014 19:20:10 +0000 (15:20 -0400)]
issue #24200: load versions into client from datasource
projects / xtuple / log