Mike O'Donnell [Wed, 3 Apr 2013 18:25:25 +0000 (11:25 -0700)]
Merge pull request #230 from shackbarth/19840
issue #19840: quote boxes in prospect, customer, opportunity
Steve Hackbarth [Tue, 2 Apr 2013 20:37:17 +0000 (16:37 -0400)]
issue #19840: cleanup
Steve Hackbarth [Tue, 2 Apr 2013 19:26:55 +0000 (15:26 -0400)]
issue #19840: prospects are in the customer column of quote
Steve Hackbarth [Tue, 2 Apr 2013 18:29:13 +0000 (14:29 -0400)]
issue #19840: got opportunity quote box working
shackbarth [Tue, 2 Apr 2013 13:34:27 +0000 (06:34 -0700)]
Merge pull request #228 from vinaysingu/master
Selenium scripts with more environments
vinay [Tue, 2 Apr 2013 12:25:13 +0000 (17:55 +0530)]
with more environments
mikerodonnell89 [Mon, 1 Apr 2013 20:31:33 +0000 (16:31 -0400)]
changes
mikerodonnell89 [Mon, 1 Apr 2013 20:27:44 +0000 (16:27 -0400)]
changes
mikerodonnell89 [Mon, 1 Apr 2013 19:57:35 +0000 (15:57 -0400)]
progress on customer/prospect quotes box
mikerodonnell89 [Mon, 1 Apr 2013 17:54:57 +0000 (13:54 -0400)]
Merge branch 'master' into 19840b
mikerodonnell89 [Mon, 1 Apr 2013 14:11:28 +0000 (10:11 -0400)]
Merge branch 'xtuple'
vinay [Mon, 1 Apr 2013 12:47:30 +0000 (18:17 +0530)]
Merge remote-tracking branch 'XTUPLE/master'
shackbarth [Fri, 29 Mar 2013 19:20:43 +0000 (12:20 -0700)]
Merge pull request #221 from shackbarth/resetdb
fixed resetdb command
shackbarth [Fri, 29 Mar 2013 18:30:38 +0000 (11:30 -0700)]
Merge pull request #218 from shackbarth/19793
issue #19793: fixed lock binding
Steve Hackbarth [Fri, 29 Mar 2013 18:28:36 +0000 (14:28 -0400)]
issue #19793: check myself
mikerodonnell89 [Fri, 29 Mar 2013 17:49:31 +0000 (13:49 -0400)]
Merge branch 'xtuple'
mikerodonnell89 [Fri, 29 Mar 2013 15:43:20 +0000 (11:43 -0400)]
fixed some workspace stuff
vinay [Fri, 29 Mar 2013 06:06:37 +0000 (11:36 +0530)]
Merge remote-tracking branch 'XTUPLE/master'
shackbarth [Thu, 28 Mar 2013 20:16:39 +0000 (13:16 -0700)]
Merge pull request #223 from shackbarth/sanity
added sales to sanity exceptions
Steve Hackbarth [Thu, 28 Mar 2013 20:16:03 +0000 (16:16 -0400)]
added sales to sanity exceptions
mikerodonnell89 [Thu, 28 Mar 2013 19:36:23 +0000 (15:36 -0400)]
Merge branch 'master' into 19840b
mikerodonnell89 [Thu, 28 Mar 2013 19:36:10 +0000 (15:36 -0400)]
Merge branch 'master' of https://github.com/mikerodonnell89/xtuple
mikerodonnell89 [Thu, 28 Mar 2013 19:36:00 +0000 (15:36 -0400)]
added quoteRelations attr to cust in sales ext
Mike O'Donnell [Thu, 28 Mar 2013 19:35:21 +0000 (12:35 -0700)]
Merge pull request #56 from xtuple/master
update
mikerodonnell89 [Thu, 28 Mar 2013 19:21:39 +0000 (15:21 -0400)]
added list relations and box
Steve Hackbarth [Thu, 28 Mar 2013 19:17:57 +0000 (15:17 -0400)]
fixed resetdb command
mikerodonnell89 [Thu, 28 Mar 2013 19:10:30 +0000 (15:10 -0400)]
Merge branch 'xtuple'
shackbarth [Thu, 28 Mar 2013 17:12:05 +0000 (10:12 -0700)]
Merge pull request #219 from bendiy/master
Make sure org is set in scope selection.
Ben Thompson [Thu, 28 Mar 2013 16:23:16 +0000 (12:23 -0400)]
Merge branch 'xtuple'
Ben Thompson [Thu, 28 Mar 2013 16:22:47 +0000 (12:22 -0400)]
Make sure a matching org was found.
Steve Hackbarth [Thu, 28 Mar 2013 15:47:27 +0000 (11:47 -0400)]
issue #19793: fixed lock binding
mikerodonnell89 [Thu, 28 Mar 2013 15:09:44 +0000 (11:09 -0400)]
Merge branch 'master' of https://github.com/mikerodonnell89/xtuple
Mike O'Donnell [Thu, 28 Mar 2013 15:09:24 +0000 (08:09 -0700)]
Merge pull request #55 from xtuple/master
catching up
shackbarth [Thu, 28 Mar 2013 13:35:38 +0000 (06:35 -0700)]
Merge pull request #216 from bendiy/master
Fix broken GlobalPrivs to session
vinay [Thu, 28 Mar 2013 09:53:27 +0000 (15:23 +0530)]
Merge remote-tracking branch 'XTUPLE/master'
mikerodonnell89 [Thu, 28 Mar 2013 02:35:23 +0000 (22:35 -0400)]
Merge branch 'master' of https://github.com/mikerodonnell89/xtuple
Ben Thompson [Wed, 27 Mar 2013 23:29:34 +0000 (19:29 -0400)]
Fix auth scope route now that we're using XM.SimpleModel.
shackbarth [Wed, 27 Mar 2013 20:26:31 +0000 (13:26 -0700)]
Merge pull request #215 from bendiy/master
Fix syncUser crash.
Ben Thompson [Wed, 27 Mar 2013 20:24:46 +0000 (16:24 -0400)]
Fix syncUser cashing datasource on Admin > User change.
Mike O'Donnell [Wed, 27 Mar 2013 19:05:00 +0000 (12:05 -0700)]
Merge pull request #54 from xtuple/master
quote should work
John Rogelstad [Wed, 27 Mar 2013 18:58:29 +0000 (11:58 -0700)]
Merge pull request #213 from shackbarth/19929
issue #19929: customer relation widget must search without reference to ...
Steve Hackbarth [Wed, 27 Mar 2013 18:27:03 +0000 (14:27 -0400)]
issue #19929: customer relation widget must search without reference to model
shackbarth [Wed, 27 Mar 2013 17:55:49 +0000 (10:55 -0700)]
Merge pull request #212 from shackbarth/19827b
issue #19827: more touches from john
Steve Hackbarth [Wed, 27 Mar 2013 17:53:35 +0000 (13:53 -0400)]
Merge remote-tracking branch 'JROGELSTAD/19827' into 19827b
John Rogelstad [Wed, 27 Mar 2013 14:49:59 +0000 (07:49 -0700)]
Merge pull request #209 from jgunderson/master
19551, 19444 CRM & Sales Reports
shackbarth [Wed, 27 Mar 2013 14:44:52 +0000 (07:44 -0700)]
Merge pull request #210 from shackbarth/19703
quick patch
Steve Hackbarth [Wed, 27 Mar 2013 14:44:11 +0000 (10:44 -0400)]
quick patch
Jeff Gunderson [Wed, 27 Mar 2013 14:14:22 +0000 (10:14 -0400)]
19551, 19444
John Rogelstad [Wed, 27 Mar 2013 13:46:50 +0000 (09:46 -0400)]
issue #19827: Fix read only problems and other tweaks to cost info on child workspace.
shackbarth [Wed, 27 Mar 2013 13:13:59 +0000 (06:13 -0700)]
Merge pull request #206 from jrogelstad/19917
issue #19917: Fix validation order.
John Rogelstad [Wed, 27 Mar 2013 12:30:40 +0000 (08:30 -0400)]
Merge branch 'xtuple' into 19827
John Rogelstad [Wed, 27 Mar 2013 11:54:44 +0000 (07:54 -0400)]
issue #19917: Fix validation order.
John Rogelstad [Wed, 27 Mar 2013 11:15:52 +0000 (04:15 -0700)]
Merge pull request #201 from shackbarth/19703
issue #19703: speed up orm install by not reinstalling needlessly
John Rogelstad [Wed, 27 Mar 2013 11:14:31 +0000 (04:14 -0700)]
Merge pull request #205 from shackbarth/19208
issue #19208: search on dbserver rel widget
John Rogelstad [Wed, 27 Mar 2013 11:13:11 +0000 (04:13 -0700)]
Merge pull request #204 from shackbarth/19918
issue #19918: fixed reset password by updating callback params
Steve Hackbarth [Wed, 27 Mar 2013 01:15:49 +0000 (21:15 -0400)]
issue #19208: safety on rel widget query
Steve Hackbarth [Wed, 27 Mar 2013 01:15:20 +0000 (21:15 -0400)]
issue #19208: added databaseserverparameterwidget
Steve Hackbarth [Wed, 27 Mar 2013 01:00:16 +0000 (21:00 -0400)]
issue #19918: fixed reset password by updating callback params
shackbarth [Tue, 26 Mar 2013 21:16:04 +0000 (14:16 -0700)]
Merge pull request #202 from jrogelstad/19827
issue #19827: More fixes on quote. Still not done, though.
Mike O'Donnell [Tue, 26 Mar 2013 21:04:06 +0000 (14:04 -0700)]
Merge pull request #53 from xtuple/master
update
John Rogelstad [Tue, 26 Mar 2013 20:51:19 +0000 (13:51 -0700)]
Merge pull request #199 from shackbarth/19808
issue #19808: sales configuration workspace
John Rogelstad [Tue, 26 Mar 2013 20:41:13 +0000 (16:41 -0400)]
issue #19827: Fix unit of measure conversion problems.
shackbarth [Tue, 26 Mar 2013 20:25:26 +0000 (13:25 -0700)]
Merge pull request #200 from bendiy/19300
Issue #19300 Change scope to save as an array string
John Rogelstad [Tue, 26 Mar 2013 19:05:15 +0000 (15:05 -0400)]
issue #19827: Make sure price changes by user kick off events.
Steve Hackbarth [Tue, 26 Mar 2013 18:06:16 +0000 (14:06 -0400)]
issue #19703: do not delete views or orms
Ben Thompson [Tue, 26 Mar 2013 17:18:26 +0000 (13:18 -0400)]
Merge branch 'master' into 19300
Ben Thompson [Tue, 26 Mar 2013 17:17:22 +0000 (13:17 -0400)]
Change scope to save as an array string so tokens can have multiple scope values.
Steve Hackbarth [Tue, 26 Mar 2013 17:14:51 +0000 (13:14 -0400)]
Revert "issue #19703: do not delete orms in init"
This reverts commit
2d0fb7b1592e4c9116f258516fad32ab7b216d72.
John Rogelstad [Tue, 26 Mar 2013 15:57:37 +0000 (11:57 -0400)]
issue #19827: Events should only be triggered by user, never by other events.
John Rogelstad [Tue, 26 Mar 2013 15:56:24 +0000 (11:56 -0400)]
issue #19827: Mixins can not use inheritance on other mixins.
Steve Hackbarth [Tue, 26 Mar 2013 15:48:00 +0000 (11:48 -0400)]
issue #19703: do not delete orms in init
Steve Hackbarth [Tue, 26 Mar 2013 15:43:01 +0000 (11:43 -0400)]
issue #19703: do not update unchanged orm
shackbarth [Tue, 26 Mar 2013 15:19:38 +0000 (08:19 -0700)]
Merge pull request #198 from lynnaloo/19806
19806 - Css fixes for Quote Totals panel
Steve Hackbarth [Tue, 26 Mar 2013 15:15:28 +0000 (11:15 -0400)]
merge
Steve Hackbarth [Tue, 26 Mar 2013 15:12:19 +0000 (11:12 -0400)]
issue #19808: put in static denormalized values from qt
Steve Hackbarth [Tue, 26 Mar 2013 14:54:49 +0000 (10:54 -0400)]
issue #19808: validate model
Steve Hackbarth [Tue, 26 Mar 2013 14:45:59 +0000 (10:45 -0400)]
issue #19808: fixed db typo
Steve Hackbarth [Tue, 26 Mar 2013 14:39:51 +0000 (10:39 -0400)]
issue #19808: line item edit picker
Steve Hackbarth [Tue, 26 Mar 2013 14:17:23 +0000 (10:17 -0400)]
issue #19808: invoice date source model and picker
Linda Nichols [Tue, 26 Mar 2013 14:14:25 +0000 (10:14 -0400)]
Merge branch 'master' into 19806
Linda Nichols [Tue, 26 Mar 2013 14:13:52 +0000 (10:13 -0400)]
Merge remote-tracking branch 'XTUPLE/master'
Linda Nichols [Tue, 26 Mar 2013 14:13:38 +0000 (10:13 -0400)]
Issue 19806: Styling changes for totals group
Linda Nichols [Tue, 26 Mar 2013 14:10:19 +0000 (10:10 -0400)]
Merge remote-tracking branch 'XTUPLE/master' into 19806
Steve Hackbarth [Tue, 26 Mar 2013 14:03:06 +0000 (10:03 -0400)]
issue #19808: ship via picker
Steve Hackbarth [Tue, 26 Mar 2013 14:00:09 +0000 (10:00 -0400)]
issue #19808: translations
John Rogelstad [Tue, 26 Mar 2013 12:11:29 +0000 (08:11 -0400)]
Just doesn't feel like this belongs in here.
John Rogelstad [Tue, 26 Mar 2013 11:27:21 +0000 (07:27 -0400)]
Merge branch 'xtuple' into 19827
John Rogelstad [Tue, 26 Mar 2013 11:26:26 +0000 (04:26 -0700)]
Merge pull request #197 from bendiy/19300
19300 JSON Web Token (JWT) OAuth 2.0 exchange support.
John Rogelstad [Tue, 26 Mar 2013 11:26:00 +0000 (04:26 -0700)]
Merge pull request #196 from shackbarth/19817
issue #19269, issue #19816, issue #19817, issue #19819, issue #19820
vinay [Tue, 26 Mar 2013 11:21:44 +0000 (16:51 +0530)]
Merge remote-tracking branch 'XTUPLE/master'
Linda Nichols [Tue, 26 Mar 2013 03:53:36 +0000 (23:53 -0400)]
Issue 19806: Fixed issues with widths and padding in totals box
Linda Nichols [Tue, 26 Mar 2013 03:49:49 +0000 (23:49 -0400)]
Issue 19806: Fixed issues with widths and padding in totals box
Ben Thompson [Mon, 25 Mar 2013 21:34:32 +0000 (17:34 -0400)]
Issue #19300 Remove some testing code.
Ben Thompson [Mon, 25 Mar 2013 21:26:11 +0000 (17:26 -0400)]
Issue #19300 Fix a few bugs after testing.
Steve Hackbarth [Mon, 25 Mar 2013 20:40:22 +0000 (16:40 -0400)]
issue #19808: massage save of settings model to work with new backbone signature
John Rogelstad [Mon, 25 Mar 2013 20:37:57 +0000 (16:37 -0400)]
issue #19827: Make sure initial loading of record does not make it dirty.
Ben Thompson [Mon, 25 Mar 2013 20:35:11 +0000 (16:35 -0400)]
Merge branch 'master' into 19300
Ben Thompson [Mon, 25 Mar 2013 20:33:48 +0000 (16:33 -0400)]
Issue #19300 Finish JWT support, pre-merge.
Steve Hackbarth [Mon, 25 Mar 2013 20:31:14 +0000 (16:31 -0400)]
issue #19808: relabel
Ben Thompson [Mon, 25 Mar 2013 20:30:30 +0000 (16:30 -0400)]
Issue #19300 org should reinitialize on each loop.
projects / xtuple / log