[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 11992d: Fix init data sql
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 11992d: Fix init data sql |
|
Date: |
Wed, 11 Sep 2013 13:00:41 -0700 |
Branch: refs/heads/3.4_backported
Home: https://github.com/Dolibarr/dolibarr
Commit: 11992dca9fbcb28737002e55e360c5690fa40142
https://github.com/Dolibarr/dolibarr/commit/11992dca9fbcb28737002e55e360c5690fa40142
Author: Laurent Destailleur <address@hidden>
Date: 2013-09-09 (Mon, 09 Sep 2013)
Changed paths:
M dev/initdata/mysqldump_dolibarr_3.3.0.sql
Log Message:
-----------
Fix init data sql
Commit: 0fa836fd45166a07d9558bf5f4841a92d4198ac3
https://github.com/Dolibarr/dolibarr/commit/0fa836fd45166a07d9558bf5f4841a92d4198ac3
Author: Laurent Destailleur <address@hidden>
Date: 2013-09-09 (Mon, 09 Sep 2013)
Changed paths:
M test/phpunit/BuildDocTest.php
Log Message:
-----------
Fix bad name
Commit: 2f0ad6a22c4373ea00ac22d7ad6af42977602be6
https://github.com/Dolibarr/dolibarr/commit/2f0ad6a22c4373ea00ac22d7ad6af42977602be6
Author: Laurent Destailleur <address@hidden>
Date: 2013-09-09 (Mon, 09 Sep 2013)
Changed paths:
M dev/codesniffer/ruleset.xml
Log Message:
-----------
Fix: syntax error in ruleset.xml
Commit: e2110e620ca35769193789fb13945830a1acf705
https://github.com/Dolibarr/dolibarr/commit/e2110e620ca35769193789fb13945830a1acf705
Author: Laurent Destailleur <address@hidden>
Date: 2013-09-09 (Mon, 09 Sep 2013)
Changed paths:
M dev/codesniffer/ruleset.xml
Log Message:
-----------
Fix: syntax error in ruleset.xml
Commit: 43beb38c9b7b69f20c56efe167de9190b47ea3c3
https://github.com/Dolibarr/dolibarr/commit/43beb38c9b7b69f20c56efe167de9190b47ea3c3
Author: simnandez <address@hidden>
Date: 2013-09-10 (Tue, 10 Sep 2013)
Changed paths:
M ChangeLog
M htdocs/commande/class/commande.class.php
Log Message:
-----------
Fix: [ bug #1061 ] Bad info shipped products
Commit: 5abbee02c8f34195a9cbc6ca5e07917dfbdb747d
https://github.com/Dolibarr/dolibarr/commit/5abbee02c8f34195a9cbc6ca5e07917dfbdb747d
Author: jfefe <address@hidden>
Date: 2013-09-10 (Tue, 10 Sep 2013)
Changed paths:
M htdocs/webservices/server_order.php
Log Message:
-----------
Fix : missing lib / bad property name in order webservice
Commit: 2db0a56b17575f65615cfb6750524cecf9b73f59
https://github.com/Dolibarr/dolibarr/commit/2db0a56b17575f65615cfb6750524cecf9b73f59
Author: Laurent Destailleur <address@hidden>
Date: 2013-09-10 (Tue, 10 Sep 2013)
Changed paths:
M htdocs/webservices/server_order.php
Log Message:
-----------
Merge pull request #1225 from jfefe/fix_ws_order
Fix : missing lib / bad property name in order webservice
Commit: c02b0f23816919b2b015fd722d95c097c219cc35
https://github.com/Dolibarr/dolibarr/commit/c02b0f23816919b2b015fd722d95c097c219cc35
Author: Laurent Destailleur <address@hidden>
Date: 2013-09-10 (Tue, 10 Sep 2013)
Changed paths:
M .travis.yml
Log Message:
-----------
Removed warnings
Commit: fa5fea68b0a5b389051ad4fe0d73f1b0ed2e448f
https://github.com/Dolibarr/dolibarr/commit/fa5fea68b0a5b389051ad4fe0d73f1b0ed2e448f
Author: Laurent Destailleur <address@hidden>
Date: 2013-09-10 (Tue, 10 Sep 2013)
Changed paths:
M .travis.yml
Log Message:
-----------
Removed warnings
Commit: 0cb8e2e71099b9ee08eb3ae269b5dc7789e95d5f
https://github.com/Dolibarr/dolibarr/commit/0cb8e2e71099b9ee08eb3ae269b5dc7789e95d5f
Author: Laurent Destailleur <address@hidden>
Date: 2013-09-10 (Tue, 10 Sep 2013)
Changed paths:
M .travis.yml
Log Message:
-----------
Removed warnings
Commit: cb95355d37d340b051f4d781e741da0a9a412cdc
https://github.com/Dolibarr/dolibarr/commit/cb95355d37d340b051f4d781e741da0a9a412cdc
Author: Laurent Destailleur <address@hidden>
Date: 2013-09-10 (Tue, 10 Sep 2013)
Changed paths:
M htdocs/webservices/server_order.php
Log Message:
-----------
Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4
Commit: fa0825885ac89c7dcd66254332dbf92507dd1e22
https://github.com/Dolibarr/dolibarr/commit/fa0825885ac89c7dcd66254332dbf92507dd1e22
Author: Laurent Destailleur <address@hidden>
Date: 2013-09-11 (Wed, 11 Sep 2013)
Changed paths:
M .travis.yml
Log Message:
-----------
Merge branch '3.3' of address@hidden:Dolibarr/dolibarr.git into 3.3
Commit: 4362771e01dccb5e20d74f9602d422c782106cbb
https://github.com/Dolibarr/dolibarr/commit/4362771e01dccb5e20d74f9602d422c782106cbb
Author: Laurent Destailleur <address@hidden>
Date: 2013-09-11 (Wed, 11 Sep 2013)
Changed paths:
M .travis.yml
M ChangeLog
M htdocs/commande/class/commande.class.php
M htdocs/webservices/server_order.php
Log Message:
-----------
Merge branch '3.4' of address@hidden:Dolibarr/dolibarr.git into 3.4
Commit: 30d2af26f81b95a9d1ca6f7a0b69ba49304d5b35
https://github.com/Dolibarr/dolibarr/commit/30d2af26f81b95a9d1ca6f7a0b69ba49304d5b35
Author: Laurent Destailleur <address@hidden>
Date: 2013-09-11 (Wed, 11 Sep 2013)
Changed paths:
M test/phpunit/UserTest.php
Log Message:
-----------
Fix: phpunit test
Commit: d6c35c1ee75c300064cf92fc05a965257a06696b
https://github.com/Dolibarr/dolibarr/commit/d6c35c1ee75c300064cf92fc05a965257a06696b
Author: Laurent Destailleur <address@hidden>
Date: 2013-09-11 (Wed, 11 Sep 2013)
Changed paths:
M COPYRIGHT
A htdocs/includes/jquery/js/jquery-latest.js
A htdocs/includes/jquery/js/jquery-ui-latest.custom.js
A htdocs/includes/jquery/plugins/jeditable/jquery.jeditable.js
A htdocs/includes/jquery/plugins/jnotify/jquery.jnotify.js
R htdocs/includes/jquery/plugins/jpicker/jquery-1.4.4.min.js
R htdocs/includes/jquery/plugins/jstree/jquery.cookie.js
R htdocs/includes/jquery/plugins/jstree/jquery.hotkeys.js
R htdocs/includes/jquery/plugins/jstree/jquery.jstree.min.js
R htdocs/includes/jquery/plugins/jstree/themes/apple/bg.jpg
R htdocs/includes/jquery/plugins/jstree/themes/apple/d.png
R htdocs/includes/jquery/plugins/jstree/themes/apple/dot_for_ie.gif
R htdocs/includes/jquery/plugins/jstree/themes/apple/style.css
R htdocs/includes/jquery/plugins/jstree/themes/apple/throbber.gif
R htdocs/includes/jquery/plugins/jstree/themes/classic/d.gif
R htdocs/includes/jquery/plugins/jstree/themes/classic/d.png
R htdocs/includes/jquery/plugins/jstree/themes/classic/dot_for_ie.gif
R htdocs/includes/jquery/plugins/jstree/themes/classic/style.css
R htdocs/includes/jquery/plugins/jstree/themes/classic/throbber.gif
R htdocs/includes/jquery/plugins/jstree/themes/default-rtl/d.gif
R htdocs/includes/jquery/plugins/jstree/themes/default-rtl/d.png
R htdocs/includes/jquery/plugins/jstree/themes/default-rtl/dots.gif
R htdocs/includes/jquery/plugins/jstree/themes/default-rtl/style.css
R htdocs/includes/jquery/plugins/jstree/themes/default-rtl/throbber.gif
R htdocs/includes/jquery/plugins/jstree/themes/default/d.gif
R htdocs/includes/jquery/plugins/jstree/themes/default/d.png
R htdocs/includes/jquery/plugins/jstree/themes/default/style.css
R htdocs/includes/jquery/plugins/jstree/themes/default/throbber.gif
A htdocs/includes/jquery/plugins/mobile/jquery.mobile-latest.css
A htdocs/includes/jquery/plugins/mobile/jquery.mobile-latest.js
M htdocs/includes/jquery/plugins/mobile/jquery.mobile-latest.min.css
M htdocs/includes/jquery/plugins/mobile/jquery.mobile-latest.min.js
Log Message:
-----------
Fix: Opensource rules violation (sources must be included with lib)
Commit: 301187a117bcd44421c9ce347fb95e4f7911f1c5
https://github.com/Dolibarr/dolibarr/commit/301187a117bcd44421c9ce347fb95e4f7911f1c5
Author: Laurent Destailleur <address@hidden>
Date: 2013-09-11 (Wed, 11 Sep 2013)
Changed paths:
M dev/initdata/mysqldump_dolibarr_3.3.0.sql
A htdocs/includes/jquery/js/jquery-latest.js
A htdocs/includes/jquery/js/jquery-ui-latest.custom.js
A htdocs/includes/jquery/plugins/jeditable/jquery.jeditable.js
A htdocs/includes/jquery/plugins/jnotify/jquery.jnotify.js
R htdocs/includes/jquery/plugins/jpicker/jquery-1.4.4.min.js
A htdocs/includes/jquery/plugins/mobile/jquery.mobile-latest.css
A htdocs/includes/jquery/plugins/mobile/jquery.mobile-latest.js
Log Message:
-----------
Merge remote-tracking branch 'origin/3.3' into 3.4
Conflicts:
COPYRIGHT
dev/initdata/mysqldump_dolibarr_3.3.0.sql
htdocs/includes/jquery/plugins/mobile/jquery.mobile-latest.min.js
Commit: 641daf3d71c69cfd9eb8983ff2945da0890399df
https://github.com/Dolibarr/dolibarr/commit/641daf3d71c69cfd9eb8983ff2945da0890399df
Author: Laurent Destailleur <address@hidden>
Date: 2013-09-11 (Wed, 11 Sep 2013)
Changed paths:
M .travis.yml
M ChangeLog
M dev/codesniffer/ruleset.xml
M dev/initdata/mysqldump_dolibarr_3.3.0.sql
M htdocs/commande/class/commande.class.php
A htdocs/includes/jquery/js/jquery-latest.js
A htdocs/includes/jquery/js/jquery-ui-latest.custom.js
A htdocs/includes/jquery/plugins/jeditable/jquery.jeditable.js
A htdocs/includes/jquery/plugins/jnotify/jquery.jnotify.js
R htdocs/includes/jquery/plugins/jpicker/jquery-1.4.4.min.js
A htdocs/includes/jquery/plugins/mobile/jquery.mobile-latest.css
A htdocs/includes/jquery/plugins/mobile/jquery.mobile-latest.js
M htdocs/webservices/server_order.php
M test/phpunit/UserTest.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.4' into 3.4_backported
Compare:
https://github.com/Dolibarr/dolibarr/compare/8edae2e81200...641daf3d71c6