Commit Graph

774 Commits

Author SHA1 Message Date
Raphaël Doursenaud
631ee83745 [Qual] Replaced deprecated print_fiche_titre() 2015-09-24 18:34:58 +02:00
Raphaël Doursenaud
9f2545b95d [Qual] Replaced deprecated dol_clone by native clone 2015-09-24 17:24:40 +02:00
Laurent Destailleur
95daf14725 Merge branch 'patch-73' of https://github.com/defrance/dolibarr into
defrance-patch-73

Conflicts:
	htdocs/core/lib/functions.lib.php
2015-09-23 19:21:59 +02:00
Laurent Destailleur
72d7671a1e Enhance CSS 2015-09-22 16:21:46 +02:00
Laurent Destailleur
58a734cb17 Firstname only on login 2015-09-21 17:28:11 +02:00
Laurent Destailleur
0821f18712 Merge remote-tracking branch 'origin/3.8' into develop 2015-09-18 21:50:10 +02:00
Laurent Destailleur
5f507cbbd8 Fix missing closing div making jmobile crazy 2015-09-18 20:23:06 +02:00
Laurent Destailleur
f72f652d98 FIX Pb into pagination scroll widget
FIX Style of previous-next card when using dolidroid
2015-09-18 15:51:27 +02:00
Laurent Destailleur
9cbd236c8c Merge remote-tracking branch 'origin/3.8' into develop
Conflicts:
	htdocs/filefunc.inc.php
2015-09-16 22:09:21 +02:00
BENKE Charlie
95cfce925f fix error on tabcollectors and enhance
fix error on tabcollectors feature
add number of tabs present in tab collectors
2015-09-15 03:33:27 +02:00
Laurent Destailleur
a5c6582bc1 Fix duplicate translation/encoding on setEventMessage
Conflicts:
	htdocs/ftp/index.php
2015-09-12 12:55:20 +02:00
Laurent Destailleur
c785f8cfb1 Fix duplicate translation/encoding on setEventMessage 2015-09-12 12:52:07 +02:00
Laurent Destailleur
24f7100562 Merge remote-tracking branch 'origin/3.8' into develop
Conflicts:
	htdocs/core/lib/memory.lib.php
