Laurent Destailleur
|
141bef0b8a
|
Fix translation and css
|
2017-11-04 15:21:35 +01:00 |
|
Laurent Destailleur
|
cfacfab6cf
|
NEW Show badge with nbr of shipment on shimpen tab of order
NEW Add button cancel on shipment creation
|
2017-11-02 12:38:36 +01:00 |
|
Laurent Destailleur
|
cd8acf8f12
|
Fix CSS
|
2017-11-02 11:07:47 +01:00 |
|
Laurent Destailleur
|
4220d02dd4
|
Debug module blocked log
|
2017-10-31 23:57:37 +01:00 |
|
Laurent Destailleur
|
d39a19e976
|
Replace on/off img tick with fa-font
|
2017-10-31 12:32:30 +01:00 |
|
Laurent Destailleur
|
bbe1c9c494
|
NEW Can download PDF document from the payment page
|
2017-10-30 00:45:47 +01:00 |
|
Laurent Destailleur
|
1a49a2bb94
|
Clean css/code
|
2017-10-28 11:00:02 +02:00 |
|
Laurent Destailleur
|
815faf4c91
|
Fix css for website
|
2017-10-27 16:00:37 +02:00 |
|
Laurent Destailleur
|
82b333e423
|
Fix migration to select2 4.0.5
|
2017-10-26 14:06:23 +02:00 |
|
Laurent Destailleur
|
caa24e1a68
|
Fix width of tooltips
|
2017-10-26 12:34:53 +02:00 |
|
Laurent Destailleur
|
202712be94
|
Work on module builder
|
2017-10-25 22:02:07 +02:00 |
|
Laurent Destailleur
|
f4f47c6732
|
NEW Remove tooltip tipTip library replaced with standatd jquery tooltip
|
2017-10-22 21:15:08 +02:00 |
|
Laurent Destailleur
|
728e36f70f
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/api/index.php
htdocs/comm/propal/class/api_proposals.class.php
htdocs/comm/propal/class/propal.class.php
htdocs/compta/facture/class/api_invoices.class.php
htdocs/core/actions_massactions.inc.php
htdocs/core/actions_sendmails.inc.php
|
2017-10-22 01:43:33 +02:00 |
|
Laurent Destailleur
|
99b88265d3
|
Fix larger select2 combo
|
2017-10-21 21:05:00 +02:00 |
|
Laurent Destailleur
|
475db3172a
|
NEW Remove js library fileupload that was not used by core code.
|
2017-10-21 19:40:17 +02:00 |
|
Laurent Destailleur
|
dbcf3ddbe8
|
NEW Upgrade jquery select2 to 4.0.4
|
2017-10-21 19:05:24 +02:00 |
|
Laurent Destailleur
|
e74aae18eb
|
CSS
|
2017-10-21 12:25:51 +02:00 |
|
Laurent Destailleur
|
19a5780f7f
|
Clean code
|
2017-10-20 23:49:20 +02:00 |
|
Laurent Destailleur
|
985675d680
|
Clean code
|
2017-10-20 18:04:46 +02:00 |
|
Laurent Destailleur
|
6165bcdbd0
|
NEW Can export list of stock movements
|
2017-10-20 14:52:01 +02:00 |
|
Laurent Destailleur
|
a16f0e4356
|
NEW The gantt diagram is now sensitive to hours
NEW Add a group task line for tasks on same level on gantt diagram
|
2017-10-20 04:15:44 +02:00 |
|
Laurent Destailleur
|
daa7847ab3
|
NEW All search boxes are available on smartphone
|
2017-10-20 01:18:21 +02:00 |
|
Laurent Destailleur
|
d82af57b57
|
NEW Add tab "Expense report" on user card
|
2017-10-19 20:56:23 +02:00 |
|
Laurent Destailleur
|
5e2d6620f2
|
Merge pull request #7655 from atm-maxime/new_eldy_sticky_menu
NEW option to fix top menu with eldy theme (hidden conf)
|
2017-10-19 19:29:07 +02:00 |
|
Laurent Destailleur
|
efaa0b1e2a
|
Merge pull request #7640 from atm-florian/6.0_fixeventiconstatus
fix : better icon for event status Non applicable
|
2017-10-19 19:18:56 +02:00 |
|
Laurent Destailleur
|
a818422302
|
Update jsgantt to 1.7.5.4
|
2017-10-18 21:24:17 +02:00 |
|
Laurent Destailleur
|
7f85d73001
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/adherents/card.php
htdocs/comm/propal/list.php
htdocs/commande/list.php
htdocs/compta/facture/list.php
htdocs/contrat/card.php
htdocs/expensereport/card.php
htdocs/fichinter/list.php
htdocs/fourn/commande/card.php
htdocs/fourn/commande/list.php
htdocs/fourn/facture/card.php
htdocs/fourn/paiement/card.php
htdocs/livraison/card.php
htdocs/modulebuilder/template/myobject_list.php
htdocs/societe/rib.php
htdocs/supplier_proposal/list.php
htdocs/user/card.php
|
2017-10-18 19:51:29 +02:00 |
|
Laurent Destailleur
|
7ee64fc0d4
|
Fix css
|
2017-10-18 19:39:22 +02:00 |
|
Laurent Destailleur
|
3e43e164ae
|
FIX Bad ressource list in popup in gantt view
|
2017-10-18 19:13:44 +02:00 |
|
Laurent Destailleur
|
428c3e973d
|
FIX for combo on rtl languages
|
2017-10-18 18:36:10 +02:00 |
|
Maxime Kohlhaas
|
8f3a197940
|
New eldy theme top menu fixed (hidden conf)
|
2017-10-18 18:18:02 +02:00 |
|
Laurent Destailleur
|
6bcdf2ff75
|
Test replacement of img switcher with FA css
|
2017-10-17 14:03:22 +02:00 |
|
florian HENRY
|
50cacfee3d
|
lighter icon
|
2017-10-17 13:24:38 +02:00 |
|
Laurent Destailleur
|
8113321062
|
Start to work on email sender profiles
|
2017-10-13 12:02:26 +02:00 |
|
Laurent Destailleur
|
ec54621b62
|
FIX Tooltip using dialog are kept into visible screen
|
2017-10-13 11:08:30 +02:00 |
|
Laurent Destailleur
|
3f36cf23f5
|
NEW Break lines per project on the new timesheet page
|
2017-10-12 13:17:22 +02:00 |
|
Regis Houssin
|
ce6d6dcfbc
|
NEW add image object_phoning_mobile.png
|
2017-10-10 10:37:57 +02:00 |
|
Laurent Destailleur
|
ce7ce82801
|
Enhance email template editor
|
2017-10-08 14:51:10 +02:00 |
|
Scrutinizer Auto-Fixer
|
328d39bc71
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2017-10-07 11:09:31 +00:00 |
|
Laurent Destailleur
|
df38f60617
|
Export website into zip
|
2017-10-06 18:29:18 +02:00 |
|
Laurent Destailleur
|
8e0da9bfeb
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/holiday/document.php
|
2017-10-04 13:32:53 +02:00 |
|
Laurent Destailleur
|
10142522e0
|
Fix typo
|
2017-10-04 13:30:43 +02:00 |
|
Laurent Destailleur
|
90964d25ce
|
Fix css
|
2017-10-02 17:52:20 +02:00 |
|
Laurent Destailleur
|
0e15aef44f
|
CSS
|
2017-09-30 00:30:58 +02:00 |
|
Laurent Destailleur
|
be60e66d62
|
Uniformsize code/options
|
2017-09-27 16:29:33 +02:00 |
|
Laurent Destailleur
|
c9e9f60f8f
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/filefunc.inc.php
|
2017-09-25 19:55:52 +02:00 |
|
Laurent Destailleur
|
c5287e68b1
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
Conflicts:
htdocs/admin/multicurrency.php
htdocs/core/modules/modFournisseur.class.php
|
2017-09-25 19:54:27 +02:00 |
|
Laurent Destailleur
|
97ece5fda9
|
CSS
|
2017-09-24 01:49:59 +02:00 |
|
Laurent Destailleur
|
87a75a0ad7
|
CSS not bold on jnotify messages
|
2017-09-24 01:46:00 +02:00 |
|
Laurent Destailleur
|
91d303465d
|
NEW Can add html content on right of tabs
|
2017-09-24 01:39:06 +02:00 |
|
Laurent Destailleur
|
7d580105c8
|
Fix css
|
2017-09-23 13:02:25 +02:00 |
|
Laurent Destailleur
|
414f633e75
|
Fix css
|
2017-09-23 12:59:49 +02:00 |
|
Laurent Destailleur
|
35d00fd2ec
|
Fix wrap on lites_total
|
2017-09-23 09:28:31 +02:00 |
|
Laurent Destailleur
|
839f3ca41d
|
NEW Can use an url like $conf->global>-MYPARAM for menu urls
|
2017-09-23 03:22:48 +02:00 |
|
Laurent Destailleur
|
a94f2b07e1
|
Fix css
|
2017-09-23 02:46:33 +02:00 |
|
Laurent Destailleur
|
2f317c5834
|
Debug online payment using unique form
|
2017-09-20 19:34:14 +02:00 |
|
Laurent Destailleur
|
1d6213ea7d
|
Add picto for cheque payment
|
2017-09-20 15:29:47 +02:00 |
|
Laurent Destailleur
|
5f7631a95d
|
NEW Days where user is on vacation use different colors in timesheet.
|
2017-09-19 17:07:39 +02:00 |
|
Laurent Destailleur
|
f5bc9c08b1
|
Missing css
|
2017-09-19 11:38:28 +02:00 |
|
Laurent Destailleur
|
2f80618545
|
Merge pull request #7390 from atm-arnaud/FIX_task_comment_design
Fix task comment design
|
2017-09-14 12:21:58 +02:00 |
|
Laurent Destailleur
|
eadfbfe2bd
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/facture/class/facture.class.php
htdocs/core/lib/functions2.lib.php
|
2017-09-13 20:57:53 +02:00 |
|
Laurent Destailleur
|
3deacaa5c4
|
Fix css pb
|
2017-09-13 17:10:04 +02:00 |
|
arnaud
|
ad017495f4
|
FIX task comment design
|
2017-09-13 12:09:01 +02:00 |
|
arnaud
|
4b6553d360
|
FIX comment color and create colorIsLight function
|
2017-09-13 10:43:44 +02:00 |
|
Laurent Destailleur
|
1f56800a50
|
Merge pull request #7341 from atm-arnaud/NEW_task_discussion
New task discussion
|
2017-09-11 15:20:13 +02:00 |
|
Laurent Destailleur
|
34221fc163
|
CSS of payment page
|
2017-09-11 03:38:39 +02:00 |
|
arnaud
|
8906c95eea
|
NEW comments system on task
|
2017-09-07 16:23:51 +02:00 |
|
Laurent Destailleur
|
48c526f87d
|
Debug report for accounting module
|
2017-09-05 12:53:25 +02:00 |
|
Laurent Destailleur
|
c5567fafd4
|
Enhancement for smartphone
|
2017-09-04 09:25:53 +02:00 |
|
Laurent Destailleur
|
bc446999dd
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2017-09-01 19:37:45 +02:00 |
|
Laurent Destailleur
|
55691bfbc2
|
Work on generic payment module
|
2017-09-01 19:37:34 +02:00 |
|
Laurent Destailleur
|
1a5f96123a
|
Work on generic payment module
|
2017-09-01 19:30:56 +02:00 |
|
Laurent Destailleur
|
9146bb336e
|
Work on merging all payment modes in one page
|
2017-08-31 03:34:57 +02:00 |
|
Laurent Destailleur
|
9312005318
|
NEW Move accountancy features into a dedicated menu
|
2017-08-29 12:43:47 +02:00 |
|
Laurent Destailleur
|
c29d78bd0e
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2017-08-24 14:57:44 +02:00 |
|
Laurent Destailleur
|
9684c8b4bc
|
Fix css
|
2017-08-24 14:54:32 +02:00 |
|
Laurent Destailleur
|
90afbcb034
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/bank.php
htdocs/core/lib/functions.lib.php
|
2017-08-23 17:02:53 +02:00 |
|
Laurent Destailleur
|
e25a428118
|
Fix compatibility with Internet Explorer
|
2017-08-23 12:32:28 +02:00 |
|
Laurent Destailleur
|
5cf684f5a2
|
NEW Popup for preview of image add a button "Original size"
|
2017-08-22 13:14:10 +02:00 |
|
Laurent Destailleur
|
348a42542d
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/theme/eldy/style.css.php
|
2017-08-21 13:29:08 +02:00 |
|
Laurent Destailleur
|
f5993a2507
|
Better style
|
2017-08-21 12:51:48 +02:00 |
|
Laurent Destailleur
|
9782937138
|
Better info style
|
2017-08-21 12:25:38 +02:00 |
|
Laurent Destailleur
|
b48f501a0c
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2017-08-21 11:04:09 +02:00 |
|
Laurent Destailleur
|
d7be62b7da
|
Better style
|
2017-08-21 11:02:24 +02:00 |
|
Laurent Destailleur
|
48f2e465fa
|
Better info style
|
2017-08-21 11:01:24 +02:00 |
|
Laurent Destailleur
|
083cb33a6c
|
Clean ecm code
|
2017-08-20 23:16:20 +02:00 |
|
Laurent Destailleur
|
2321091170
|
NEW Move the upload input on top right in ECM module
|
2017-08-20 21:23:19 +02:00 |
|
Laurent Destailleur
|
402e6bf650
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/bank/various_payment/card.php
htdocs/compta/bank/various_payment/index.php
htdocs/compta/paiement/list.php
htdocs/core/modules/modCron.class.php
|
2017-08-04 15:39:00 +02:00 |
|
Laurent Destailleur
|
d1398887e6
|
Missing picto
|
2017-08-03 12:02:42 +02:00 |
|
Laurent Destailleur
|
b6a7ce6822
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2017-08-01 10:22:37 +02:00 |
|
Laurent Destailleur
|
2f9f9ac80d
|
Fix personal conf was not loaded
|
2017-07-31 11:56:20 +02:00 |
|
Laurent Destailleur
|
80f096a9d8
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2017-07-31 02:09:15 +02:00 |
|
Laurent Destailleur
|
1897e3cbad
|
Some fix for better compatibility
|
2017-07-30 20:43:18 +02:00 |
|
Laurent Destailleur
|
bb8d458468
|
Fix menu editor
|
2017-07-30 19:41:45 +02:00 |
|
Laurent Destailleur
|
cae21d3937
|
Fix in agenda output per user/type (reduce memory usage)
|
2017-07-29 01:59:26 +02:00 |
|
Laurent Destailleur
|
af63dc76c1
|
Fix flex problems
|
2017-07-28 23:46:11 +02:00 |
|
Laurent Destailleur
|
46586f3055
|
Can export Websites pages.
Work on export to be able to use the generic declaration of fields.
|
2017-07-28 14:54:13 +02:00 |
|
Laurent Destailleur
|
7760594643
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/langs/en_US/website.lang
htdocs/theme/eldy/style.css.php
htdocs/websites/class/website.class.php
htdocs/websites/index.php
|
2017-07-20 18:31:58 +02:00 |
|
Laurent Destailleur
|
3b8f60f90e
|
Fix pb of recursive include in website module
|
2017-07-20 16:49:20 +02:00 |
|
Laurent Destailleur
|
1e7aa4d9b4
|
Work on module website
|
2017-07-19 16:38:00 +02:00 |
|
Laurent Destailleur
|
86926a28ec
|
Fix css
|
2017-07-18 14:27:51 +02:00 |
|
Laurent Destailleur
|
a416ec4258
|
Try to fix travis
|
2017-07-18 14:25:07 +02:00 |
|
Laurent Destailleur
|
5c296c679e
|
Enhance source code editor
|
2017-07-18 13:42:07 +02:00 |
|
Laurent Destailleur
|
644486b4a0
|
Fix css
|
2017-07-15 17:32:36 +02:00 |
|
Laurent Destailleur
|
bbc8994d36
|
Fix css
|
2017-07-14 13:28:21 +02:00 |
|
Laurent Destailleur
|
fd89535037
|
Debug module website
|
2017-07-09 22:30:19 +02:00 |
|
Laurent Destailleur
|
10cb7b2524
|
Fix remove warnings
|
2017-07-09 20:31:27 +02:00 |
|
Laurent Destailleur
|
7ae52d843c
|
Look and feel v6
|
2017-07-01 14:23:24 +02:00 |
|
Laurent Destailleur
|
3fdfebf7ef
|
Fix position of top menu does not follow 'position' field.
|
2017-06-27 04:25:41 +02:00 |
|
Laurent Destailleur
|
509aad9bce
|
Fix README
|
2017-06-24 12:52:39 +02:00 |
|
Laurent Destailleur
|
4102403482
|
Look and feel v6
|
2017-06-21 11:37:34 +02:00 |
|
Laurent Destailleur
|
9ec7929753
|
Look and feel v6
|
2017-06-21 10:59:39 +02:00 |
|
Laurent Destailleur
|
7c41c9a3e4
|
Fix activation of dependency for a dedicated country.
BlockedLog depends now on CashDesk only.
|
2017-06-17 11:43:00 +02:00 |
|
Laurent Destailleur
|
2d571bf097
|
Fix bad merge
|
2017-06-14 10:50:43 +02:00 |
|
Laurent Destailleur
|
b889db997a
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/facture.php
htdocs/core/datepicker.php
htdocs/core/get_menudiv.php
htdocs/core/menus/standard/auguria.lib.php
htdocs/core/menus/standard/eldy.lib.php
htdocs/core/search_page.php
htdocs/main.inc.php
htdocs/master.inc.php
htdocs/product/list.php
htdocs/theme/eldy/style.css.php
htdocs/theme/md/style.css.php
htdocs/user/card.php
htdocs/user/index.php
|
2017-06-14 10:48:34 +02:00 |
|
Laurent Destailleur
|
848f70e026
|
Fix bad merge
|
2017-06-14 10:38:34 +02:00 |
|
Laurent Destailleur
|
7939daa225
|
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
Conflicts:
htdocs/core/lib/functions.lib.php
htdocs/theme/eldy/style.css.php
htdocs/theme/md/style.css.php
htdocs/user/index.php
|
2017-06-14 10:18:24 +02:00 |
|
Laurent Destailleur
|
9c482b9f2a
|
FIX CVE-2017-7886
|
2017-06-10 21:37:27 +02:00 |
|
Laurent Destailleur
|
890ac81e4d
|
Fix menu entried must be greyed, sub menus not visible fi not allowed on
parent.
|
2017-06-10 19:16:42 +02:00 |
|
Laurent Destailleur
|
ce470b8dd5
|
Fix css fot liste_total lines
|
2017-06-10 16:23:24 +02:00 |
|
Laurent Destailleur
|
87c8659e72
|
Fix responsive
|
2017-06-10 00:45:18 +02:00 |
|
Laurent Destailleur
|
58a407d9f1
|
Fix style and align when no permission on widget
|
2017-06-10 00:05:47 +02:00 |
|
Laurent Destailleur
|
884c6c674d
|
Fix css
|
2017-06-09 20:08:23 +02:00 |
|
Laurent Destailleur
|
0458b7d38f
|
Fix css subscription form
|
2017-06-09 17:29:34 +02:00 |
|
Laurent Destailleur
|
1af74b4c42
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
dev/skeletons/skeleton_list.php
htdocs/admin/perms.php
htdocs/core/class/commonobject.class.php
htdocs/core/class/hookmanager.class.php
htdocs/core/lib/files.lib.php
htdocs/product/class/product.class.php
htdocs/product/class/service.class.php
htdocs/product/index.php
htdocs/product/list.php
htdocs/public/members/new.php
htdocs/theme/eldy/style.css.php
htdocs/theme/md/style.css.php
|
2017-06-09 12:50:56 +02:00 |
|
Laurent Destailleur
|
41586b76c0
|
Fix missing css
|
2017-06-09 11:40:35 +02:00 |
|
Laurent Destailleur
|
543630e487
|
Fix missing count of nb of columns into lists
|
2017-06-08 14:14:06 +02:00 |
|
Laurent Destailleur
|
1820649175
|
Maxi debug of v6
|
2017-06-07 19:28:31 +02:00 |
|
Laurent Destailleur
|
9e629bdb02
|
Work on modulebuilder
|
2017-06-02 20:01:25 +02:00 |
|
Laurent Destailleur
|
c59d216cf5
|
NEW Can read time spent of others (hierarchy only or all if granted)
|
2017-06-02 13:24:45 +02:00 |
|
Laurent Destailleur
|
bebf2b33ea
|
CSS enhancement for mobile
|
2017-06-02 09:25:35 +02:00 |
|
Laurent Destailleur
|
b4f1df03de
|
Update doc
|
2017-06-01 19:18:57 +02:00 |
|
Laurent Destailleur
|
e667d72547
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
dev/skeletons/build_class_from_table.php
htdocs/compta/facture.php
htdocs/core/class/html.form.class.php
|
2017-05-29 10:41:51 +02:00 |
|
Laurent Destailleur
|
7a1480d362
|
Look and feel v6
|
2017-05-26 00:02:41 +02:00 |
|
Laurent Destailleur
|
ca08f814c1
|
Remove deprecated files
|
2017-05-25 19:38:42 +02:00 |
|
Laurent Destailleur
|
6eeb82ec70
|
FIX dialog window with md theme must not be hidden by left menu part.
|
2017-05-24 13:45:26 +02:00 |
|
Laurent Destailleur
|
80ce8da7a3
|
Fix migration errors and responsive design
|
2017-05-23 15:13:52 +02:00 |
|
Laurent Destailleur
|
2dd2ab1003
|
Look and feel v6
|
2017-05-20 20:59:54 +02:00 |
|
Laurent Destailleur
|
aec4cef5de
|
Clean some code for type of event deprecated since 3.3
|
2017-05-19 12:58:38 +02:00 |
|
Laurent Destailleur
|
d110292a1b
|
Uniformize code
|
2017-05-16 17:49:38 +02:00 |
|
Laurent Destailleur
|
68e333879f
|
Fix var not sanitized
|
2017-05-16 13:27:32 +02:00 |
|
Laurent Destailleur
|
b3245fb455
|
NEW Include an hourglass icon when we click on online payment button
|
2017-05-15 10:27:21 +02:00 |
|
Laurent Destailleur
|
169e63d49a
|
Fix set of background for left menu
|
2017-05-13 22:23:03 +02:00 |
|
Laurent Destailleur
|
57ba598b15
|
Merge pull request #6771 from aspangaro/6.0-stripe
New : Module Stripe
|
2017-05-13 19:55:29 +02:00 |
|
Laurent Destailleur
|
71833f5987
|
Standardize code
|
2017-05-13 17:04:46 +02:00 |
|
Laurent Destailleur
|
0d11fce834
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2017-05-12 15:45:30 +02:00 |
|
Laurent Destailleur
|
b81de35703
|
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
Conflicts:
htdocs/adherents/class/adherent.class.php
htdocs/comm/propal/class/propal.class.php
htdocs/compta/facture/class/facture.class.php
htdocs/compta/sociales/class/chargesociales.class.php
htdocs/contrat/class/contrat.class.php
|
2017-05-12 15:44:09 +02:00 |
|
Laurent Destailleur
|
419c15ee8e
|
Fix escaping class
|
2017-05-12 15:28:10 +02:00 |
|
Laurent Destailleur
|
b09300ab61
|
NEW Can edit background color for odd and even lines in tables
|
2017-05-11 13:02:29 +02:00 |
|
Laurent Destailleur
|
0e4a209dd8
|
Fix normalize color settings
|
2017-05-11 11:50:21 +02:00 |
|
Laurent Destailleur
|
0ea69e2e94
|
Add empty index.html page
|
2017-05-10 09:58:58 +02:00 |
|
Laurent Destailleur
|
b8b91db007
|
Use function top_httphead to include headers in pages.
|
2017-05-09 21:46:57 +02:00 |
|
Laurent Destailleur
|
1748f1d451
|
Better tooltip for computed field
|
2017-05-09 17:00:07 +02:00 |
|
Laurent Destailleur
|
dd71fdc82f
|
Work on modulebuilder template
|
2017-05-08 21:00:23 +02:00 |
|
Alexandre SPANGARO
|
16a41242d3
|
Merge remote-tracking branch 'uptream/develop' into 6.0-stripe
|
2017-05-08 06:39:14 +02:00 |
|
Laurent Destailleur
|
f4447f9c87
|
Fix bookmark jump
|
2017-05-06 21:39:00 +02:00 |
|
Laurent Destailleur
|
910a925167
|
NEW Add last activation author and ip of modules
|
2017-05-06 20:43:14 +02:00 |
|
Laurent Destailleur
|
9b90e7aa09
|
Minor fix
|
2017-05-06 02:24:52 +02:00 |
|
Laurent Destailleur
|
cea835744c
|
Look and feel v6
|
2017-05-05 23:06:46 +02:00 |
|
Laurent Destailleur
|
d53654e64f
|
Look and feel v6
|
2017-05-05 20:45:06 +02:00 |
|
Laurent Destailleur
|
11b1a2adac
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/accountancy/journal/bankjournal.php
htdocs/accountancy/journal/expensereportsjournal.php
htdocs/accountancy/journal/purchasesjournal.php
htdocs/accountancy/journal/sellsjournal.php
htdocs/comm/propal/class/api_proposals.class.php
htdocs/comm/propal/class/propal.class.php
htdocs/compta/bank/index.php
htdocs/compta/facture.php
htdocs/core/class/html.form.class.php
htdocs/includes/odtphp/Segment.php
htdocs/langs/en_US/admin.lang
htdocs/societe/soc.php
|
2017-05-05 14:49:25 +02:00 |
|
Laurent Destailleur
|
2120b9af85
|
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
Conflicts:
htdocs/core/class/commonobject.class.php
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/theme/eldy/style.css.php
|
2017-05-05 14:14:21 +02:00 |
|
Laurent Destailleur
|
39d9a0f979
|
Support of pdf preview on supplier orders
|
2017-05-04 19:11:19 +02:00 |
|
Marcos García de La Fuente
|
6e7fddee7d
|
Corrected PHP7 warnings for function pdf_einstein::write_file
|
2017-05-02 14:07:04 +02:00 |
|
Laurent Destailleur
|
ff0f40ab37
|
Look and feel v6
|
2017-04-29 16:07:34 +02:00 |
|
Alexandre SPANGARO
|
586ea54bfc
|
Merge remote-tracking branch 'uptream/develop' into 6.0-stripe
|
2017-04-29 07:05:02 +02:00 |
|
Laurent Destailleur
|
2e6d865c7d
|
NEW Can define default values for create forms.
NEW Can define default filters for list pages.
NEW Can define default sort order for list pages.
|
2017-04-29 00:44:25 +02:00 |
|
Laurent Destailleur
|
0ba6433a61
|
Work on module website
|
2017-04-28 13:10:08 +02:00 |
|
Laurent Destailleur
|
5e856e6923
|
More complete tooltip help to describe available substitution vars
|
2017-04-27 17:16:19 +02:00 |
|
Alexandre SPANGARO
|
c3fe1c963a
|
Merge remote-tracking branch 'uptream/develop' into 6.0-stripe
|
2017-04-22 06:33:31 +02:00 |
|
Laurent Destailleur
|
0994622bf8
|
NEW Can use translations into all substitutions (watermark, freetext...)
|
2017-04-17 23:54:09 +02:00 |
|
Alexandre SPANGARO
|
fed6d71d8a
|
Merge remote-tracking branch 'uptream/develop' into 6.0-stripe
|
2017-04-17 06:51:02 +02:00 |
|
Laurent Destailleur
|
e97e202deb
|
NEW Can import users
|
2017-04-17 04:22:53 +02:00 |
|
Laurent Destailleur
|
e2c31b5f23
|
Fix regression
|
2017-04-14 18:43:34 +02:00 |
|
Laurent Destailleur
|
3e9ccc186a
|
NEW Small PDF template for products
|
2017-04-13 10:26:12 +02:00 |
|
Laurent Destailleur
|
d74baea1d3
|
Fix error management on direct print
|
2017-04-12 13:01:41 +02:00 |
|
Laurent Destailleur
|
77dfb05647
|
Work on v6 look and feel
|
2017-04-12 12:35:13 +02:00 |
|
Laurent Destailleur
|
d78f3923ee
|
Support of preview for pdf with several pages
|
2017-04-12 12:13:38 +02:00 |
|
Laurent Destailleur
|
d15792bdf4
|
Minor fix
|
2017-04-11 00:59:47 +02:00 |
|
Laurent Destailleur
|
9b45776941
|
Fix responsive
|
2017-04-10 17:25:53 +02:00 |
|
Laurent Destailleur
|
52c86cb3f5
|
NEW Bulk actions available on supplier orders
|
2017-04-09 13:12:25 +02:00 |
|
Laurent Destailleur
|
56a4b7a1fd
|
Work on v6 look and feel
|
2017-04-08 14:03:38 +02:00 |
|
Laurent Destailleur
|
be439f6252
|
Work on look and feel v6
|
2017-04-07 16:16:44 +02:00 |
|
Laurent Destailleur
|
60a54041c2
|
NEW Enable bulk actions delete on supplier invoices
|
2017-04-07 14:09:19 +02:00 |
|
Laurent Destailleur
|
a99a4be9e0
|
Work on 6.0 look and feel
|
2017-04-06 22:31:45 +02:00 |
|
Laurent Destailleur
|
01d69e4b58
|
NEW Better reponsive design
|
2017-04-04 12:55:54 +02:00 |
|
Laurent Destailleur
|
9df4bac202
|
NEW Bookmarks are into a combo list.
|
2017-04-04 11:56:19 +02:00 |
|
Laurent Destailleur
|
761ece3125
|
Remove $maxfilenamelength replace with auto overflow.
|
2017-04-03 16:59:22 +02:00 |
|
Laurent Destailleur
|
d975e7f442
|
Work on 6.0 look and feel
|
2017-04-01 12:46:47 +02:00 |
|
Laurent Destailleur
|
e221c48997
|
Css
|
2017-04-01 00:59:21 +02:00 |
|
Laurent Destailleur
|
7254b54a04
|
Work on 6.0 look and feel
|
2017-04-01 00:49:06 +02:00 |
|
Laurent Destailleur
|
01a74a8d23
|
Work on 6.0 look and feel
|
2017-03-31 17:41:20 +02:00 |
|
Laurent Destailleur
|
979bcd3a9b
|
NEW Can add a background image on login page
|
2017-03-31 11:40:31 +02:00 |
|
Laurent Destailleur
|
8e70c4a0b7
|
Work on 6.0 new look and feel
|
2017-03-30 15:39:50 +02:00 |
|
Laurent Destailleur
|
4df8dcf980
|
Work on module modBlockedLog and modModuleBuilder
|
2017-03-29 21:50:15 +02:00 |
|
Laurent Destailleur
|
54b03a3552
|
Work on 6.0 new look and feel
|
2017-03-29 11:03:13 +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
|
b5b0eba470
|
Several enhancement for 6.0
|
2017-03-28 12:47:48 +02:00 |
|
Laurent Destailleur
|
3740137e31
|
Add tooltip on label of each open item.
|
2017-03-28 10:44:52 +02:00 |
|
Laurent Destailleur
|
219bcb0d54
|
Work on 6.0 features.
|
2017-03-27 22:44:50 +02:00 |
|
Laurent Destailleur
|
0838953ef7
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2017-03-27 00:49:24 +02:00 |
|
Laurent Destailleur
|
f843f8a93d
|
Start to move search bar before table titles
|
2017-03-27 00:48:50 +02:00 |
|
BENKE Charlie
|
aa5ff36a04
|
display input border by setting
|
2017-03-25 19:04:27 +01:00 |
|
Alexandre SPANGARO
|
ef0caa71e2
|
Fix : Missing picture for module multicurrency in md theme
|
2017-03-24 06:50:07 +01:00 |
|
Laurent Destailleur
|
3cc312d485
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/langs/en_US/main.lang
|
2017-03-23 19:48:34 +01:00 |
|
Laurent Destailleur
|
4bc2864a6f
|
Better board for open items
|
2017-03-23 19:26:28 +01:00 |
|
Laurent Destailleur
|
53a04703d6
|
Uniformize code
|
2017-03-23 16:10:38 +01:00 |
|
Laurent Destailleur
|
22247271f6
|
CSS enhancement
|
2017-03-23 13:19:00 +01:00 |
|
Laurent Destailleur
|
e72f0076ed
|
Remove border-bottom useless
|
2017-03-23 13:06:38 +01:00 |
|
Laurent Destailleur
|
3adb43c6e5
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/facture.php
htdocs/core/boxes/box_produits.php
htdocs/core/boxes/box_produits_alerte_stock.php
htdocs/langs/en_US/bills.lang
htdocs/product/class/product.class.php
htdocs/theme/eldy/style.css.php
htdocs/theme/md/style.css.php
|
2017-03-23 12:52:19 +01:00 |
|
Laurent Destailleur
|
fec3a89aa5
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2017-03-23 11:38:46 +01:00 |
|
Laurent Destailleur
|
0a35d17207
|
CSS enhancement
|
2017-03-23 10:59:13 +01:00 |
|
Laurent Destailleur
|
acdfd6ab9e
|
css enhancement
|
2017-03-21 18:23:58 +01:00 |
|
Laurent Destailleur
|
1e63b98731
|
Fix responsive
|
2017-03-21 17:06:27 +01:00 |
|
Laurent Destailleur
|
b5e646daa0
|
NEW Show by default README.md file found into root dir of ext module.
|
2017-03-21 16:43:09 +01:00 |
|
Laurent Destailleur
|
dba6d99686
|
Minor look enhancement
|
2017-03-16 17:02:30 +01:00 |
|
Laurent Destailleur
|
4c0ff38020
|
Fix closing boxes
|
2017-03-15 11:58:13 +01:00 |
|
Laurent Destailleur
|
e6d8b3c4db
|
Css enhancement
|
2017-03-15 11:41:15 +01:00 |
|
Laurent Destailleur
|
888675016d
|
NEW Can use dol_fiche_end without showing bottom border.
|
2017-03-15 11:13:30 +01:00 |
|
Laurent Destailleur
|
7f8c4d7d0f
|
Fix CSS
|
2017-03-14 14:33:25 +01:00 |
|
Laurent Destailleur
|
ec7d48931e
|
Merge duplicate menus/page on projects
|
2017-03-14 13:49:04 +01:00 |
|
Laurent Destailleur
|
7103d7921e
|
Uniformize look
|
2017-03-11 13:42:16 +01:00 |
|
Laurent Destailleur
|
d1fe6a408c
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2017-03-11 12:41:47 +01:00 |
|
Laurent Destailleur
|
4ca634b41c
|
Better look and feel
|
2017-03-11 12:04:28 +01:00 |
|
Laurent Destailleur
|
aa0db5783a
|
Update favorite icon to use standard icon.
|
2017-03-11 03:35:02 +01:00 |
|
Laurent Destailleur
|
c7713a8839
|
CSS
|
2017-03-11 03:01:45 +01:00 |
|
Laurent Destailleur
|
4bf0e31299
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/langs/en_US/loan.lang
htdocs/theme/eldy/style.css.php
htdocs/theme/md/style.css.php
|
2017-03-11 02:40:42 +01:00 |
|
Laurent Destailleur
|
47dd53abbe
|
NEW The substitution keys available for emailing edition is now into a
popup
|
2017-03-11 02:36:22 +01:00 |
|
Laurent Destailleur
|
106d74184c
|
CSS change.
More information on project list of thirdparty.
|
2017-03-11 00:43:06 +01:00 |
|
Laurent Destailleur
|
b6bdd98599
|
Fix css
|
2017-03-10 16:44:30 +01:00 |
|
Laurent Destailleur
|
2a3d3b4b50
|
Fix dol_banner for agenda
|
2017-03-10 16:40:38 +01:00 |
|
Laurent Destailleur
|
567639397e
|
Fix Must use tdoverflowmax100 instead of tdoverflow
|
2017-03-10 10:57:03 +01:00 |
|
Laurent Destailleur
|
b3d27521cb
|
Fix Must use tdoverflowmax100 instead of tdoverflow
|
2017-03-10 10:55:35 +01:00 |
|
Laurent Destailleur
|
d241adc201
|
NEW Use autocompletion on the "Add widget list".
|
2017-03-09 13:22:43 +01:00 |
|
Laurent Destailleur
|
184d52525a
|
PHP code to manage pair/impair is replaced by native CSS.
|
2017-03-07 22:45:22 +01:00 |
|
Alexandre SPANGARO
|
6ce8aa7d6f
|
Merge remote-tracking branch 'uptream/develop' into 6.0-stripe
|
2017-03-07 22:08:23 +01:00 |
|
Laurent Destailleur
|
c2298c2e6b
|
Clean CSS
|
2017-03-04 17:49:44 +01:00 |
|
Laurent Destailleur
|
00758e515a
|
Better css
|
2017-03-04 12:18:34 +01:00 |
|
Laurent Destailleur
|
28ad50e059
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/tpl/objectline_create.tpl.php
htdocs/langs/de_DE/bills.lang
htdocs/langs/fr_FR/bills.lang
htdocs/langs/fr_FR/main.lang
htdocs/langs/fr_FR/suppliers.lang
|
2017-03-03 14:31:35 +01:00 |
|
Laurent Destailleur
|
08eaff729f
|
FIX #6461
|
2017-03-03 14:00:38 +01:00 |
|
Laurent Destailleur
|
afc0cb93b3
|
First implementation of CSS3 flex.
|
2017-03-03 13:30:02 +01:00 |
|
Laurent Destailleur
|
d202003e29
|
Fix translation
|
2017-03-01 18:12:06 +01:00 |
|
Laurent Destailleur
|
0bc41f50f5
|
Fix regression. lost overflow on left menu.
|
2017-02-28 21:08:32 +01:00 |
|
Laurent Destailleur
|
c2c69620eb
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2017-02-28 13:45:51 +01:00 |
|
Laurent Destailleur
|
c228b04f32
|
Css correction
|
2017-02-28 13:45:14 +01:00 |
|
Laurent Destailleur
|
5c2ed0f19f
|
Fix field title lost
|
2017-02-28 12:57:34 +01:00 |
|
Laurent Destailleur
|
0f22beb774
|
Upgrade to ckeditor 4.6.2.
|
2017-02-28 10:49:58 +01:00 |
|
Alexandre SPANGARO
|
05e50e1027
|
Merge remote-tracking branch 'uptream/develop' into 6.0-stripe
|
2017-02-28 05:52:43 +01:00 |
|