[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] a81c48: Revert "Update objectline_cre
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] a81c48: Revert "Update objectline_create.tpl.php" |
|
Date: |
Fri, 05 Dec 2014 11:21:58 -0800 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: a81c4830613a12700d6cb907312fa28068858db4
https://github.com/Dolibarr/dolibarr/commit/a81c4830613a12700d6cb907312fa28068858db4
Author: Laurent Destailleur <address@hidden>
Date: 2014-11-28 (Fri, 28 Nov 2014)
Changed paths:
M htdocs/core/tpl/objectline_create.tpl.php
Log Message:
-----------
Revert "Update objectline_create.tpl.php"
This reverts commit fdac53bfca37b034a8decfb4f0e568cbc93a5b27.
Commit: f6ab7ca0c96f69822f10c5173eb71d062294f6bb
https://github.com/Dolibarr/dolibarr/commit/f6ab7ca0c96f69822f10c5173eb71d062294f6bb
Author: aspangaro <address@hidden>
Date: 2014-12-02 (Tue, 02 Dec 2014)
Changed paths:
M htdocs/admin/ihm.php
Log Message:
-----------
Typo
Commit: 5a05d4a4b8efa4d546e84970b491267f0649585f
https://github.com/Dolibarr/dolibarr/commit/5a05d4a4b8efa4d546e84970b491267f0649585f
Author: aspangaro <address@hidden>
Date: 2014-12-02 (Tue, 02 Dec 2014)
Changed paths:
M htdocs/core/datepicker.php
Log Message:
-----------
Untranslatable token Calendar in datepicker
Commit: 4ff78c09fca2cfd77cdf3e91f9572e5548b3955d
https://github.com/Dolibarr/dolibarr/commit/4ff78c09fca2cfd77cdf3e91f9572e5548b3955d
Author: Laurent Destailleur <address@hidden>
Date: 2014-12-03 (Wed, 03 Dec 2014)
Changed paths:
M htdocs/admin/ihm.php
Log Message:
-----------
Merge pull request #2132 from aspangaro/3.6-patch1
Typo
Commit: e21d6b09544273ea503c4939df892d8b05393d58
https://github.com/Dolibarr/dolibarr/commit/e21d6b09544273ea503c4939df892d8b05393d58
Author: Laurent Destailleur <address@hidden>
Date: 2014-12-03 (Wed, 03 Dec 2014)
Changed paths:
M htdocs/core/datepicker.php
Log Message:
-----------
Merge pull request #2131 from aspangaro/3.6-patch
Untranslatable token Calendar in datepicker
Commit: 9e1b0d1abceeaebd96cfeac2c623dd16cec10eeb
https://github.com/Dolibarr/dolibarr/commit/9e1b0d1abceeaebd96cfeac2c623dd16cec10eeb
Author: Laurent Destailleur <address@hidden>
Date: 2014-12-04 (Thu, 04 Dec 2014)
Changed paths:
M ChangeLog
M build/debian/changelog
M build/exe/doliwamp/doliwamp.iss
M build/makepack-howto.txt
M build/rpm/dolibarr_fedora.spec
M build/rpm/dolibarr_generic.spec
M build/rpm/dolibarr_mandriva.spec
M build/rpm/dolibarr_opensuse.spec
M htdocs/filefunc.inc.php
Log Message:
-----------
Prepare 3.5.6
Commit: a07852c6993a937fa48305c197cefd10d396620c
https://github.com/Dolibarr/dolibarr/commit/a07852c6993a937fa48305c197cefd10d396620c
Author: Laurent Destailleur <address@hidden>
Date: 2014-12-04 (Thu, 04 Dec 2014)
Changed paths:
M ChangeLog
M build/debian/changelog
M build/rpm/dolibarr_fedora.spec
M build/rpm/dolibarr_generic.spec
M build/rpm/dolibarr_mandriva.spec
M build/rpm/dolibarr_opensuse.spec
Log Message:
-----------
Merge remote-tracking branch 'origin/3.5' into 3.6
Conflicts:
build/debian/changelog
build/exe/doliwamp/doliwamp.iss
build/rpm/dolibarr_fedora.spec
build/rpm/dolibarr_generic.spec
build/rpm/dolibarr_mandriva.spec
build/rpm/dolibarr_opensuse.spec
htdocs/filefunc.inc.php
Commit: 8d405a147f12b850db438ae4a137b8098291500e
https://github.com/Dolibarr/dolibarr/commit/8d405a147f12b850db438ae4a137b8098291500e
Author: Laurent Destailleur <address@hidden>
Date: 2014-12-04 (Thu, 04 Dec 2014)
Changed paths:
M ChangeLog
M build/debian/changelog
M build/rpm/dolibarr_fedora.spec
M build/rpm/dolibarr_generic.spec
M build/rpm/dolibarr_mandriva.spec
M build/rpm/dolibarr_opensuse.spec
M htdocs/admin/ihm.php
M htdocs/core/datepicker.php
M htdocs/core/tpl/objectline_create.tpl.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
build/debian/changelog
htdocs/core/tpl/objectline_create.tpl.php
Commit: bff65fc6b479f744c34af7a3020d50c66ae9a731
https://github.com/Dolibarr/dolibarr/commit/bff65fc6b479f744c34af7a3020d50c66ae9a731
Author: Laurent Destailleur <address@hidden>
Date: 2014-12-05 (Fri, 05 Dec 2014)
Changed paths:
M htdocs/comm/card.php
M htdocs/core/class/html.formfile.class.php
Log Message:
-----------
Fix: starting with var with always same color
Commit: a9338a0f9f5c55a42ff70cefca9c014d86b91f25
https://github.com/Dolibarr/dolibarr/commit/a9338a0f9f5c55a42ff70cefca9c014d86b91f25
Author: Laurent Destailleur <address@hidden>
Date: 2014-12-05 (Fri, 05 Dec 2014)
Changed paths:
M htdocs/admin/stock.php
M htdocs/core/class/conf.class.php
M htdocs/core/modules/modProductBatch.class.php
M htdocs/expedition/card.php
M htdocs/expedition/index.php
M htdocs/expedition/shipment.php
M htdocs/langs/en_US/productbatch.lang
M htdocs/langs/fr_FR/productbatch.lang
M htdocs/product/card.php
Log Message:
-----------
Fix: Maxi debug of module productbatch.
Conflicts:
htdocs/core/class/conf.class.php
htdocs/langs/en_US/productbatch.lang
Commit: d3a22c42abbbdc2117dd43c2393a5ec236c7c12c
https://github.com/Dolibarr/dolibarr/commit/d3a22c42abbbdc2117dd43c2393a5ec236c7c12c
Author: Laurent Destailleur <address@hidden>
Date: 2014-12-05 (Fri, 05 Dec 2014)
Changed paths:
M .travis.yml
Log Message:
-----------
Try to solve pb with phpcs
Commit: c36d362248c90319858733e96834bb1fd0b2dfbe
https://github.com/Dolibarr/dolibarr/commit/c36d362248c90319858733e96834bb1fd0b2dfbe
Author: Laurent Destailleur <address@hidden>
Date: 2014-12-05 (Fri, 05 Dec 2014)
Changed paths:
M dev/codesniffer/ruleset.xml
M htdocs/adherents/class/adherentstats.class.php
Log Message:
-----------
Fix: PHPCS 2.0
Commit: 46f9ab15da31f7609459e350786ee5bf93659376
https://github.com/Dolibarr/dolibarr/commit/46f9ab15da31f7609459e350786ee5bf93659376
Author: Laurent Destailleur <address@hidden>
Date: 2014-12-05 (Fri, 05 Dec 2014)
Changed paths:
M dev/codesniffer/ruleset.xml
Log Message:
-----------
Fixed: PHPCS
Commit: 9b5a03fa821b2c28e1e257424f3077468d13effc
https://github.com/Dolibarr/dolibarr/commit/9b5a03fa821b2c28e1e257424f3077468d13effc
Author: Laurent Destailleur <address@hidden>
Date: 2014-12-05 (Fri, 05 Dec 2014)
Changed paths:
M dev/codesniffer/ruleset.xml
Log Message:
-----------
Fix: PHPCS
Commit: efe2719f489e8a1098e857edfac44732fd611e5a
https://github.com/Dolibarr/dolibarr/commit/efe2719f489e8a1098e857edfac44732fd611e5a
Author: Laurent Destailleur <address@hidden>
Date: 2014-12-05 (Fri, 05 Dec 2014)
Changed paths:
M htdocs/core/filemanagerdol/connectors/php/basexml.php
M htdocs/core/filemanagerdol/connectors/php/commands.php
M htdocs/core/filemanagerdol/connectors/php/connector.php
M htdocs/core/filemanagerdol/connectors/php/io.php
M htdocs/core/filemanagerdol/connectors/php/upload.php
Log Message:
-----------
Fix: PHPCS
Commit: 5f353c39d1bbc921e4b616df1ecd11222ddea4ab
https://github.com/Dolibarr/dolibarr/commit/5f353c39d1bbc921e4b616df1ecd11222ddea4ab
Author: Laurent Destailleur <address@hidden>
Date: 2014-12-05 (Fri, 05 Dec 2014)
Changed paths:
M htdocs/core/class/CSMSFile.class.php
M htdocs/core/class/antivir.class.php
M htdocs/core/class/conf.class.php
M htdocs/core/class/dolgeoip.class.php
M htdocs/core/class/dolprintipp.class.php
M htdocs/core/class/google.class.php
M htdocs/core/class/mobiledetect.class.php
M htdocs/core/class/openid.class.php
M htdocs/core/db/mssql.class.php
M htdocs/core/db/mysql.class.php
M htdocs/core/db/mysqli.class.php
M htdocs/core/db/pgsql.class.php
M htdocs/core/db/sqlite.class.php
Log Message:
-----------
Fix: PHPCS
Commit: 344aa4085833ae2091f91c7fd606e6e8e7bec9e2
https://github.com/Dolibarr/dolibarr/commit/344aa4085833ae2091f91c7fd606e6e8e7bec9e2
Author: Laurent Destailleur <address@hidden>
Date: 2014-12-05 (Fri, 05 Dec 2014)
Changed paths:
M .travis.yml
M ChangeLog
M build/debian/changelog
M build/rpm/dolibarr_fedora.spec
M build/rpm/dolibarr_generic.spec
M build/rpm/dolibarr_mandriva.spec
M build/rpm/dolibarr_opensuse.spec
M dev/codesniffer/ruleset.xml
M htdocs/adherents/class/adherentstats.class.php
M htdocs/admin/ihm.php
M htdocs/comm/card.php
M htdocs/core/class/conf.class.php
M htdocs/core/class/html.formfile.class.php
M htdocs/core/datepicker.php
M htdocs/core/tpl/objectline_create.tpl.php
M htdocs/langs/en_US/productbatch.lang
Log Message:
-----------
Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
.travis.yml
dev/codesniffer/ruleset.xml
htdocs/core/class/conf.class.php
htdocs/langs/en_US/productbatch.lang
Compare:
https://github.com/Dolibarr/dolibarr/compare/5755a046c591...344aa4085833