Laurent Destailleur
|
6ebd060315
|
Use php var with same name than html var
|
2019-10-01 11:23:38 +02:00 |
|
Laurent Destailleur
|
0828000626
|
Merge pull request #12005 from laudeco/feature/filter_contacts
working solution about filtering the contacs of one company
|
2019-10-01 11:19:29 +02:00 |
|
Laurent Destailleur
|
0f4f5d47f2
|
Update company.lib.php
|
2019-10-01 11:18:53 +02:00 |
|
Laurent Destailleur
|
955d9daf38
|
Update company.lib.php
|
2019-10-01 11:18:14 +02:00 |
|
Laurent Destailleur
|
76bd09cfb5
|
Merge pull request #12002 from frederic34/patch-18
Update box_supplier_orders.php to show email
|
2019-10-01 11:16:40 +02:00 |
|
Laurent Destailleur
|
f151dc1951
|
Merge pull request #12000 from frederic34/zapier2
zapier trigger
|
2019-10-01 11:16:27 +02:00 |
|
Laurent Destailleur
|
2d8e3aad5b
|
Merge pull request #12001 from frederic34/patch-17
Update box_prospect.php to show email
|
2019-10-01 11:13:01 +02:00 |
|
stickler-ci
|
5e075d5d30
|
Fixing style errors.
|
2019-10-01 06:39:26 +00:00 |
|
Frédéric FRANCE
|
c57c8eee88
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-01 07:41:10 +02:00 |
|
Alexandre SPANGARO
|
16c6c9ae75
|
Merge remote-tracking branch 'upstream/develop' into 11.0_https
|
2019-10-01 06:12:24 +02:00 |
|
Alexandre SPANGARO
|
91b3bf76fd
|
Merge branch 'develop' into 11.0_https
|
2019-10-01 06:11:43 +02:00 |
|
Frédéric FRANCE
|
f3f2ab8aad
|
Update box_commandes.php
|
2019-09-30 22:45:28 +02:00 |
|
Frédéric FRANCE
|
466e48761c
|
Update box_supplier_orders.php
|
2019-09-30 22:43:13 +02:00 |
|
Frédéric FRANCE
|
d0e9e9568a
|
Update box_prospect.php
|
2019-09-30 22:40:07 +02:00 |
|
Frédéric FRANCE
|
b74a93e194
|
zapier trigger
|
2019-09-30 22:03:42 +02:00 |
|
Alexandre SPANGARO
|
8dea427f58
|
Merge remote-tracking branch 'upstream/develop' into 11.0_accountancy_portal
|
2019-09-30 21:23:27 +02:00 |
|
ATM john
|
b01bd979b5
|
Unlock title button feature
|
2019-09-30 21:10:16 +02:00 |
|
Laurent Destailleur
|
0846a081cb
|
Merge branch 'develop' into new_branch_29_06_2019
|
2019-09-30 21:06:51 +02:00 |
|
Frédéric FRANCE
|
f32f528bc2
|
fix merge
|
2019-09-30 19:36:57 +02:00 |
|
Frédéric FRANCE
|
b87610adcc
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-09-30 19:34:35 +02:00 |
|
Laurent Destailleur
|
33908afb66
|
Update zapier logo
|
2019-09-30 19:30:31 +02:00 |
|
Frédéric FRANCE
|
fec67aade4
|
Merge remote-tracking branch 'upstream/develop' into zapier
|
2019-09-30 18:44:34 +02:00 |
|
Frédéric FRANCE
|
a5fce6cca8
|
Update CMailFile.class.php
|
2019-09-30 18:25:54 +02:00 |
|
Laurent Destailleur
|
ecc2e8df67
|
Fix restore lost images
|
2019-09-30 17:58:31 +02:00 |
|
Laurent Destailleur
|
dc7ad61940
|
Add class reposition on button that switch the view mode
|
2019-09-30 17:46:53 +02:00 |
|
Laurent Destailleur
|
b390cff172
|
Fix css
|
2019-09-30 17:22:22 +02:00 |
|
Laurent Destailleur
|
ce7e8c83a3
|
Use a dedicated css imgforviewmode for button used to switch view
|
2019-09-30 17:08:57 +02:00 |
|
Laurent Destailleur
|
d65af06d20
|
Merge pull request #11869 from atm-john/new_ticket_messaging_page
New ticket messaging page design
|
2019-09-30 15:34:35 +02:00 |
|
Laurent Destailleur
|
d8de78dca9
|
Merge pull request #11984 from fuhraih/develop
Fix 11554 and 7533
|
2019-09-30 15:31:41 +02:00 |
|
Laurent Destailleur
|
b28cd1bb57
|
Merge pull request #11972 from aspangaro/11.0_fa_icon
NEW Add fa_icon on load_fiche_titre
|
2019-09-30 15:26:28 +02:00 |
|
Laurent Destailleur
|
bbc98c19bc
|
Update functions.lib.php
|
2019-09-30 15:25:55 +02:00 |
|
Laurent Destailleur
|
5b582d1117
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-09-30 15:18:28 +02:00 |
|
Laurent Destailleur
|
bc1e59ee23
|
Merge pull request #11982 from frederic34/patch-13
Add sendcontext to notification emails
|
2019-09-30 15:18:12 +02:00 |
|
Laurent Destailleur
|
7dd4a829a5
|
Comment
|
2019-09-30 15:18:05 +02:00 |
|
Laurent Destailleur
|
0a75c0645d
|
Merge branch 'develop' into develop_fix_land_loading
|
2019-09-30 15:15:12 +02:00 |
|
Alexandre SPANGARO
|
aec50d3ac9
|
NEW Add fa_icon on load_fiche_titre
|
2019-09-30 10:14:55 +02:00 |
|
Frédéric FRANCE
|
258424416e
|
Merge remote-tracking branch 'upstream/develop' into zapier
|
2019-09-30 07:49:52 +02:00 |
|
Laurent Destailleur
|
d2881eb85b
|
FIX CSS
Conflicts:
htdocs/core/tpl/extrafields_list_search_input.tpl.php
|
2019-09-29 19:26:37 +02:00 |
|
Laurent Destailleur
|
64e710fc1b
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-09-29 19:22:22 +02:00 |
|
Laurent Destailleur
|
8acf7298b2
|
FIX CSS
|
2019-09-29 19:22:01 +02:00 |
|
Laurent Destailleur
|
a9f88b84d8
|
Merge pull request #11981 from frederic34/patch-12
Update box_supplier_orders_awaiting_reception.php
|
2019-09-29 16:26:44 +02:00 |
|
Frédéric FRANCE
|
1b151da776
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-09-29 11:28:54 +02:00 |
|
stickler-ci
|
103efbbe5b
|
Fixing style errors.
|
2019-09-28 20:55:58 +00:00 |
|
Alexandre SPANGARO
|
8e42ac8cd0
|
Merge remote-tracking branch 'upstream/develop' into 11.0_accountancy_portal
|
2019-09-28 22:31:08 +02:00 |
|
Laurent Destailleur
|
2b57d486dc
|
NEW Upgrade ACE editor to v1.4.6
|
2019-09-28 13:50:32 +02:00 |
|
Laurent Destailleur
|
6966651d51
|
Standardize code to use dolSqlDateFilter
|
2019-09-28 13:22:05 +02:00 |
|
Laurent Destailleur
|
db32ca99c6
|
Fix translation and sql request
|
2019-09-28 12:36:09 +02:00 |
|
Frédéric FRANCE
|
2eaf3c0dda
|
Add sendcontext to notification emails
|
2019-09-28 10:25:00 +02:00 |
|
Frédéric FRANCE
|
710154fb9d
|
Update box_supplier_orders_awaiting_reception.php
|
2019-09-28 09:00:52 +02:00 |
|
Alexandre SPANGARO
|
288aea190b
|
Merge remote-tracking branch 'upstream/develop' into 11.0_fa_icon
|
2019-09-28 06:09:40 +02:00 |
|