Travis Webb [Fri, 13 Jun 2014 06:09:51 +0000 (02:09 -0400)]
4.5.0-dev6
Travis Webb [Fri, 13 Jun 2014 06:09:18 +0000 (02:09 -0400)]
remove shrinkwrap temporarily
Travis Webb [Fri, 13 Jun 2014 06:08:58 +0000 (02:08 -0400)]
use included bootstrap
Travis Webb [Fri, 13 Jun 2014 06:01:02 +0000 (02:01 -0400)]
4.5.0-dev5
Travis Webb [Fri, 13 Jun 2014 06:00:38 +0000 (02:00 -0400)]
change travis.yml to use c lang
Travis Webb [Thu, 12 Jun 2014 18:42:28 +0000 (14:42 -0400)]
fixed ci execution of bootstrap script
Travis Webb [Thu, 12 Jun 2014 15:19:34 +0000 (11:19 -0400)]
4.5.0-dev4
Travis Webb [Thu, 12 Jun 2014 15:19:07 +0000 (11:19 -0400)]
Merge branch 'upgrade/node10' into server-npm-integration
Conflicts:
package.json
scripts/install_xtuple.sh
Travis Webb [Thu, 12 Jun 2014 09:49:53 +0000 (05:49 -0400)]
4.5.0-dev3
Travis Webb [Thu, 12 Jun 2014 09:49:35 +0000 (05:49 -0400)]
updated setup script
Travis Webb [Thu, 12 Jun 2014 09:45:04 +0000 (05:45 -0400)]
4.5.0-dev1
Travis Webb [Thu, 12 Jun 2014 09:43:59 +0000 (05:43 -0400)]
4.5.1
Travis Webb [Thu, 12 Jun 2014 09:39:58 +0000 (05:39 -0400)]
removed 0.8 from test list
Travis Webb [Thu, 12 Jun 2014 09:28:45 +0000 (05:28 -0400)]
separate setup step from postinstall
Travis Webb [Thu, 12 Jun 2014 09:19:15 +0000 (05:19 -0400)]
unify xtuple and xtuple-server packages
Steve Hackbarth [Fri, 6 Jun 2014 19:53:43 +0000 (15:53 -0400)]
Merge pull request #1567 from xtuple/4_5_x
4 5 x
Steve Hackbarth [Fri, 6 Jun 2014 16:54:47 +0000 (12:54 -0400)]
Merge pull request #1565 from shackbarth/bump450
Bump450
Steve Hackbarth [Fri, 6 Jun 2014 15:40:28 +0000 (11:40 -0400)]
bump to 4.5.0
Steve Hackbarth [Fri, 6 Jun 2014 15:39:59 +0000 (11:39 -0400)]
Merge remote-tracking branch 'origin/release' into bump450
Travis Webb [Thu, 5 Jun 2014 21:03:08 +0000 (17:03 -0400)]
Merge pull request #1550 from lynnaloo/21048
Issue #21048 - replace images with font-awesome
Steve Hackbarth [Thu, 5 Jun 2014 19:41:53 +0000 (15:41 -0400)]
Merge pull request #1563 from bendiy/item-site-list
Issue #23863 Fix item site search by number.
Ben Thompson [Thu, 5 Jun 2014 18:58:52 +0000 (14:58 -0400)]
Fix test query
Steve Hackbarth [Thu, 5 Jun 2014 18:47:17 +0000 (14:47 -0400)]
Merge pull request #1559 from gpazo/fixLessThanSign
Fix less than sign
Ben Thompson [Thu, 5 Jun 2014 18:40:18 +0000 (14:40 -0400)]
Issue #23863 support comma or space matching.
Ben Thompson [Thu, 5 Jun 2014 18:32:49 +0000 (14:32 -0400)]
Issue #23863 Fix item site search by number.
Linda Nichols [Thu, 5 Jun 2014 15:54:11 +0000 (15:54 +0000)]
fix conflicts
Steve Hackbarth [Thu, 5 Jun 2014 01:08:17 +0000 (21:08 -0400)]
Merge pull request #1560 from julesstp/23411-BaseCurrency
issue #23411: base currency
Steve Hackbarth [Thu, 5 Jun 2014 01:06:26 +0000 (21:06 -0400)]
Merge pull request #1558 from xtuple/4_5_x
4 5 x
julesstp [Wed, 4 Jun 2014 20:17:01 +0000 (14:17 -0600)]
change string false to boolean, and add isBase to list
vagrant [Wed, 4 Jun 2014 18:43:45 +0000 (18:43 +0000)]
fix backwards queries, remove '<' and replace with uglier query
Linda Nichols [Wed, 4 Jun 2014 17:58:53 +0000 (17:58 +0000)]
brought Gandolf back to life
Steve Hackbarth [Wed, 4 Jun 2014 00:04:06 +0000 (20:04 -0400)]
Merge pull request #1556 from xtuple/master
merge forward master
Steve Hackbarth [Tue, 3 Jun 2014 22:17:53 +0000 (18:17 -0400)]
Merge pull request #1524 from garyhgohoos/23593
Issue #23953:add poheadid argument
Steve Hackbarth [Tue, 3 Jun 2014 20:55:34 +0000 (16:55 -0400)]
Merge pull request #1547 from julesstp/23602
issue# 23602: update Sales Order schedule date updates the line item's schedule dates
Steve Hackbarth [Tue, 3 Jun 2014 20:53:41 +0000 (16:53 -0400)]
Merge pull request #1551 from garyhgohoos/23825
23825:define taxpay_id as serial type
Steve Hackbarth [Tue, 3 Jun 2014 20:53:20 +0000 (16:53 -0400)]
Merge pull request #1554 from gpazo/preReqCheck
Pre req check
Steve Hackbarth [Tue, 3 Jun 2014 20:51:53 +0000 (16:51 -0400)]
add warning about taxpay_id
julesstp [Tue, 3 Jun 2014 19:56:18 +0000 (13:56 -0600)]
Merge remote-tracking branch 'XTUPLE/4_5_x' into 23602
Greg Pazo [Tue, 3 Jun 2014 19:41:02 +0000 (15:41 -0400)]
check to see if xm schema exists, if so, disallow upgrade
Linda Nichols [Tue, 3 Jun 2014 19:27:03 +0000 (15:27 -0400)]
Merge pull request #1553 from xtuple/4_5_x
Merge 4_5_x into 4_6_x
julesstp [Tue, 3 Jun 2014 19:24:15 +0000 (13:24 -0600)]
correct site handling on sales_order model
Steve Hackbarth [Tue, 3 Jun 2014 17:13:52 +0000 (13:13 -0400)]
Merge pull request #1552 from lynnaloo/23607
Issue #23607 - Description truncated in ItemSite widget
Linda Nichols [Tue, 3 Jun 2014 16:11:36 +0000 (12:11 -0400)]
Merge pull request #1533 from shackbarth/23548-linguist
issue #23548: total batch processing for linguist translations
Linda Nichols [Tue, 3 Jun 2014 16:10:22 +0000 (12:10 -0400)]
Merge pull request #1527 from shackbarth/dbtest
POC database test for setmetric
Steve Hackbarth [Tue, 3 Jun 2014 15:54:45 +0000 (11:54 -0400)]
Merge pull request #1544 from bendiy/item-site-list
Issue #23760 Fix group by and union by on join table columns
Linda Nichols [Tue, 3 Jun 2014 15:51:22 +0000 (15:51 +0000)]
Issue #23607: Merged in changes from 4_5_x
garyhgohoos [Tue, 3 Jun 2014 15:39:48 +0000 (11:39 -0400)]
Issue #23825:define taxpay_id as serial type
Ben Thompson [Tue, 3 Jun 2014 15:07:17 +0000 (11:07 -0400)]
Fix test assertion
Ben Thompson [Tue, 3 Jun 2014 14:51:12 +0000 (10:51 -0400)]
Add ItemSiteRelation.fetch test queries that were failing.
Ben Thompson [Tue, 3 Jun 2014 14:27:19 +0000 (10:27 -0400)]
No need for dummy table when we don't use select *
Linda Nichols [Tue, 3 Jun 2014 03:20:18 +0000 (03:20 +0000)]
Merge branch '4_6_x' into 21048
Linda Nichols [Tue, 3 Jun 2014 02:58:54 +0000 (02:58 +0000)]
Issue #21048: Replaced search-input icon with font-awesome
Linda Nichols [Tue, 3 Jun 2014 02:32:43 +0000 (22:32 -0400)]
Merge pull request #1548 from shackbarth/23243-xwd
issue #23243: bugfix build for mfg and xwd
Steve Hackbarth [Tue, 3 Jun 2014 02:00:55 +0000 (22:00 -0400)]
issue #23243: bugfix build for mfg and xwd
Linda Nichols [Mon, 2 Jun 2014 20:20:18 +0000 (20:20 +0000)]
Issue #21048: Removed unused images from login/assets
julesstp [Mon, 2 Jun 2014 19:31:17 +0000 (13:31 -0600)]
add fail-safe to exit test for UseSiteCalendar issue
julesstp [Mon, 2 Jun 2014 19:14:01 +0000 (13:14 -0600)]
add test
Greg Pazo [Mon, 2 Jun 2014 17:53:28 +0000 (13:53 -0400)]
Merge pull request #1535 from shackbarth/23243-xwd
issue #23243: support for xwd package
julesstp [Mon, 2 Jun 2014 17:49:21 +0000 (11:49 -0600)]
Merge remote-tracking branch 'XTUPLE/4_5_x' into 23602
Ben Thompson [Mon, 2 Jun 2014 17:16:15 +0000 (13:16 -0400)]
Issue #23760 Fix group by and union by on join table columns.
Steve Hackbarth [Mon, 2 Jun 2014 16:27:41 +0000 (12:27 -0400)]
Merge pull request #1543 from shackbarth/readme2
point to more verbose setup wiki
Steve Hackbarth [Mon, 2 Jun 2014 16:02:49 +0000 (12:02 -0400)]
point to more verbose setup wiki
Steve Hackbarth [Mon, 2 Jun 2014 15:28:03 +0000 (11:28 -0400)]
Merge pull request #1531 from julesstp/23588
issue #23588: SO item copies irrelevantly
Steve Hackbarth [Mon, 2 Jun 2014 15:27:22 +0000 (11:27 -0400)]
Merge pull request #1541 from jgunderson/theme4
22128 style changes for dashboard filters
Steve Hackbarth [Mon, 2 Jun 2014 15:26:39 +0000 (11:26 -0400)]
Merge pull request #1542 from jgunderson/userlist
register UserAccountList
jgunderson [Mon, 2 Jun 2014 15:00:18 +0000 (11:00 -0400)]
Merge branch 'xtuple45' into userlist
jgunderson [Mon, 2 Jun 2014 14:53:18 +0000 (10:53 -0400)]
Merge branch 'xtuple45' into theme4
Steve Hackbarth [Mon, 2 Jun 2014 14:52:36 +0000 (10:52 -0400)]
issue #23243: updated xml ids
julesstp [Mon, 2 Jun 2014 08:10:24 +0000 (02:10 -0600)]
issue #23602: Reschedule SO lines
Greg Pazo [Fri, 30 May 2014 20:44:32 +0000 (16:44 -0400)]
Merge pull request #1538 from garyhgohoos/23758
23758:correctly calc costs and margins for kits
jgunderson [Fri, 30 May 2014 20:40:09 +0000 (16:40 -0400)]
register UserAccountList
Greg Pazo [Fri, 30 May 2014 20:14:26 +0000 (16:14 -0400)]
Merge pull request #1536 from garyhgohoos/23507
23507:correctly handle non-netable
Greg Pazo [Fri, 30 May 2014 20:07:40 +0000 (16:07 -0400)]
Merge pull request #1532 from garyhgohoos/23628
Issue #23628:copy SO characteristics and email from quote to SO
jgunderson [Fri, 30 May 2014 20:00:57 +0000 (16:00 -0400)]
Merge branch 'xtuple45' into theme4
jgunderson [Fri, 30 May 2014 20:00:07 +0000 (16:00 -0400)]
22128 style changes for dashboard filters
Steve Hackbarth [Fri, 30 May 2014 16:04:22 +0000 (12:04 -0400)]
Merge pull request #1537 from mccjim/master
Update projects-detail.mql
garyhgohoos [Fri, 30 May 2014 14:15:31 +0000 (10:15 -0400)]
Issue #23758:correctly calc costs and margins for kits
mccjim [Thu, 29 May 2014 21:05:56 +0000 (17:05 -0400)]
Update projects-detail.mql
julesstp [Thu, 29 May 2014 20:40:05 +0000 (14:40 -0600)]
reverse smoke changes
Steve Hackbarth [Thu, 29 May 2014 20:14:26 +0000 (16:14 -0400)]
Merge pull request #1530 from julesstp/23559-SOSyntaxError
issue #23559: Syntax error on Sales Orders
garyhgohoos [Thu, 29 May 2014 17:36:40 +0000 (13:36 -0400)]
Issue #23507:correctly handle non-netable
Steve Hackbarth [Thu, 29 May 2014 17:12:16 +0000 (13:12 -0400)]
merge
Steve Hackbarth [Thu, 29 May 2014 17:10:08 +0000 (13:10 -0400)]
fix typo
Steve Hackbarth [Thu, 29 May 2014 16:33:31 +0000 (12:33 -0400)]
issue #23243: update package naming convention and payloads
Steve Hackbarth [Thu, 29 May 2014 16:09:56 +0000 (12:09 -0400)]
issue #23243: support for xwd package
Steve Hackbarth [Wed, 28 May 2014 16:41:50 +0000 (12:41 -0400)]
Merge pull request #1525 from gpazo/preReqTweak
tweak pre-reqs to be more flexible yet more rigid for xtmfg
Steve Hackbarth [Wed, 28 May 2014 16:41:25 +0000 (12:41 -0400)]
Merge pull request #1526 from andersdd/fix_activitylist
Fix activitylist naming convention
Steve Hackbarth [Wed, 28 May 2014 15:37:25 +0000 (11:37 -0400)]
issue #23548: sort dictionaries by alpha
garyhgohoos [Wed, 28 May 2014 14:26:51 +0000 (10:26 -0400)]
Issue #23628:copy SO characteristics and email from quote to SO
Steve Hackbarth [Tue, 27 May 2014 20:26:09 +0000 (16:26 -0400)]
issue #23243: remove unused old option
Steve Hackbarth [Tue, 27 May 2014 20:24:40 +0000 (16:24 -0400)]
issue #23243: allow the specification of a default schema
Steve Hackbarth [Tue, 27 May 2014 18:08:48 +0000 (14:08 -0400)]
issue #23548: cleanup
julesstp [Tue, 27 May 2014 17:40:03 +0000 (11:40 -0600)]
issue #23559: Syntax error on Sales Orders
Steve Hackbarth [Tue, 27 May 2014 17:25:19 +0000 (13:25 -0400)]
issue #23548: total linguist export for all languages
julesstp [Tue, 27 May 2014 16:46:04 +0000 (10:46 -0600)]
remove unnecessary var
julesstp [Tue, 27 May 2014 16:41:58 +0000 (10:41 -0600)]
simplify test, get it passing and move on
Steve Hackbarth [Tue, 27 May 2014 14:45:30 +0000 (10:45 -0400)]
cleanup cleanup
Steve Hackbarth [Tue, 27 May 2014 14:41:15 +0000 (10:41 -0400)]
POC database test for setmetric
Dave Anderson [Sun, 25 May 2014 23:04:35 +0000 (11:04 +1200)]
Rename activityList to avoid strict naming conflict
Dave Anderson [Sun, 25 May 2014 22:46:41 +0000 (10:46 +1200)]
Merge remote-tracking branch 'XTUPLE/4_6_x'
projects / xtuple / log