Laurent Destailleur 3142fd3d84 Merge pull request #4899 from aspangaro/4.0-p7 ...

Correct problem of merging with my last commits

2016-03-29 19:41:50 +02:00

..

accountancy

FIX: Accountancy Bank journal Fix some problem with other module

2016-03-25 15:57:46 +01:00

adherents

if we not allowed to edit we don't edit

2016-03-25 18:19:51 +01:00

admin

Merge pull request #4899 from aspangaro/4.0-p7

2016-03-29 19:41:50 +02:00

api

…

asterisk

…

barcode

Revert "Corrected non-static usages of Form::selectarray function"

2016-03-25 15:34:37 +01:00

bookmarks

Revert "Corrected non-static usages of Form::selectarray function"

2016-03-25 15:34:37 +01:00

cashdesk

Code was corrupted with very bad commits. I restore files manually.

2016-03-25 15:53:44 +01:00

categories

Code was corrupted with very bad commits. I restore files manually.

2016-03-25 15:53:44 +01:00

comm

Code was corrupted with very bad commits. I restore files manually.

2016-03-25 15:53:44 +01:00

commande

Code was corrupted with very bad commits. I restore files manually.

2016-03-25 15:53:44 +01:00

compta

Merge pull request #4887 from defrance/patch-111

2016-03-26 09:51:36 +01:00

conf

…

contact

Add contact photo

2016-03-26 18:12:03 +01:00

contrat

Code was corrupted with very bad commits. I restore files manually.

2016-03-25 15:53:44 +01:00

core

NEW Can select language from combo list on page to overwrite a

2016-03-29 18:05:03 +02:00

cron

Lost sort params

2016-03-29 15:31:52 +02:00

custom

…

don

FIX: Donation || Don't show project icon if fk_project is empty

2016-03-25 15:54:09 +01:00

ecm

Code was corrupted with very bad commits. I restore files manually.

2016-03-25 15:53:44 +01:00

expedition

Code was corrupted with very bad commits. I restore files manually.

2016-03-25 15:53:44 +01:00

expensereport

Code was corrupted with very bad commits. I restore files manually.

2016-03-25 15:53:44 +01:00

exports

Code was corrupted with very bad commits. I restore files manually.

2016-03-25 15:53:44 +01:00

externalsite

…

fichinter

Code was corrupted with very bad commits. I restore files manually.

2016-03-25 15:53:44 +01:00

fourn

Uniformise option name

2016-03-25 18:09:42 +01:00

ftp

Code was corrupted with very bad commits. I restore files manually.

2016-03-25 15:53:44 +01:00

holiday

Code was corrupted with very bad commits. I restore files manually.

2016-03-25 15:53:44 +01:00

hrm

Code was corrupted with very bad commits. I restore files manually.

2016-03-25 15:53:44 +01:00

imports

Code was corrupted with very bad commits. I restore files manually.

2016-03-25 15:53:44 +01:00

includes

Merge pull request #4824 from FHenry/dev_jquery

2016-03-25 16:50:26 +01:00

install

Uniformize name of table

2016-03-28 13:58:14 +02:00

langs

Lost sort params

2016-03-29 15:31:52 +02:00

livraison

Code was corrupted with very bad commits. I restore files manually.

2016-03-25 15:53:44 +01:00

loan

Code was corrupted with very bad commits. I restore files manually.

2016-03-25 15:53:44 +01:00

mailmanspip

…

margin

Code was corrupted with very bad commits. I restore files manually.

2016-03-25 15:53:44 +01:00

multicurrency/class

…

opensurvey

Code was corrupted with very bad commits. I restore files manually.

2016-03-25 15:53:44 +01:00

paybox

…

paypal

Code was corrupted with very bad commits. I restore files manually.

2016-03-25 15:53:44 +01:00

printing

…

product

Code was corrupted with very bad commits. I restore files manually.

2016-03-25 15:53:44 +01:00

projet

FIX If thirdparty module not enabled, we must hide thirdparty info.

2016-03-25 19:42:14 +01:00

public

Code was corrupted with very bad commits. I restore files manually.

2016-03-25 15:53:44 +01:00

resource

Merge pull request #4871 from sbechet/develop

2016-03-25 17:57:29 +01:00

societe

Normalize code

2016-03-29 15:41:46 +02:00

supplier_proposal

Code was corrupted with very bad commits. I restore files manually.

2016-03-25 15:53:44 +01:00

support

…

theme

Fix restore old css. New ergonomy best practice rules tends to ask

2016-03-25 18:45:43 +01:00

user

Code was corrupted with very bad commits. I restore files manually.

2016-03-25 15:53:44 +01:00

webservices

…

websites

…

.gitignore

…

cache.manifest

…

disabled.php

…

document.php

…

favicon.ico

…

filefunc.inc.php

Version 3.9 final

2016-03-13 20:17:49 +01:00

index.php

Restore compatibility

2016-03-25 17:15:08 +01:00

main.inc.php

Revert commit that break compatibility of 100% of modules

2016-03-25 15:24:57 +01:00

master.inc.php

…

robots.txt

…

viewimage.php

…