Commits · 3825b89ead4514a1498ddc8f3e980b1e158806d4 · Software_Artifact_Infrastructure_Repository / dolibarr

Apr 18, 2015
- Change companies and product title picto · 3825b89e
  Jean-François Ferry authored 9 years ago
  
  3825b89e
- Change generic and setup image title · c905f884
  Jean-François Ferry authored 9 years ago
  
  c905f884
- Merge pull request #2663 from FHenry/develop · 5c80d46b
  Laurent Destailleur authored 9 years ago
  
  fix bug #2652
  5c80d46b
- typo · 11e1d031
  Florian Henry authored 9 years ago
  
  11e1d031
- fix bug #2652 · f2018b79
  Florian Henry authored 9 years ago
  
  f2018b79
- Merge pull request #2662 from marcosgdf/fk_soc · 065711df
  Juanjo Menent authored 9 years ago
  
  Fixed problem with u.fk_soc in PR #2654
  065711df
- Fixed problem with last PR #2654 · 2a8cf5f8
  Marcos García de La Fuente authored 9 years ago
  
  2a8cf5f8
- Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop · adad1f4a
  Florian Henry authored 9 years ago
  
  adad1f4a
- Merge pull request #2661 from Diciannove/langtool · 21a68b2c
  Juanjo Menent authored 9 years ago
  
  fixes issue #2584
  21a68b2c
- issue #2584 - added a counter · 38cfbe48
  Tommaso Basilici authored 9 years ago
  
  38cfbe48
- Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop · c678a31d
  Florian Henry authored 9 years ago
  
  c678a31d
- Merge pull request #2658 from bafbes/develop · 70de42f5
  Laurent Destailleur authored 9 years ago
  
  Register contributor information for last pull request
  70de42f5
- Merge pull request #2659 from FHenry/develop · 80e1ca73
  Laurent Destailleur authored 9 years ago
  
  fix : #2640
  80e1ca73
- Merge branch 'langtool' of https://github.com/Diciannove/dolibarr into langtool · b73c36c8
  Tommaso Basilici authored 9 years ago
  
  b73c36c8
- Merge pull request #2660 from marcosgdf/develop · 98e22845
  Juanjo Menent authored 9 years ago
  
  Close #2657 Bug: CRITICAL Dolibarr is broken
  98e22845
- issue #2584 - output on a table + search for unused strings · 7cec7879
  Tommaso Basilici authored 9 years ago
  
  7cec7879
- Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop · dc1d41d5
  Florian Henry authored 9 years ago
  
  dc1d41d5
- Revert "Sanitize for security." · a8f60a5c
  Marcos García de La Fuente authored 9 years ago
  
  This reverts commit 1598a5d3.
  a8f60a5c
- fix : #2640 · 92494cd1
  Florian Henry authored 9 years ago
  
  92494cd1
- Update filefunc.inc.php · f4fe71a7
  Baffir Abbes authored 9 years ago
  
  f4fe71a7
- Merge branch 'fr-2613' of https://github.com/marcosgdf/dolibarr into develop · 25a99664
  Laurent Destailleur authored 9 years ago
  
  Conflicts: htdocs/install/mysql/migration/3.7.0-3.8.0.sql
  25a99664
- Copyright · e2e6049c
  Marcos García de La Fuente authored 9 years ago
  
  e2e6049c
- git push origin developMerge branch 'marcosgdf-fr-2613' into develop · d22a4034
  Laurent Destailleur authored 9 years ago
  
  d22a4034
- Merge branch 'fr-2613' of https://github.com/marcosgdf/dolibarr into marcosgdf-fr-2613 · 9dd73de9
  Laurent Destailleur authored 9 years ago
  
  Conflicts: htdocs/install/mysql/migration/3.7.0-3.8.0.sql
  9dd73de9
- Sanitize for security. · 1598a5d3
  Laurent Destailleur authored 9 years ago
  
  1598a5d3
- Merge branch 'develop' into fr-2613 · c07e26dc
  Marcos García de La Fuente authored 9 years ago
  
  Conflicts: htdocs/install/mysql/migration/3.7.0-3.8.0.sql
  c07e26dc
- NEW: Feature request: A page to merge two thirdparties into one #2613 · dc790ff5
  Marcos García de La Fuente authored 9 years ago
  
  dc790ff5
- Merge pull request #2633 from bafbes/develop · 21a6fd1c
  Laurent Destailleur authored 9 years ago
  
  NEW : dev feature : replace conf filename with "conf" parameter on url b...
  21a6fd1c
- git push origin developMerge branch 'fappels-develop' into develop · f80674f1
  Laurent Destailleur authored 9 years ago
  
  f80674f1
- Merge branch 'develop' of https://github.com/fappels/dolibarr into fappels-develop · 8be83cd0
  Laurent Destailleur authored 9 years ago
  
  Conflicts: htdocs/langs/en_US/sendings.lang
  8be83cd0
- Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop · b3fc8d29
  Laurent Destailleur authored 9 years ago
  
  Conflicts: htdocs/langs/en_US/products.lang
  b3fc8d29
- git push origin developMerge branch 'Diciannove-langtool' into develop · 8140e331
  Laurent Destailleur authored 9 years ago
  
  8140e331
- Merge branch 'langtool' of https://github.com/Diciannove/dolibarr into Diciannove-langtool · fcbb4a53
  Laurent Destailleur authored 9 years ago
  
  Conflicts: htdocs/langs/en_US/main.lang htdocs/langs/en_US/orders.lang htdocs/langs/en_US/stocks.lang
  fcbb4a53
- Merge pull request #2650 from FHenry/dev_pdfpropalmergeproductpdf · f7b2b00e
  Laurent Destailleur authored 9 years ago
  
  NEW : Propal merge PDF product attached files (on option)
  f7b2b00e
- Merge pull request #2647 from aternatik/fix_css · cb0e45d5
  Laurent Destailleur authored 9 years ago
  
  Fix : css properties for lists and input fields
  cb0e45d5
- Merge pull request #2649 from atm-maxime/develop · 6e136616
  Laurent Destailleur authored 9 years ago
  
  Alert when oustanding amount excedeed
  6e136616
- Merge pull request #2651 from aternatik/fix_email_template · 6b934001
  Laurent Destailleur authored 9 years ago
  
  Fix : bad usage of empty function with GETPOST
  6b934001
- Typo · ecf1fbe5
  Maxime Kohlhaas authored 9 years ago
  
  ecf1fbe5
- Fix : bad usage of empty function with GETPOST · bee5af4d
  Jean-François Ferry authored 9 years ago
  
  bee5af4d
- Fix : unit price without tax is now subprice (not pu_ht) · c3bcda74
  Maxime Kohlhaas authored 9 years ago
  
  c3bcda74