Commits · 33045668cd926635caee8c028f3568b29298186d · Software_Artifact_Infrastructure_Repository / dolibarr

Dec 25, 2014
- Merge pull request #2168 from frederic34/patch-5 · 33045668
  Laurent Destailleur authored 10 years ago
  
  Translation error
  33045668
Dec 24, 2014
- Merge pull request #2169 from marcosgdf/bug-1736 · c4a6377a
  Juanjo Menent authored 10 years ago
  
  Fix: [ bug #1736 ] Failing supplier Elephant numeration module with some masks
  c4a6377a
Dec 22, 2014
- Fix merge changelog · 56eddead
  Laurent Destailleur authored 10 years ago
  
  56eddead
- Fix: [ bug #1736 ] Failing supplier Elephant numeration module with some masks · 46fe2c67
  Marcos García de La Fuente authored 10 years ago
  
  46fe2c67
- Translation error · 748bef61
  Frédéric France authored 10 years ago
  
  748bef61
Dec 20, 2014
- Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 · 321fd47f
  Laurent Destailleur authored 10 years ago
  
  321fd47f
- Fixed: Translation · 219cd0f8
  Laurent Destailleur authored 10 years ago
  
  219cd0f8
- Merge pull request #2162 from FHenry/3.6 · 0628f76a
  Laurent Destailleur authored 10 years ago
  
  Update odt2pdf.sh
  0628f76a
Dec 19, 2014
- PHPCS · beaec59a
  Laurent Destailleur authored 10 years ago
  
  beaec59a
- Update codesniffer to remove travis errors. · 11368e48
  Laurent Destailleur authored 10 years ago
  
  11368e48
- Update codesniffer to remove travis errors. · 789d588f
  Laurent Destailleur authored 10 years ago
  
  789d588f
- Merge remote-tracking branch 'origin/3.5' into 3.6 · 0bb431c4
  Laurent Destailleur authored 10 years ago
  
  Conflicts: dev/codesniffer/ruleset.xml
  0bb431c4
- Update codesniffer to remove travis errors. · 47cab903
  Laurent Destailleur authored 10 years ago
  
  47cab903
- Update odt2pdf.sh · 578c4ca3
  Florian Henry authored 10 years ago
  
  Fix odt2pdf.sh
  578c4ca3
Dec 18, 2014
- Update phpcs · 3debf56c
  Laurent Destailleur authored 10 years ago
  
  3debf56c
- Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 · 3c24c1b1
  Laurent Destailleur authored 10 years ago
  
  3c24c1b1
- Update phpcs file · b1c4d32f
  Laurent Destailleur authored 10 years ago
  
  b1c4d32f
- Merge pull request #2160 from FHenry/3.6 · 7ad15538
  Laurent Destailleur authored 10 years ago
  
  [ bug #1749 ] Undefined $mailchimp
  7ad15538
- Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 · 6f432063
  Florian Henry authored 10 years ago
  
  6f432063
- [ bug #1749 ] Undefined $mailchimp · c209d168
  Florian Henry authored 10 years ago
  
  c209d168
- Merge remote-tracking branch 'origin/3.5' into 3.6 · 2c01a467
  Laurent Destailleur authored 10 years ago
  
  Conflicts: htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php htdocs/paypal/lib/paypal.lib.php
  2c01a467
- Merge pull request #2149 from altatof/3.5 · f5da9b5e
  Laurent Destailleur authored 10 years ago
  
  FIX: dont put a mess with date and datetime extrafield value if already in right format
  f5da9b5e
- Merge pull request #2148 from altatof/fixhook · 6728ad3c
  Laurent Destailleur authored 10 years ago
  
  FIX: hook insertExtraFields must return a returnvalue (0,1,-1)
  6728ad3c
- Merge pull request #2158 from altatof/fix_fichinter_pdf_pagebreak · 4887f511
  Laurent Destailleur authored 10 years ago
  
  FIX: pagebreak on fichinter like in other documents
  4887f511
- Merge pull request #2157 from altatof/fix_margin_jalon · 61545638
  Laurent Destailleur authored 10 years ago
  
  FIX: avoid milestones in margin calculation
  61545638
Dec 16, 2014
- FIX: pagebreak on fichinter like in other documents · c9f69279
  Christophe Battarel authored 10 years ago
  
  c9f69279
Dec 15, 2014
- FIX: avoid milestones in margin calculation · a4a1a991
  Christophe Battarel authored 10 years ago
  
  a4a1a991
Dec 12, 2014
- FIX: dont put a mess with date and datetime extrafield value if already · 27b47a4f
  Christophe Battarel authored 10 years ago
  
  in right format (the bug was in propale/order/invoice extrafields, mainly visible with 2 datetime extrafields)
  27b47a4f
- FIX: hook insertExtraFields must return a returnvalue (0,1,-1) · a1bba472
  Christophe Battarel authored 10 years ago
  
  a1bba472
Dec 10, 2014
- Merge pull request #2138 from aspangaro/3.5-patch1 · fbb25eae
  Laurent Destailleur authored 10 years ago
  
  Correct in activity box
  fbb25eae
Dec 08, 2014
- Untranslatable token in activity box · 81dc1415
  aspangaro authored 10 years ago
  
  81dc1415
- Correct link in activity box · 666e66e7
  aspangaro authored 10 years ago
  
  666e66e7
- Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 · b11ac14c
  Laurent Destailleur authored 10 years ago
  
  b11ac14c
- Fix: Paypal link were broken dur to SSL v3 closed. · 14610728
  Laurent Destailleur authored 10 years ago
  
  14610728
Dec 07, 2014
- Merge pull request #2133 from aspangaro/3.6-patch2 · ae3c83b7
  Laurent Destailleur authored 10 years ago
  
  #1725 Missing table cells in services list header
  ae3c83b7
- Merge pull request #2135 from FHenry/3.5 · 293726c5
  Laurent Destailleur authored 10 years ago
  
  3.5
  293726c5
Dec 05, 2014
- Fix [ bug #1740 ] Clone project make task date crazy · bd8b393d
  Florian Henry authored 10 years ago
  
  bd8b393d
- Fix bug n sellist extrafield filtered · aaf2cca4
  Florian Henry authored 10 years ago
  
  aaf2cca4
Dec 04, 2014

Merge remote-tracking branch 'origin/3.5' into 3.6 · a07852c6

Laurent Destailleur authored 10 years ago

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

a07852c6

Prepare 3.5.6 · 9e1b0d1a
Laurent Destailleur authored 10 years ago

View commits for tag 3.5.6 3.5.6

9e1b0d1a