[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 505486: Resolve conflicts
From: |
Laurent Destailleur |
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 505486: Resolve conflicts |
Date: |
Sun, 07 Apr 2013 13:54:57 -0700 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: 50548601ce74fdbf09a20f477d7d81d46939a09a
https://github.com/Dolibarr/dolibarr/commit/50548601ce74fdbf09a20f477d7d81d46939a09a
Author: simnandez <address@hidden>
Date: 2013-04-05 (Fri, 05 Apr 2013)
Changed paths:
M htdocs/fichinter/fiche.php
M htdocs/install/mysql/data/llx_c_action_trigger.sql
M htdocs/install/mysql/migration/3.3.0-3.4.0.sql
M htdocs/langs/ca_ES/other.lang
M htdocs/langs/en_US/other.lang
M htdocs/langs/es_ES/other.lang
M htdocs/langs/fr_FR/other.lang
Log Message:
-----------
Resolve conflicts
Commit: ec7a6433f6191a92470d5c26093bc11a88400cee
https://github.com/Dolibarr/dolibarr/commit/ec7a6433f6191a92470d5c26093bc11a88400cee
Author: simnandez <address@hidden>
Date: 2013-04-05 (Fri, 05 Apr 2013)
Changed paths:
M ChangeLog
Log Message:
-----------
Update Changelog
Commit: 7b70fc4bf39c818f8f8103cbc48f5f9f5fd9652a
https://github.com/Dolibarr/dolibarr/commit/7b70fc4bf39c818f8f8103cbc48f5f9f5fd9652a
Author: simnandez <address@hidden>
Date: 2013-04-07 (Sun, 07 Apr 2013)
Changed paths:
M ChangeLog
M htdocs/adherents/admin/public.php
M htdocs/comm/action/class/actioncomm.class.php
M htdocs/comm/action/fiche.php
M htdocs/contact/class/contact.class.php
M htdocs/core/class/html.form.class.php
M htdocs/install/mysql/data/llx_00_c_pays.sql
M htdocs/install/mysql/data/llx_c_tva.sql
M htdocs/install/mysql/migration/3.3.0-3.4.0.sql
M htdocs/install/mysql/tables/llx_actioncomm.sql
M htdocs/langs/en_US/members.lang
A htdocs/langs/es_PE/admin.lang
A htdocs/langs/es_PE/bills.lang
A htdocs/langs/es_PE/companies.lang
A htdocs/langs/es_PE/compta.lang
A htdocs/langs/es_PE/main.lang
A htdocs/langs/es_PE/propal.lang
M htdocs/langs/fr_FR/members.lang
M htdocs/public/paybox/paymentko.php
M htdocs/public/paybox/paymentok.php
M htdocs/public/paypal/paymentko.php
M htdocs/public/paypal/paymentok.php
M htdocs/societe/class/societe.class.php
Log Message:
-----------
Merge branch 'develop' of address@hidden:Dolibarr/dolibarr.git into
develop
Conflicts:
htdocs/install/mysql/migration/3.3.0-3.4.0.sql
Commit: 482d30ca1d11d5a52c2a64b279748717d92cc905
https://github.com/Dolibarr/dolibarr/commit/482d30ca1d11d5a52c2a64b279748717d92cc905
Author: simnandez <address@hidden>
Date: 2013-04-07 (Sun, 07 Apr 2013)
Changed paths:
M ChangeLog
Log Message:
-----------
Update ChangeLog
Commit: 9e8c3a1b1eb2ecf0ea74fd4d766680fa509416e9
https://github.com/Dolibarr/dolibarr/commit/9e8c3a1b1eb2ecf0ea74fd4d766680fa509416e9
Author: simnandez <address@hidden>
Date: 2013-04-07 (Sun, 07 Apr 2013)
Changed paths:
M htdocs/install/mysql/migration/3.3.0-3.4.0.sql
Log Message:
-----------
Updates
Commit: 44bfc1db4af5fb6a75380f68b181915b7178cb48
https://github.com/Dolibarr/dolibarr/commit/44bfc1db4af5fb6a75380f68b181915b7178cb48
Author: simnandez <address@hidden>
Date: 2013-04-07 (Sun, 07 Apr 2013)
Changed paths:
M htdocs/compta/bank/treso.php
M htdocs/core/boxes/box_factures_fourn.php
M htdocs/fourn/facture/fiche.php
M htdocs/install/mysql/migration/3.3.0-3.4.0.sql
M htdocs/install/upgrade.php
M htdocs/webservices/server_supplier_invoice.php
Log Message:
-----------
Merge branch 'develop' of address@hidden:Dolibarr/dolibarr.git into
develop
Conflicts:
htdocs/install/mysql/migration/3.3.0-3.4.0.sql
Commit: bde030dfae7f965fa218cc8b36520763738d9e30
https://github.com/Dolibarr/dolibarr/commit/bde030dfae7f965fa218cc8b36520763738d9e30
Author: simnandez <address@hidden>
Date: 2013-04-07 (Sun, 07 Apr 2013)
Changed paths:
M ChangeLog
Log Message:
-----------
Spelling fix
Commit: 826d8a329d0967de63a139fe0e63b793de3192f4
https://github.com/Dolibarr/dolibarr/commit/826d8a329d0967de63a139fe0e63b793de3192f4
Author: Laurent Destailleur <address@hidden>
Date: 2013-04-07 (Sun, 07 Apr 2013)
Changed paths:
M ChangeLog
M htdocs/fichinter/fiche.php
M htdocs/install/mysql/data/llx_c_action_trigger.sql
M htdocs/install/mysql/migration/3.3.0-3.4.0.sql
M htdocs/langs/ca_ES/other.lang
M htdocs/langs/en_US/other.lang
M htdocs/langs/es_ES/other.lang
M htdocs/langs/fr_FR/other.lang
Log Message:
-----------
Merge pull request #802 from simnandez/develop
Fix: Try to showing the events related to a intervention
Compare:
https://github.com/Dolibarr/dolibarr/compare/12cae7ebdf0f...826d8a329d09
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Dolibarr-git] [Dolibarr/dolibarr] 505486: Resolve conflicts,
Laurent Destailleur <=