Juanjo Menent
345b609ff0
Closes #2545 Bug: Missing object_margin.png in Amarok theme
2015-04-07 18:41:40 +02:00
Florian HENRY
092dd38851
FIX : [ bug #1916 ] problème d'icone pour l'état "clos" sur les projets
2015-04-03 15:33:41 +02:00
Laurent Destailleur
f264e25514
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
htdocs/adherents/liste.php
htdocs/compta/bank/bankid_fr.php
htdocs/holiday/index.php
htdocs/opensurvey/list.php
2014-09-13 19:10:05 +02:00
Florian HENRY
b536c8a10c
Add missing image into amarok theme
2014-09-03 10:24:41 +02:00
Laurent Destailleur
e82e26c6fa
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
ChangeLog
htdocs/compta/facture.php
htdocs/core/js/lib_head.js
2014-09-02 12:57:33 +02:00
Laurent Destailleur
c21b389462
Fix: Pb with focus position with ckeditor
2014-08-21 14:17:27 +02:00
Laurent Destailleur
e7a8de18bf
Fix: Minimum size for captcha
2014-08-17 15:05:42 +02:00
Laurent Destailleur
6b6b372579
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
htdocs/theme/eldy/graph-color.php
2014-08-15 02:28:16 +02:00
Laurent Destailleur
91900f54c2
Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5
2014-08-14 01:54:23 +02:00
Laurent Destailleur
387c123229
Fix: List of colors was too low.
2014-08-14 01:53:54 +02:00
Laurent Destailleur
6c316d0cda
Merge remote-tracking branch 'origin/3.5' into 3.6
2014-08-13 19:23:45 +02:00
Laurent Destailleur
bcc0f244f0
Fix: Used wrong image
2014-08-13 19:21:31 +02:00
Laurent Destailleur
0834178bf5
Add more colors to fix pb with agenda
2014-08-04 00:15:08 +02:00
Laurent Destailleur
db091896a5
Prepare 3.6.
...
Use google adsense tag of foundation for doxygen doc pages.
Version is no more encoded int odoxygen.
Merge remote-tracking branch 'origin/3.5' into 3.6
Conflicts:
ChangeLog
build/debian/changelog
build/doxygen/dolibarr-doxygen.doxyfile
build/exe/doliwamp/doliwamp.iss
build/makepack-dolibarr.pl
build/rpm/dolibarr_fedora.spec
build/rpm/dolibarr_generic.spec
build/rpm/dolibarr_mandriva.spec
build/rpm/dolibarr_opensuse.spec
htdocs/compta/facture/impayees.php
htdocs/filefunc.inc.php
2014-07-26 18:10:51 +02:00
Laurent Destailleur
a74b65df0e
Fix: Add max height to solve pb with very large logo.
2014-07-20 04:29:47 +02:00
Laurent Destailleur
ccca46f380
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/comm/propal.php
htdocs/comm/propal/list.php
htdocs/commande/fiche.php
htdocs/compta/facture.php
htdocs/core/lib/functions.lib.php
htdocs/expedition/note.php
htdocs/fourn/commande/liste.php
htdocs/fourn/facture/fiche.php
htdocs/main.inc.php
htdocs/projet/tasks/index.php
htdocs/theme/eldy/style.css.php
2014-05-29 19:20:48 +02:00
Laurent Destailleur
8dad341ed4
Fix: css
2014-05-27 00:57:34 +02:00
Laurent Destailleur
f34aadef3d
Fix: css
2014-05-23 21:06:53 +02:00
Laurent Destailleur
179583f79a
More info into comment
2014-05-13 18:30:51 +02:00
Laurent Destailleur
18848eaf74
Clean forms
2014-05-12 13:25:36 +02:00
Raphaël Doursenaud
f8f502d013
Removed closing php tag
...
http://php.net/manual/en/language.basic-syntax.phptags.php
2014-05-03 18:18:44 +02:00
Laurent Destailleur
ba9dc57912
Fix: Avoid wrapping
2014-04-27 01:49:57 +02:00
Laurent Destailleur
97fce71218
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/core/lib/functions2.lib.php
htdocs/install/mysql/migration/repair.sql
htdocs/langs/en_US/errors.lang
htdocs/product/fiche.php
htdocs/projet/tasks/task.php
2014-04-26 22:35:35 +02:00
Laurent Destailleur
c1e349d110
Experiment hidden option MAIN_MENU_INVERT
2014-04-23 12:22:01 +02:00
Laurent Destailleur
2b191b6ef8
Uniformization and simplification of code.
2014-04-22 23:49:33 +02:00
Laurent Destailleur
76b5659d4c
Optimize for small screen
2014-04-22 00:04:31 +02:00
philippe
2ffe4f589e
style enhancement
2014-04-18 10:54:21 +02:00
Laurent Destailleur
262efb997f
Fix: paddingrightonly must use $right and $left to be compatible with
...
LTR languages.
2014-04-02 18:45:59 +02:00
Laurent Destailleur
b675b9b610
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/comm/action/fiche.php
htdocs/core/class/conf.class.php
htdocs/core/class/html.form.class.php
htdocs/core/lib/company.lib.php
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
htdocs/fourn/facture/fiche.php
htdocs/langs/en_US/admin.lang
htdocs/margin/agentMargins.php
htdocs/margin/customerMargins.php
htdocs/margin/productMargins.php
htdocs/projet/tasks/task.php
2014-03-31 00:44:45 +02:00
Laurent Destailleur
c506e59d8c
Look: Minor fix to not have calendar picto to glue to input
2014-03-30 15:58:41 +02:00
Laurent Destailleur
0ca250c6d9
Minor css fixes.
2014-03-29 05:02:02 +01:00
Laurent Destailleur
81b8961dab
Qual: Dead code war
2014-03-17 11:13:53 +01:00
Laurent Destailleur
932b421d1d
Merge remote-tracking branch 'origin/3.5' into develop
2014-03-11 09:46:51 +01:00
Laurent Destailleur
21bf279248
Fix: css
2014-03-10 16:17:55 +01:00
Laurent Destailleur
7071e233d3
Fix css for ckeditor 4.
2014-03-08 13:36:42 +01:00
Laurent Destailleur
2c0f1340d5
New: Update ckeditor to version 4 (part 2)
2014-03-08 13:17:20 +01:00
Laurent Destailleur
24b0ea6613
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
build/makepack-dolibarr.pl
htdocs/comm/propal.php
htdocs/compta/facture.php
htdocs/fourn/class/fournisseur.commande.class.php
2014-03-03 19:38:02 +01:00
Laurent Destailleur
8bd72cc21f
Fix: wrapping into combo
2014-03-01 20:05:08 +01:00
Laurent Destailleur
480b09f192
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
ChangeLog
htdocs/comm/propal.php
htdocs/commande/fiche.php
htdocs/societe/class/societe.class.php
2014-02-26 15:49:29 +01:00
Laurent Destailleur
df2eb95882
Fix: Right to left support
2014-02-26 15:42:32 +01:00
Laurent Destailleur
0918fd21b0
Fix: Css errors
2014-02-26 14:48:53 +01:00
Laurent Destailleur
d4d69e41b1
Fix: Right to left support
2014-02-25 19:14:58 +01:00
Laurent Destailleur
7241714551
Merge pull request #1435 from marcosgdf/export-translations
...
Corrected export translations
2014-02-25 14:11:40 +01:00
Laurent Destailleur
8a71245186
Look: Use higher menu entries with jmobile.
2014-02-25 10:00:57 +01:00
Marcos García de La Fuente
4411908b23
Fixed translations of project export wizard
2014-02-25 04:18:13 +01:00
Laurent Destailleur
5a29b3d546
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/societe/soc.php
2014-02-19 15:37:48 +01:00
Laurent Destailleur
3a4161fdf7
Fix: css
2014-02-18 19:49:36 +01:00
Laurent Destailleur
05c4961a36
Better css
2014-02-12 00:10:49 +01:00
Laurent Destailleur
1b88ab2355
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/contact/class/contact.class.php
2014-01-31 10:12:41 +01:00
Laurent Destailleur
549f5c8426
Fix: Not existing file
2014-01-26 17:01:14 +01:00