2015-09-08 10:33:33 +02:00
Laurent Destailleur
82ad81fc03 Fix picto 2015-09-07 20:56:28 +02:00
Raphaël Doursenaud
1ffb28a460 Fixed mobile detect classname without autoloader 2015-09-04 19:06:04 +02:00
Raphaël Doursenaud
0eb0f52b6d Install mobiledetect from composer 2015-09-04 19:06:01 +02:00
Laurent Destailleur
7a78c9d704 Fix doxygen 2015-09-01 14:31:32 +02:00
BENKE Charlie
5ee00cf97b change made 2015-08-31 05:09:21 +02:00
Laurent Destailleur
9a6e13d253 Fix test if empty was inverted 2015-08-19 19:45:24 +02:00
Laurent Destailleur
52240eec9a Fix removed warnings 2015-08-15 02:44:05 +02:00
BENKE Charlie
daa68efdd3 Update functions.lib.php
better context change
2015-08-14 23:23:44 +02:00
BENKE Charlie
a3db26adfd Update functions.lib.php
change context init method
2015-08-14 19:13:13 +02:00
Laurent Destailleur
84d4cbdbcc Merge remote-tracking branch 'origin/3.7' into develop 2015-08-14 15:14:33 +02:00
Laurent Destailleur
343f4086bc Remove dead code 2015-08-14 15:12:40 +02:00
Laurent Destailleur
25e729cf4d Revert "Fix #3322 Use title for alt if no alt is provided"
This reverts commit 2cf9d9f583.
2015-08-12 23:18:07 +02:00
BENKE Charlie
6801504755 Update functions.lib.php
some bugs sorry
2015-08-11 23:51:02 +02:00
BENKE Charlie
049805e926 Update functions.lib.php
Div enough on sub-menu case (project/task)
2015-08-10 19:47:12 +02:00
Juanjo Menent
761c50a885 Merge remote-tracking branch 'origin/3.7' into 3.8 2015-08-06 18:22:29 +02:00
BENKE Charlie
187c40aca9 Update functions.lib.php 2015-08-06 18:20:09 +02:00
BENKE Charlie
f5d4cc5f89 Update functions.lib.php 2015-08-06 16:23:34 +02:00
BENKE Charlie
4709a51c84 Add number of collected tabs and hook/trigger
Add number of collected tabs 
Add trigger based on tabs name
add hook at end of tabs and at the footer of page
2015-08-05 15:19:00 +02:00
Raphaël Doursenaud
2cf9d9f583 Fix #3322 Use title for alt if no alt is provided
alt has priority over title, so it should be filled if title is filled.
Use the title value to fill alt.
Unit test updated accordingly.
2015-08-03 10:30:10 +02:00
Laurent Destailleur
747e4b5e40 Fix timezone problem with external calendar import. 2015-07-28 18:12:45 +02:00
Laurent Destailleur
cb98d6cb93 Merge remote-tracking branch 'origin/3.8' into develop 2015-07-19 15:32:20 +02:00
aspangaro
59e88590e0 Move my address email to new one 2015-07-15 20:30:33 +02:00
Laurent Destailleur
4d6ce2a1de Fix: Can't view thirdparties that are not customer nor prospect nor
supplier.
2015-07-15 12:42:50 +02:00
Laurent Destailleur
8eb4a208ce Debug statistics of project module 2015-07-05 22:04:30 +02:00
Laurent Destailleur
324d855b9c Still working on project module to uniformize way of working with other
modules
2015-07-04 18:20:17 +02:00
Laurent Destailleur
9c80735310 An easier to use dictionary page to edit email template.
Uniformize look.
2015-07-04 03:28:52 +02:00
Laurent Destailleur
4a1dfa60a5 Uniformize code 2015-06-30 13:14:19 +02:00
Laurent Destailleur
ae5b779652 Uniformize code 2015-06-30 01:34:17 +02:00
Laurent Destailleur
dc050d39eb Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
	build/makepack-dolibarr.pl
	htdocs/adherents/type.php
	htdocs/core/boxes/box_task.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.form.class.php
	htdocs/core/js/lib_batch.js
	htdocs/core/modules/modUser.class.php
	htdocs/fichinter/card.php
	htdocs/fourn/commande/card.php
	htdocs/societe/consumption.php
	htdocs/user/info.php
	htdocs/user/note.php
	htdocs/user/param_ihm.php
	htdocs/user/perms.php
2015-06-29 00:09:28 +02:00
Laurent Destailleur
9c99cae911 FIX XSS security using the onerror and missing escapement on type of
member page.
2015-06-28 23:32:38 +02:00
Laurent Destailleur
b6efa5ed11 NEW Can upload files on leave requests. Use more standard permissions. 2015-06-27 11:45:23 +02:00
Laurent Destailleur
5a8e763099 Uniformize code for hooks
Uniformize page name societe.php into list.php
2015-06-22 15:48:48 +02:00
Laurent Destailleur
230fd7a7e4 Debug withdraw module 2015-06-21 17:05:49 +02:00
Laurent Destailleur
7507a71121 Lenght of fields 2015-06-18 14:47:33 +02:00
Laurent Destailleur
6263e90ddb More info on contact popup 2015-06-14 17:38:28 +02:00
Laurent Destailleur
87e07a3038 Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
	ChangeLog
	htdocs/compta/bank/virement.php
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/product/card.php
	htdocs/societe/soc.php
2015-06-14 17:18:45 +02:00
Laurent Destailleur
a7cec18081 Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
	htdocs/categories/fiche.php
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/install/upgrade2.php
	htdocs/product/liste.php
2015-06-14 17:11:36 +02:00