lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
35,010 Commits 43 Branches 150 Tags 886 MiB
cdb4e7dbf4
Commit Graph

39 Commits

Author SHA1 Message Date
Laurent Destailleur
d11cee399a Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	COPYRIGHT
	htdocs/core/tpl/freeproductline_create.tpl.php
	htdocs/core/tpl/predefinedproductline_create.tpl.php
	htdocs/install/mysql/tables/llx_c_availability.sql
 2013-01-16 15:45:17 +01:00
Laurent Destailleur
8d206fdfb0 Prepare move to other licence. For the moment all answers for licence 
upgrade were not yet received. So we prepare for GPL by uniformizing
licence text keys to GPL-3+. Will move later to AGPL if all answers are
positive.
 2013-01-16 15:36:08 +01:00
Laurent Destailleur
29e6d01e51 Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/core/tpl/freeproductline_create.tpl.php
	htdocs/core/tpl/predefinedproductline_create.tpl.php
 2013-01-13 19:33:54 +01:00
Laurent Destailleur
eb078e6c8a Fix: Missing css entries. Solve look of ecm module. 2013-01-10 16:06:13 +01:00
Regis Houssin
9812c91aff Fix: wrong EOL !!!!!!! 2013-01-10 08:27:12 +01:00
Laurent Destailleur
5aeec9eab2 Fix: line into theme 2013-01-08 16:46:06 +01:00
Laurent Destailleur
47482202ac Fix: Missing picto 2013-01-08 10:28:22 +01:00
Laurent Destailleur
eca1e3a7e1 Look: Minor fix in themes 2013-01-07 17:57:39 +01:00
Regis Houssin
b838895db9 Fix: change for a neutral email 2012-12-30 15:13:49 +01:00
Laurent Destailleur
3fb60304db Fix: Css for ecm module 2012-12-30 12:02:54 +01:00
simnandez
a209d5cd55 Fix: Box issues 2012-12-26 12:01:34 +01:00
simnandez
a10cdcc72e GUI: Amarok disabled buttons more accurated 2012-12-20 17:16:32 +01:00
Laurent Destailleur
4ad38f91fa Merge pull request #544 from simnandez/develop 
Qual: Delete unused files of the amarok theme
 2012-12-16 10:28:03 -08:00
Regis Houssin
65090c582d Fix: checkstyle 2012-12-15 11:39:47 +01:00
simnandez
a528c7786c Qual: Delete unused files of the amarok theme 2012-12-14 23:21:42 +01:00
Laurent Destailleur
5a99076cf5 Fix: Clean amarok style. Removed hard coded length of close cells. 2012-12-14 18:35:50 +01:00
simnandez
e1a8368c28 GUI: Amarok buttons black label are most visible 2012-12-14 17:10:39 +01:00
simnandez
d934aa12a9 GUI: Amarok improved login screen 2012-12-14 17:05:56 +01:00
simnandez
c05ed2a146 GUI: Update amarok theme to work into 3.3 2012-12-14 13:01:57 +01:00
Laurent Destailleur
3dd9d20d53 Add alternative picto for rendez-vous. 2012-11-14 00:59:52 +01:00
Laurent Destailleur
9bbe0e6b1c Qual: Mutuamize codeby using tpl. 
New: Support unique field for extrafields
 2012-09-22 20:27:06 +02:00
Laurent Destailleur
246f3b5bb8 New: Add the holiday module (provided by teclib with permission to add 
it by default).
 2012-09-05 03:26:57 +02:00
Laurent Destailleur
2bf933fbab Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2012-09-04 17:48:33 +02:00
Laurent Destailleur
dcc6b5e2c1 Qual: Removed deprecated files 2012-09-04 17:44:23 +02:00
Regis Houssin
616ee24683 Fix: try to use another popup jquery plugin gpl compatible 2012-09-03 11:45:01 +02:00
Marcos García
ea119c45a2 Lower-cased all <?PHP 2012-08-22 23:27:53 +02:00
Marcos García
706d79986c Removed parenthesis from all require_once and replaced with single quotes 2012-08-22 23:11:24 +02:00
Raphaël Doursenaud
d34c4518d2 Removed BOM from UTF-8 files 
Fix: convert line delimiters (regis)

Conflicts:
	htdocs/core/filemanagerdol/browser/default/js/common.js
	htdocs/core/filemanagerdol/browser/default/js/fckxml.js
 2012-07-28 19:04:50 +02:00
Regis Houssin
fb23364511 Fix: uniformize code 2012-07-23 16:10:54 +02:00
Regis Houssin
3fe8b5bc58 Change-Id: Ia9f609c8a1264d245ff5074b981305f7d1792aef 2012-07-23 11:01:52 +02:00
Regis Houssin
fafd79a0f8 Fix: uniformize code (in progress) 2012-07-20 09:57:50 +02:00
Regis Houssin
65e0f18449 Fix: view image object 2012-07-08 15:50:27 +02:00
Regis Houssin
1755c34208 Fix: add ckeditor create div option with dolibarr_mailings toolbar 2012-06-27 16:36:25 +02:00
Regis Houssin
4f67488bd3 New: add possibility to hide unauthorized buttons 2012-06-14 20:11:43 +02:00
Laurent Destailleur
6ed75123d8 Fix: checkstyle 2012-05-09 00:28:02 +02:00
Laurent Destailleur
fecab54f43 Checkstyle 2012-04-30 15:17:50 +02:00
Laurent Destailleur
8b953026fd Look: minor change 2012-04-30 09:57:57 +02:00
Laurent Destailleur
658911b8c9 Qual: Move embeded style into css files. Add more styles. 2012-04-18 14:27:31 +02:00
Regis Houssin
a1ac69f614 New: add Amarok theme (experimental) 2012-04-17 11:50:25 +02:00