Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: bendiy/xtuple
...
head fork: bendiy/xtuple
Commits on Mar 14, 2013
@vinaysingu vinaysingu Merge pull request #2 from xtuple/master
latest vows
9c97a92
Commits on Mar 19, 2013
root Merge branch 'master' of https://github.com/vinaysingu/xtuple 42d64f0
Commits on Mar 20, 2013
vinay Merge remote-tracking branch 'XTUPLE/master' cc70d08
Commits on Mar 25, 2013
vinay Merge remote-tracking branch 'XTUPLE/master' c4b5368
Commits on Mar 26, 2013
vinay Merge remote-tracking branch 'XTUPLE/master' ac20949
@mikerodonnell89 mikerodonnell89 Merge pull request #53 from xtuple/master
update
a114a20
Commits on Mar 27, 2013
@mikerodonnell89 mikerodonnell89 Merge pull request #54 from xtuple/master
quote should work
b8cd4f2
@bendiy Issue #19296 code cleanup and formating. 9400355
@bendiy Issue #19296 First pass at simplifying X.database. 7e8e00b
@bendiy Issue #19296 First pass at moving ALL of node-datasource to XM.Simple…
…Modle.
8050eaa
@bendiy Merge branch 'master' into 19296 745c7be
@bendiy Issue #19296 cleanup database. f0a4f48
@bendiy Issue #19296 Fix GlobalPrivs on the auth scope route. 2b8ad9a
@bendiy Issue #19296 cleanup comments. 17bc911
Commits on Mar 28, 2013
@bendiy Issue #19296 Remove old session cleanup interval function. 89f00b8
@bendiy Issue #19296 Remove old non-express routes, functors, server, etc. d4ae3bf
@bendiy Issue #19296 Remove old loading paths from sample config. 45260fd
@bendiy Issue #19296 Cleanup options config loader. 27e2889
@bendiy Issue #19296 Remove key and register_service 654aedf
@mikerodonnell89 mikerodonnell89 Merge branch 'master' of https://github.com/mikerodonnell89/xtuple fd9a5c6
vinay Merge remote-tracking branch 'XTUPLE/master' b14d6b1
@mikerodonnell89 mikerodonnell89 Merge pull request #55 from xtuple/master
catching up
3e8a25a
@mikerodonnell89 mikerodonnell89 Merge branch 'master' of https://github.com/mikerodonnell89/xtuple 76f1255
@bendiy Make sure a matching org was found. a764fe0
@bendiy Issue #19296 Remove old session schema and models. 7cf0fd3
@bendiy Fix file permissions. 72a6cfd
@bendiy Issue #19296 clean up file permissions. 8579ed2
@mikerodonnell89 mikerodonnell89 Merge branch 'xtuple' a9d49b2
@mikerodonnell89 mikerodonnell89 added list relations and box 91874a3
@mikerodonnell89 mikerodonnell89 Merge pull request #56 from xtuple/master
update
71b4b49
@mikerodonnell89 mikerodonnell89 added quoteRelations attr to cust in sales ext 3a24dd7
@mikerodonnell89 mikerodonnell89 Merge branch 'master' of https://github.com/mikerodonnell89/xtuple 659eb27
@mikerodonnell89 mikerodonnell89 Merge branch 'master' into 19840b 5c999ec
@bendiy Issue #19296 move config and salt settings to config file. 6cbca87
@bendiy Issue #19296 Remove old XT server. 7bf7249
@bendiy Issue #19296 Remove connect npm package from XT. 51f5524
@bendiy Issue #19296 installer.js needs to be executable. b9b1311
@bendiy Issue #19296 Consoliate package.json files. 7fc67fd
@bendiy Merge branch 'master' into 19296 036573e
Commits on Mar 29, 2013
vinay Merge remote-tracking branch 'XTUPLE/master' 0719f07
@mikerodonnell89 mikerodonnell89 Merge pull request #57 from xtuple/master
update
6aa31a5
@mikerodonnell89 mikerodonnell89 fixed some workspace stuff 5172833
@bendiy Issue #19296 Point update.sh to new consolidated npm location. 2cca42f
@mikerodonnell89 mikerodonnell89 Merge branch 'xtuple' 8f81ec4
@bendiy Issue #19296 Move pg pool size to config file and set to 3. 94a2051
@bendiy Issue #19296 Add default if X.options is not set. 369ed49
Commits on Mar 30, 2013
@bendiy Issue #19206 get pg 0.14.1 working 270461d
Commits on Mar 31, 2013
@bendiy Issue #19296 Upgrade pg to 0.14.1 Add child process pgWorker. Move so…
…me of XT database to datasource.
0baceda
@bendiy Merge branch 'master' into 19296 dd286c2
Commits on Apr 01, 2013
@bendiy Issue #19296 Cleanup comment. 38ce984
@bendiy Issue #19296 Leave query and connect methods in xt/database/database …
…for the installer.
23a3f30
@bendiy The installer still uses xt/database/database. Can we git rid of that…
…? This gives string error.
1698512
@bendiy Issue #19296 Make extra pgWorker option is accessible. 928d05b
@bendiy Issue #19296 comment typo. 2dbbc5d
vinay Merge remote-tracking branch 'XTUPLE/master' 70d1206
@mikerodonnell89 mikerodonnell89 Merge pull request #58 from xtuple/master
update
d7d0421
@mikerodonnell89 mikerodonnell89 Merge branch 'xtuple' 3608b09
@shackbarth shackbarth removed debugging ccd936e
@mikerodonnell89 mikerodonnell89 Merge branch 'master' into 19840b f787fef
@mikerodonnell89 mikerodonnell89 progress on customer/prospect quotes box eb31ae1
@mikerodonnell89 mikerodonnell89 changes c304248
@mikerodonnell89 mikerodonnell89 changes 9bd2544
@bendiy Installer running without errors on XT.dataSource. 16b1faf
@mikerodonnell89 mikerodonnell89 Merge branch 'master' of https://github.com/mikerodonnell89/xtuple 87b55b2
@bendiy correct the order of tables in init_global.sql bdb897d
@bendiy Merge branch 'xtlessinstaller' into 19296 71f322d
@bendiy Issue #19296 fix pg pool size defaults. b8ee425
Commits on Apr 02, 2013
vinay with more environments 3514afb
@shackbarth shackbarth Merge pull request #228 from vinaysingu/master
Selenium scripts with more environments
be971d0
@mikerodonnell89 mikerodonnell89 Merge branch 'xtuple' 7021a73
@mikerodonnell89 mikerodonnell89 added sale type list dfbd2cd
@mikerodonnell89 mikerodonnell89 added saletype list and workspace 344dcd6
@bendiy Issue #19296 Throw an error if the pgWorker dies. 33722fa
@mikerodonnell89 mikerodonnell89 added terms test af1699e
@mikerodonnell89 mikerodonnell89 terms list added 6259f9a
@shackbarth shackbarth issue #19840: got opportunity quote box working b8435d2
@shackbarth shackbarth issue #19840: prospects are in the customer column of quote 58a5532
@mikerodonnell89 mikerodonnell89 Terms setup stuff 7455b4d
@mikerodonnell89 mikerodonnell89 added shipzone list/setup workspace 20ce4db
@mikerodonnell89 mikerodonnell89 added freight class test d8a5345
@mikerodonnell89 mikerodonnell89 added freight class list/setup workspace a1c9147
@shackbarth shackbarth issue #19840: cleanup 6290253
@mikerodonnell89 mikerodonnell89 added customer group test, fixed orm bug preventing creation of custo…
…mer groups
4aa27d0
Commits on Apr 03, 2013
@lynnaloo lynnaloo Issue 19812: Added Customer Types to Setup b7f5983
@mikerodonnell89 mikerodonnell89 customer group setup workspace added. I would like to add a list of c…
…ustomers in the grouers in the group to the workspace, but there is a problem with the db/orm for the customers attribute
2739ea6
@mikerodonnell89 mikerodonnell89 Added sales rep setup workspace 8d6d927
@mikerodonnell89 mikerodonnell89 customers attr on CustomerGroup removed again c08141d
@mikerodonnell89 mikerodonnell89 added sales cost to item workspace 8ba1c29
@mikerodonnell89 mikerodonnell89 Merge pull request #230 from shackbarth/19840
issue #19840: quote boxes in prospect, customer, opportunity
1b2b6f5
@mikerodonnell89 mikerodonnell89 Merge branch 'xtuple' 5880e7c
Commits on Apr 04, 2013
@shackbarth shackbarth Merge pull request #233 from mikerodonnell89/19818
19818
5e11ca7
@shackbarth shackbarth Merge pull request #227 from bendiy/master
correct the order of tables in init_global.sql
98cf1de
@lynnaloo lynnaloo Merge branch 'master' into 19812 4d5dfa2
@shackbarth shackbarth Merge branch 'xtuple' into 19296b 424b61a
@shackbarth shackbarth removed salt from repo ea4a24a
@shackbarth shackbarth tweaks ff12139
@lynnaloo lynnaloo Issue 19812: Added parameter widget for Customer Types. b1b7040
@shackbarth shackbarth Merge pull request #235 from shackbarth/19296b
issue #19296: cleanup
d8fe217
@shackbarth shackbarth Merge pull request #232 from lynnaloo/19812
Issue 19812: Added Customer Types to Setup
f0f2719
@lynnaloo lynnaloo Issue 19812: Removed CustomerType parameter. be768ef
@shackbarth shackbarth proper gitignore 490696c
@shackbarth shackbarth Merge pull request #237 from shackbarth/19296b
proper gitignore
4979244
@shackbarth shackbarth Merge branch 'xtuple' into lockfix 5689b76
@shackbarth shackbarth Merge pull request #226 from shackbarth/lockfix
removed debugging
2172979
@shackbarth shackbarth Merge pull request #236 from lynnaloo/19812
Issue 19812: Removed CustomerType parameter.
7a002e8
@mikerodonnell89 mikerodonnell89 Merge branch 'xtuple' b16f1d6
@mikerodonnell89 mikerodonnell89 Merge branch 'master' into listsWorkspaces 7c1dbc3
@mikerodonnell89 mikerodonnell89 Merge pull request #59 from xtuple/master
catching up
00fa358
@mikerodonnell89 mikerodonnell89 Merge branch 'master' of https://github.com/mikerodonnell89/xtuple 94d98e4
@mikerodonnell89 mikerodonnell89 Merge branch 'master' into listsWorkspaces 5072772
@shackbarth shackbarth Merge pull request #231 from mikerodonnell89/listsWorkspaces
lists and setup workspaces
559dd0c
@elevow elevow update.sh L76 to cd node-datasource/database/source 0fb1886
Commits on Apr 05, 2013
@shackbarth shackbarth Merge pull request #238 from elevow/fix_update
update.sh L76 to cd node-datasource/database/source
eb373c0
@shackbarth shackbarth small but critical bugfix in maintenance to get it to work with new n…
…odeside backbone
f7c73ff
@shackbarth shackbarth Merge pull request #240 from shackbarth/maintenance
small but critical bugfix in maintenance to get it to work with new node...
63cfae3