Commit Graph

40390 Commits

Author SHA1 Message Date
Laurent Destailleur
7eaffc186b Update demo with new structure 2013-10-22 00:36:53 +02:00
Laurent Destailleur
14717e6279 Comment 2013-10-22 00:30:55 +02:00
Peter Fontaine
77f7bd62cd Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2013-10-21 15:18:59 +02:00
Laurent Destailleur
ec576c91cc Enhance prototype for tables 2013-10-21 13:43:31 +02:00
BENKE Charles
15b1507c84 Update html.formfile.class.php
Add subfolders feature in GED managment
2013-10-20 20:58:38 +02:00
Laurent Destailleur
f18585abbf Merge pull request #1261 from open-minds/develop
Fix misspelling in french projects language file
2013-10-20 06:21:25 -07:00
Laurent Léonard
4f39243eab Fix misspelling in french projects language file 2013-10-20 14:58:10 +02:00
Laurent Destailleur
3a46348988 Fix: checkstyle 2013-10-20 14:31:08 +02:00
Laurent Destailleur
9ad9571f86 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-10-20 14:29:27 +02:00
Laurent Destailleur
7bb642f272 Merge pull request #1259 from FHenry/develop
Add project clone option : copy project files, copy task files
2013-10-20 05:29:10 -07:00
Laurent Destailleur
315e2e4c13 Merge branch 'patch-14' of https://github.com/defrance69/dolibarr into
defrance69-patch-14

Conflicts:
	htdocs/install/mysql/migration/3.4.0-3.5.0.sql
2013-10-20 14:12:56 +02:00
Laurent Destailleur
cd085b3ecc Merge pull request #1256 from jfefe/cron
Fix : use GETPOST function into CRON module
2013-10-20 05:06:12 -07:00
Laurent Destailleur
305ca25267 New: Add menu entry to page massstockmove.php 2013-10-20 14:05:51 +02:00
Laurent Destailleur
8373982837 Merge pull request #1260 from FHenry/3.4
restrict acces to commercial update if user can only see his own
2013-10-20 04:14:01 -07:00
Laurent Destailleur
96658999f5 Merge pull request #1258 from grandoc/3.4
fix wrong call name
2013-10-20 04:10:09 -07:00
Florian Henry
e1dbee651e restrict acces to commercialupdate if user can only see his own
thirdparty
2013-10-19 22:08:42 +02:00
Peter Fontaine
1080dda492 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2013-10-19 19:59:38 +02:00
Laurent Destailleur
1075806282 Sync from transifex 2013-10-19 18:26:14 +02:00
Florian Henry
395bc5a800 Add french translation 2013-10-19 17:53:27 +02:00
Florian Henry
f63bc3d9e3 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-10-19 17:51:29 +02:00
Florian Henry
9555cb35f0 Add project clone option : copy project files, copy task files 2013-10-19 17:51:21 +02:00
Laurent Destailleur
8e2cd3d45b Fix: font file for chinese 2013-10-19 17:17:07 +02:00
Peter Fontaine
270499838d Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2013-10-19 16:11:07 +02:00
Laurent Destailleur
586062a911 Fix: syntax error 2013-10-19 15:34:18 +02:00
Laurent Destailleur
c02a0cbb95 Conflict betwen ' and " 2013-10-19 15:31:08 +02:00
Laurent Destailleur
0707409684 Another syntax error 2013-10-19 15:28:58 +02:00
Laurent Destailleur
9e0a779989 Syntax error 2013-10-19 15:27:09 +02:00
Laurent Destailleur
d7020c6f50 Build php ini according to PHP version 2013-10-19 15:25:12 +02:00
Laurent Destailleur
c244992abd Add php version info into travis output 2013-10-19 15:22:51 +02:00
Laurent Destailleur
9c3e794f24 Merge remote-tracking branch 'origin/3.4' into develop 2013-10-19 15:05:04 +02:00
Laurent Destailleur
db9a329c1d Remove PHP 5.2 from travis. Travis not ready for this. 2013-10-19 15:04:54 +02:00
Laurent Destailleur
24cd2d2b85 Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-10-19 14:59:46 +02:00
Laurent Destailleur
4f39632937 Add more PHP versions into travis CI 2013-10-19 14:39:12 +02:00
Laurent Destailleur
f87afaac10 Suggest a better page name 2013-10-19 14:38:49 +02:00
Laurent Destailleur
8e42a6fd15 Avoid email when travis is ok 2013-10-19 14:11:56 +02:00
Grand Philippe
c773f21c2c fix wrong call name 2013-10-19 12:50:18 +02:00
Laurent Destailleur
73263d4328 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-10-19 00:34:00 +02:00
Laurent Destailleur
af521ec070 Trans: Missing translation for accountancy module 2013-10-19 00:33:37 +02:00
Laurent Destailleur
16b2741834 New: Finished page to make mass stock movement 2013-10-18 19:23:27 +02:00
Peter Fontaine
200ec5ab06 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2013-10-18 18:52:28 +02:00
Laurent Destailleur
cb510f7c46 Fix: Travis 2013-10-18 18:51:53 +02:00
Laurent Destailleur
c9012b498f Fix: Code comment and phpunit test 2013-10-18 17:34:12 +02:00
Laurent Destailleur
12366410e5 Merge remote-tracking branch 'origin/3.4' into develop 2013-10-18 17:30:14 +02:00
Laurent Destailleur
4e637d3121 Fix: Sanitizing PHP_SELF 2013-10-18 17:27:17 +02:00
Laurent Destailleur
df930d08b2 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-10-18 14:03:35 +02:00
Laurent Destailleur
2f1340a6c6 Merge remote-tracking branch 'origin/3.4' into develop
Conflicts:
	htdocs/societe/class/societe.class.php
2013-10-18 12:19:12 +02:00
Laurent Destailleur
5e35731693 Add debug info to find a bug 2013-10-18 11:41:37 +02:00
Laurent Destailleur
d9106b6e85 Add debug info to find a bug 2013-10-18 11:19:32 +02:00
Laurent Destailleur
33b4c9fad7 Fix: Bug into xcal decode 2013-10-18 10:38:59 +02:00
Laurent Destailleur
f0ee706055 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-10-18 10:17:31 +02:00