Commit Graph

58590 Commits

Author SHA1 Message Date
Laurent Destailleur
67cf3a1e67 Merge pull request #6625 from gschratzer/Patch310317_rewritemail
FIX: Issue #6549 don't rewrite email and password
2017-03-31 18:44:02 +02:00
Laurent Destailleur
93687997c9 Work on 6.0 look and feel 2017-03-31 18:40:53 +02:00
Laurent Destailleur
0bf6356d9c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-03-31 18:33:29 +02:00
Laurent Destailleur
7056edf509 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-03-31 18:32:36 +02:00
Laurent Destailleur
6e0918dded Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-03-31 18:31:54 +02:00
Laurent Destailleur
93b5801592 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0 2017-03-31 18:30:56 +02:00
Laurent Destailleur
911d5832c6 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 2017-03-31 18:30:41 +02:00
Laurent Destailleur
b44143d24d Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9 2017-03-31 18:29:15 +02:00
Laurent Destailleur
b970596310 Merge pull request #6481 from Hugome/fix-agenda-merge
FIX : Agenda getCalendarEvents hook
2017-03-31 18:26:45 +02:00
Laurent Destailleur
88017f5707 Merge pull request #6369 from atm-florian/dev_replace_extrefield_checkboxByMultiSelect
NEW : change render extrafields checkbox list for multiselectarray
2017-03-31 18:12:58 +02:00
Laurent Destailleur
b6a8507f57 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-03-31 18:11:18 +02:00
Laurent Destailleur
2903518fb1 Fix bad links 2017-03-31 18:11:01 +02:00
Laurent Destailleur
6d81f29835 Merge pull request #6578 from inoveaconseil/patch-1
Update pdf.php
2017-03-31 18:07:03 +02:00
Laurent Destailleur
9d193924bd Fix bad constants 2017-03-31 18:05:20 +02:00
Laurent Destailleur
ee86b7bcef Avoid javascript warning when in stable mode. 2017-03-31 17:51:10 +02:00
Laurent Destailleur
43e59772e4 Merge pull request #6606 from fappels/develop_add_jqmigrate
Develop add jQuery-migrate
2017-03-31 17:48:01 +02:00
Laurent Destailleur
cab944a1a1 Merge pull request #6602 from aspangaro/6.0-multijournal
New : [FP17] Accounting multi-journals
2017-03-31 17:45:10 +02:00
Laurent Destailleur
536afb44c7 Merge pull request #6599 from defrance/patch-2
NEW : SOCIETE_ADD_REF_IN_LIST more display case GetNomUrl
2017-03-31 17:44:31 +02:00
Laurent Destailleur
b642a8fe51 Merge pull request #6609 from atm-ph/fix_4.0_photo_jpeg_not_show
Fix picture with jpeg extension are not visible
2017-03-31 17:43:46 +02:00
Laurent Destailleur
7bcd4d74ef Merge pull request #6617 from dolibarr95/patch-9
Display mobile icon
2017-03-31 17:43:01 +02:00
Laurent Destailleur
01a74a8d23 Work on 6.0 look and feel 2017-03-31 17:41:20 +02:00
Guido Schratzer
d01ba54cb5 FIX: Issue #6549 don't rewrite email and password 2017-03-31 17:13:09 +02:00
Laurent Destailleur
979bcd3a9b NEW Can add a background image on login page 2017-03-31 11:40:31 +02:00
Laurent Destailleur
da1427ef54 Work on 6.0 look and feel 2017-03-30 16:10:08 +02:00
Laurent Destailleur
18e1e5b780 NEW Add "depends on" and "required by "into module informations 2017-03-30 15:54:48 +02:00
Laurent Destailleur
8e70c4a0b7 Work on 6.0 new look and feel 2017-03-30 15:39:50 +02:00
Laurent Destailleur
aca1c1944d Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/install/mysql/data/llx_c_action_trigger.sql
2017-03-30 12:02:27 +02:00
Laurent Destailleur
141ef91dea Fix default auto events 2017-03-30 11:53:58 +02:00
Laurent Destailleur
ce7368d10e Fix events create from member card not linked to member 2017-03-30 11:51:07 +02:00
Laurent Destailleur
f01815519a Fix trigger of automatic events 2017-03-30 11:25:28 +02:00
Laurent Destailleur
78cc976e9f Work on module builder 2017-03-30 10:40:15 +02:00
dolibarr95
1489847a74 Display mobile icon
Display a specific icon when mobile
2017-03-30 09:49:34 +02:00
Laurent Destailleur
4df8dcf980 Work on module modBlockedLog and modModuleBuilder 2017-03-29 21:50:15 +02:00
phf
2dc721c538 Fix picture with jpeg extension are not visible 2017-03-29 16:10:59 +02:00
Laurent Destailleur
f194ba6e09 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-03-29 11:48:35 +02:00
Laurent Destailleur
fbca800246 FIX Detection of color brightness 2017-03-29 11:46:13 +02:00
Laurent Destailleur
1d6e760fc8 FIX Notification sending was broken. 2017-03-29 11:44:14 +02:00
fappels
527fa27fb7 Add jquery-migrate to handle jquery 3.0 removes 2017-03-29 11:18:03 +02:00
Laurent Destailleur
e3d3d32b4a Translation 2017-03-29 11:11:37 +02:00
Laurent Destailleur
54b03a3552 Work on 6.0 new look and feel 2017-03-29 11:03:13 +02:00
Laurent Destailleur
4fa5448aab FIX Detection of color brightness 2017-03-29 10:34:33 +02:00
Alexandre SPANGARO
06c2f04927 Finish work on multijournal admin part
Need harmonization on rights
2017-03-29 06:32:26 +02:00
Laurent Destailleur
ad3b54b93a Fix regression 2017-03-28 21:09:15 +02:00
Laurent Destailleur
3d1ae236e1 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-03-28 21:05:27 +02:00
Laurent Destailleur
c84e20abaf Fix translation 2017-03-28 21:05:11 +02:00
Laurent Destailleur
e416ea275e Work on 6.0 look and feel 2017-03-28 21:04:38 +02:00
Laurent Destailleur
e8e7732820 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2017-03-28 17:41:41 +02:00
Laurent Destailleur
31bde1ae74 Code for 6.0 new look and feel 2017-03-28 17:12:15 +02:00
Laurent Destailleur
a663c248f0 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-03-28 13:31:44 +02:00
Laurent Destailleur
2f439fed85 Code for 6 2017-03-28 13:31:28 +02:00