Commits · 2fb27b50eca1245fb1aa762098618bf3a69ee354 · Software_Artifact_Infrastructure_Repository / dolibarr

Jun 15, 2015
- Add payment page & class · 2fb27b50
  aspangaro authored 9 years ago
  
  2fb27b50
- Add field and table in database & migration script · a2399405
  aspangaro authored 9 years ago
  
  a2399405
- Merge pull request #2924 from aternatik/api_rest · c56c228c
  Laurent Destailleur authored 9 years ago
  
  Allow modify API key from user card
  c56c228c
- Merge pull request #3052 from aternatik/fix_crlf · cbac2dd6
  Laurent Destailleur authored 9 years ago
  
  Fix crlf
  cbac2dd6
- Merge pull request #3046 from aspangaro/develop-patch30 · e8ac52a1
  Laurent Destailleur authored 9 years ago
  
  Typo "cibility"
  e8ac52a1
- Add test if module enabled before showing API information · 3bf1b60b
  Jean-François Ferry authored 9 years ago
  
  3bf1b60b
- Merge branch 'develop' into api_rest · 190ee35e
  Jean-François Ferry authored 9 years ago
  
  Conflicts: htdocs/user/card.php htdocs/user/class/user.class.php
  190ee35e
- Fix crlf · 745f0f7d
  Jean-François Ferry authored 9 years ago
  
  745f0f7d
Jun 14, 2015
- Wrong address · b6958bb5
  aspangaro authored 9 years ago
  
  b6958bb5
- Merge remote-tracking branch 'Upstream/develop' into develop-30 · 7ddec85f
  aspangaro authored 9 years ago
  
  7ddec85f
- Fix bad objet use. Add label of project into list. · bcd254c1
  Laurent Destailleur authored 9 years ago
  
  bcd254c1
- Typo "inra_vat" · a4acc867
  aspangaro authored 9 years ago
  
  a4acc867
- Typo "cibility" · f973a1fb
  aspangaro authored 9 years ago
  
  f973a1fb
- More info on contact popup · 6263e90d
  Laurent Destailleur authored 9 years ago
  
  6263e90d
- Merge remote-tracking branch 'origin/3.7' into develop · 87e07a30
  Laurent Destailleur authored 9 years ago
  
  Conflicts: ChangeLog htdocs/compta/bank/virement.php htdocs/core/tpl/objectline_create.tpl.php htdocs/product/card.php htdocs/societe/soc.php
  87e07a30
- Merge remote-tracking branch 'origin/3.6' into 3.7 · a7cec180
  Laurent Destailleur authored 9 years ago
  
  Conflicts: htdocs/categories/fiche.php htdocs/core/tpl/objectline_create.tpl.php htdocs/install/upgrade2.php htdocs/product/liste.php
  a7cec180
- Merge remote-tracking branch 'origin/3.5' into 3.6 · f4da53c3
  Laurent Destailleur authored 9 years ago
  
  Conflicts: htdocs/product/liste.php htdocs/product/price.php
  f4da53c3
- Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 · 1007aba6
  Laurent Destailleur authored 9 years ago
  
  1007aba6
- NEW Add exemple of setup for multitail to render dolibarr log files · 6d064e8b
  Laurent Destailleur authored 9 years ago
  
  6d064e8b
- FIX End log must use same level then start log. · 14a8a226
  Laurent Destailleur authored 9 years ago
  
  14a8a226
- Merge branch 'marcosgdf-bug-2835' into 3.5 · 1fc47166
  Laurent Destailleur authored 9 years ago
  
  1fc47166
- Merge branch 'bug-2835' of https://github.com/marcosgdf/dolibarr into · fadc6403
  Laurent Destailleur authored 9 years ago
  
  marcosgdf-bug-2835 Conflicts: ChangeLog
  fadc6403
- Merge branch 'marcosgdf-bug-2837' into 3.5 · c4ff9c32
  Laurent Destailleur authored 9 years ago
  
  c4ff9c32
- Merge branch 'bug-2837' of https://github.com/marcosgdf/dolibarr into · d0b2c492
  Laurent Destailleur authored 9 years ago
  
  marcosgdf-bug-2837 Conflicts: ChangeLog
  d0b2c492
- Merge branch 'marcosgdf-bug-2861' into 3.5 · 288ae5de
  Laurent Destailleur authored 9 years ago
  
  288ae5de
- Merge branch 'bug-2861' of https://github.com/marcosgdf/dolibarr into · e915a54c
  Laurent Destailleur authored 9 years ago
  
  marcosgdf-bug-2861 Conflicts: ChangeLog
  e915a54c
- Merge branch 'marcosgdf-bug-2900' into 3.7 · 08a68f2f
  Laurent Destailleur authored 9 years ago
  
  08a68f2f
- Merge branch 'bug-2900' of https://github.com/marcosgdf/dolibarr into · 892ff3b0
  Laurent Destailleur authored 9 years ago
  
  marcosgdf-bug-2900 Conflicts: ChangeLog
  892ff3b0
- Merge pull request #3044 from hregis/3.5_bug · f8d2e938
  Laurent Destailleur authored 9 years ago
  
  Fix: select date problem with mobile device (#3039)
  f8d2e938
- Fix phpcs · b42f9a67
  Laurent Destailleur authored 9 years ago
  
  b42f9a67
- Fix: select date problem with mobile device (#3039) · b96ed082
  Regis Houssin authored 9 years ago
  
  b96ed082
Jun 13, 2015
- Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop · ec533012
  Laurent Destailleur authored 9 years ago
  
  ec533012
- Merge pull request #3035 from marcosgdf/bug-2786 · fdced80a
  Laurent Destailleur authored 9 years ago
  
  FIX #2786 Objectline_add template shows "0" for non-vat suppliers
  fdced80a
- Merge pull request #3036 from hregis/3.7_bug · aecc5d27
  Laurent Destailleur authored 9 years ago
  
  Fix: broken feature: barcode search #3019
  aecc5d27
- Merge pull request #3022 from marcosgdf/bug-2976 · a9bf38b8
  Laurent Destailleur authored 9 years ago
  
  FIX Close bug #2976: "Report" tab is the current tab but it is not marked as selected by the UI
  a9bf38b8
- Merge pull request #3013 from GPCsolutions/dolibarr-2899 · c5dd3f44
  Laurent Destailleur authored 9 years ago
  
  Fix #2899: Reintroduce missing field
  c5dd3f44
- Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop · 03d1b4ba
  Laurent Destailleur authored 9 years ago
  
  03d1b4ba
- Merge pull request #3037 from marcosgdf/bug-1852 · 4dbb3789
  Laurent Destailleur authored 9 years ago
  
  Fix [ bug 1852 ] JS error when editing a customer order line
  4dbb3789
- Merge pull request #3026 from marcosgdf/bug-2891 · f67af6da
  Laurent Destailleur authored 9 years ago
  
  FIX Close bug #2891 Category hooks do not work
  f67af6da
- Missing nohover css · d5c26af5
  Laurent Destailleur authored 9 years ago
  
  d5c26af5