Commits · 6ca90ffdad60c3ae16dff984a13da7f2f8637a30 · Software_Artifact_Infrastructure_Repository / dolibarr

Jan 05, 2015
- Merge pull request #2206 from defrance69/patch-41 · 6ca90ffd
  Laurent Destailleur authored 10 years ago
  
  Update card.php
  6ca90ffd
- Merge pull request #2201 from IonAgorria/project-year-filter · 28fe8061
  Laurent Destailleur authored 10 years ago
  
  Project searching by year
  28fe8061
- Merge pull request #2198 from frederic34/patch-7 · 2ef9b4de
  Laurent Destailleur authored 10 years ago
  
  Typo
  2ef9b4de
- Merge pull request #2197 from frederic34/patch-5 · 6916fffb
  Laurent Destailleur authored 10 years ago
  
  Attribut width not allowed with div or span
  6916fffb
- Merge pull request #2216 from frederic34/patch-10 · 38be767a
  Laurent Destailleur authored 10 years ago
  
  Update cidlookup.php
  38be767a
- Merge pull request #2217 from grandoc/develop · d98f3937
  Laurent Destailleur authored 10 years ago
  
  better translation and typo
  d98f3937
- Merge pull request #2218 from ndrosis/patch-12 · e9a9ade3
  Laurent Destailleur authored 10 years ago
  
  Fix Lang for cashdesk Check Payment Type
  e9a9ade3
Jan 02, 2015
- Fix Lang for cashdesk Check Payment Type · a5572eb2
  Drosis Nikos authored 10 years ago
  
  a5572eb2
Jan 01, 2015
- better translation and typo · 96e6c663
  Philippe Grand authored 10 years ago
  
  96e6c663
Dec 30, 2014
- Fixed: doxygen · baa247ea
  Laurent Destailleur authored 10 years ago
  
  baa247ea
- Enhance look for contacts forms of thirdparties. · d72d056e
  Laurent Destailleur authored 10 years ago
  
  d72d056e
- Update cidlookup.php · ddcd086a
  Frédéric France authored 10 years ago
  
  ddcd086a
- Update cidlookup.php · 15c98ff2
  Frédéric France authored 10 years ago
  
  15c98ff2
Dec 29, 2014

Merge remote-tracking branch 'origin/3.7' into develop · 8abbac56
Laurent Destailleur authored 10 years ago
```
Conflicts:
	htdocs/filefunc.inc.php
	htdocs/main.inc.php
```
8abbac56

Merge remote-tracking branch 'origin/3.6' into 3.7 · 3848daea

Laurent Destailleur authored 10 years ago

Conflicts:
	build/debian/changelog
	build/exe/doliwamp/doliwamp.iss
	build/makepack-dolibarr.pl
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec
	htdocs/filefunc.inc.php
	htdocs/product/stats/facture.php

3848daea

Dec 28, 2014

Update card.php · da0d0838

Charles Benke authored 10 years ago

don't show line with empty duration when FICHINTER_HIDE_EMPTY_DURATION is active

da0d0838

Dec 27, 2014
- Added searching using year · bdd7e9df
  Ion Agorria authored 10 years ago
  
  bdd7e9df
- Merge remote-tracking branch 'upstream/develop' into develop · af15fe7d
  Ion Agorria authored 10 years ago
  
  af15fe7d
- Bug? · 250a995d
  Ion Agorria authored 10 years ago
  
  250a995d
- Typo · 6e69d5c4
  Frédéric France authored 10 years ago
  
  6e69d5c4
- Attribut width not allowed with div or span · dc18759c
  Frédéric France authored 10 years ago
  
  dc18759c
Dec 26, 2014
- Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 · c7937a99
  Laurent Destailleur authored 10 years ago
  
  View commits for tag 3.6.2 3.6.2
  
  c7937a99
- Prepare version 3.6.2 · 953e736a
  Laurent Destailleur authored 10 years ago
  
  953e736a
- Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop · 36f5715e
  Laurent Destailleur authored 10 years ago
  
  36f5715e
- Doxygen · 613d1b38
  Laurent Destailleur authored 10 years ago
  
  613d1b38
- Merge pull request #2195 from marcosgdf/bug-1714 · 41118a17
  Laurent Destailleur authored 10 years ago
  
  Fix [ bug #1714 ] Id "sall" is used twice in different HTML tags
  41118a17
- Merge pull request #2194 from atm-maxime/develop · 29db4d46
  Laurent Destailleur authored 10 years ago
  
  in PDF, no line jump after doc linked ref. Fix bug 1605.
  29db4d46
- Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop · 0496d81b
  Laurent Destailleur authored 10 years ago
  
  0496d81b
- Mark property error as deprecated · 5d80061c
  Laurent Destailleur authored 10 years ago
  
  5d80061c
- Fix [ bug #1714 ] Id "sall" is used twice in different HTML tags · 9f6f9027
  Marcos García de La Fuente authored 10 years ago
  
  9f6f9027
- in PDF, no line jump after doc linked ref. Fix bug 1605. · e7ebb78f
  Maxime Kohlhaas authored 10 years ago
  
  e7ebb78f
- Fix: Bad order field value · a901329a
  Juanjo Menent authored 10 years ago
  
  a901329a
- Fix: Bad order field value · bdf5f572
  Juanjo Menent authored 10 years ago
  
  bdf5f572
- Fix: Bad order field value · d40229e9
  Juanjo Menent authored 10 years ago
  
  d40229e9
Dec 25, 2014
- Fixed: label · d8557d8a
  Laurent Destailleur authored 10 years ago
  
  d8557d8a
- Merge remote-tracking branch 'origin/3.7' into develop · 5ead9949
  Laurent Destailleur authored 10 years ago
  
  Conflicts: ChangeLog
  5ead9949
- Merge remote-tracking branch 'origin/3.6' into 3.7 · 657fc1b9
  Laurent Destailleur authored 10 years ago
  
  Conflicts: ChangeLog htdocs/comm/fiche.php htdocs/core/lib/functions2.lib.php htdocs/fourn/fiche.php htdocs/langs/fr_FR/compta.lang htdocs/projet/element.php htdocs/projet/tasks/contact.php htdocs/projet/tasks/time.php
  657fc1b9
- Fixed: doxygen · 75dbcf4a
  Laurent Destailleur authored 10 years ago
  
  75dbcf4a
- Merge remote-tracking branch 'origin/3.5' into 3.6 · d18770c1
  Laurent Destailleur authored 10 years ago
  
  d18770c1
- Merge pull request #2193 from marcosgdf/bug-1761 · 0e952c67
  Laurent Destailleur authored 10 years ago
  
  Fix: [ bug #1761 ] SQL error when installing 3.7 with PostgreSQL
  0e952c67