simnandez
|
c9fd070bba
|
Fix: Amarok Tab visu.
|
2013-07-02 18:53:42 +02:00 |
|
Laurent Destailleur
|
cb68924f34
|
Merge remote-tracking branch 'origin/3.4' into develop
Conflicts:
scripts/invoices/email_unpaid_invoices_to_customers.php
scripts/invoices/email_unpaid_invoices_to_representatives.php
|
2013-07-02 01:10:06 +02:00 |
|
Laurent Destailleur
|
154daa0657
|
Fix: css
|
2013-07-01 21:52:09 +02:00 |
|
Laurent Destailleur
|
606b60b17c
|
Minor fixes into css
|
2013-06-29 04:01:54 +02:00 |
|
Laurent Destailleur
|
4b00da5fa8
|
Work on boxes with graph
|
2013-06-29 02:23:23 +02:00 |
|
Laurent Destailleur
|
ee8f3cbbe5
|
Fix: css when using checkbox into label
|
2013-06-28 17:50:10 +02:00 |
|
Laurent Destailleur
|
f02fa8a41d
|
Fix: css when using checkbox into label
|
2013-06-26 17:58:34 +02:00 |
|
Laurent Destailleur
|
9a5b55219a
|
Fix: CSS
|
2013-06-26 14:40:29 +02:00 |
|
Laurent Destailleur
|
1de8ab3785
|
Fix: CSS
|
2013-06-26 14:38:56 +02:00 |
|
Laurent Destailleur
|
5f67142fc1
|
Start prototype for datatable
|
2013-06-26 11:58:01 +02:00 |
|
Laurent Destailleur
|
8311b83861
|
Fix: css
|
2013-06-26 11:41:18 +02:00 |
|
Laurent Destailleur
|
882d34fa88
|
Fix: css
|
2013-06-26 11:40:29 +02:00 |
|
Laurent Destailleur
|
1d8b9949d6
|
Merge remote-tracking branch 'origin/3.4' into develop
Conflicts:
htdocs/compta/bank/annuel.php
htdocs/compta/bank/categ.php
htdocs/compta/bank/releve.php
htdocs/core/class/hookmanager.class.php
htdocs/core/class/html.formfile.class.php
htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
htdocs/core/tpl/contacts.tpl.php
htdocs/cron/list.php
htdocs/main.inc.php
htdocs/public/paybox/paymentko.php
htdocs/public/paybox/paymentok.php
htdocs/public/paypal/paymentko.php
htdocs/public/paypal/paymentok.php
htdocs/theme/bureau2crea/style.css.php
htdocs/theme/eldy/style.css.php
htdocs/user/class/user.class.php
htdocs/viewimage.php
|
2013-06-24 20:02:02 +02:00 |
|
Laurent Destailleur
|
eb07c6b2e7
|
Fix: Missing left padding
|
2013-06-24 19:45:29 +02:00 |
|
Regis Houssin
|
4cd6ae6bbd
|
Fix: convert lines delimiters
|
2013-06-24 17:36:33 +02:00 |
|
Regis Houssin
|
05bd035488
|
Fix: convert line delimiters
|
2013-06-24 17:34:22 +02:00 |
|
Laurent Destailleur
|
7bfdec7993
|
Fix: css
|
2013-06-23 18:53:40 +02:00 |
|
Laurent Destailleur
|
db48acddb4
|
Fix: css
|
2013-06-23 18:51:49 +02:00 |
|
Laurent Destailleur
|
e1bb3bafb7
|
Fix: css
|
2013-06-23 18:01:10 +02:00 |
|
Laurent Destailleur
|
1d2f09688e
|
Merge remote-tracking branch 'origin/3.4' into develop
|
2013-06-23 14:38:33 +02:00 |
|
Laurent Destailleur
|
3662638064
|
Fix: Css for fieldset
|
2013-06-23 14:37:09 +02:00 |
|
Laurent Destailleur
|
355c770f97
|
Merge remote-tracking branch 'origin/3.4' into develop
|
2013-06-23 13:04:00 +02:00 |
|
Laurent Destailleur
|
f2c268f72c
|
Fix: Missing theme for autofill
|
2013-06-23 12:43:06 +02:00 |
|
Laurent Destailleur
|
570275cd76
|
Merge remote-tracking branch 'origin/3.4' into develop
Conflicts:
htdocs/langs/fr_FR/admin.lang
htdocs/langs/fr_FR/opensurvey.lang
htdocs/opensurvey/public/index.php
|
2013-06-21 15:37:17 +02:00 |
|
Laurent Destailleur
|
a1f9b22210
|
Fix: Missing icon
|
2013-06-20 16:21:54 +02:00 |
|
Laurent Destailleur
|
a749e2bfaa
|
Fix: Still working on css debug. bureau2crea and cameleo are too
bugged. I disable them with jmobile to have things working correctly.
Conflicts:
htdocs/theme/bureau2crea/style.css.php
|
2013-06-20 16:20:31 +02:00 |
|
Laurent Destailleur
|
b477272082
|
Fix: Still working on css debug. bureau2crea and cameleo are too
bugged. I disable them with jmobile to have things working correctly.
|
2013-06-20 16:13:42 +02:00 |
|
Laurent Destailleur
|
09317e2034
|
Fix: Pb with firstname/lastname and font size
|
2013-06-19 18:12:05 +02:00 |
|
Laurent Destailleur
|
0b53f72779
|
Fix: Pb with firstname/lastname and font size
|
2013-06-19 18:08:05 +02:00 |
|
Laurent Destailleur
|
5cb2ba3909
|
Several fixes in CSS
Conflicts:
htdocs/core/menus/standard/empty.php
|
2013-06-19 17:02:09 +02:00 |
|
Laurent Destailleur
|
9bd41e94b5
|
Fix: Pb in css
|
2013-06-19 17:00:01 +02:00 |
|
Laurent Destailleur
|
850ee5e195
|
Several fixes in CSS
|
2013-06-19 16:59:03 +02:00 |
|
Laurent Destailleur
|
51d40b94cc
|
Fix: Pb in css
|
2013-06-19 15:52:06 +02:00 |
|
Laurent Destailleur
|
d32b36ce29
|
Fix: css with jmobile
|
2013-06-19 14:04:25 +02:00 |
|
Laurent Destailleur
|
dcaaa84ddb
|
Fix: css with jmobile
|
2013-06-19 14:03:54 +02:00 |
|
Laurent Destailleur
|
8410ad1933
|
Fix: CSS
|
2013-06-16 12:03:27 +02:00 |
|
Laurent Destailleur
|
b9a1a3e096
|
Fix: CSS
|
2013-06-16 12:00:18 +02:00 |
|
Laurent Destailleur
|
499440be16
|
Merge remote-tracking branch 'origin/3.4' into develop
|
2013-06-14 01:29:43 +02:00 |
|
Laurent Destailleur
|
9ff6b4c23e
|
Fix: Too large top
|
2013-06-14 00:46:02 +02:00 |
|
Laurent Destailleur
|
8757fc1dba
|
Fix: css pb with jmobile
|
2013-06-13 21:43:19 +02:00 |
|
Laurent Destailleur
|
93c71d00f7
|
Merge remote-tracking branch 'origin/3.4' into develop
Conflicts:
htdocs/comm/mailing/cibles.php
htdocs/core/class/hookmanager.class.php
|
2013-06-12 22:17:15 +02:00 |
|
Laurent Destailleur
|
c7868e2471
|
Fix: css
|
2013-06-12 21:57:09 +02:00 |
|
Laurent Destailleur
|
4326bfb606
|
Merge remote-tracking branch 'origin/3.4' into develop
Conflicts:
htdocs/langs/tr_TR/admin.lang
htdocs/langs/tr_TR/agenda.lang
htdocs/langs/tr_TR/banks.lang
htdocs/langs/tr_TR/bills.lang
htdocs/langs/tr_TR/bookmarks.lang
htdocs/langs/tr_TR/boxes.lang
htdocs/langs/tr_TR/cashdesk.lang
htdocs/langs/tr_TR/categories.lang
htdocs/langs/tr_TR/commercial.lang
htdocs/langs/tr_TR/companies.lang
htdocs/langs/tr_TR/compta.lang
htdocs/langs/tr_TR/contracts.lang
htdocs/langs/tr_TR/deliveries.lang
htdocs/langs/tr_TR/dict.lang
htdocs/langs/tr_TR/donations.lang
htdocs/langs/tr_TR/ecm.lang
htdocs/langs/tr_TR/errors.lang
htdocs/langs/tr_TR/exports.lang
htdocs/langs/tr_TR/externalsite.lang
htdocs/langs/tr_TR/ftp.lang
htdocs/langs/tr_TR/help.lang
htdocs/langs/tr_TR/holiday.lang
htdocs/langs/tr_TR/install.lang
htdocs/langs/tr_TR/interventions.lang
htdocs/langs/tr_TR/languages.lang
htdocs/langs/tr_TR/ldap.lang
htdocs/langs/tr_TR/mailmanspip.lang
htdocs/langs/tr_TR/mails.lang
htdocs/langs/tr_TR/main.lang
htdocs/langs/tr_TR/margins.lang
htdocs/langs/tr_TR/members.lang
htdocs/langs/tr_TR/orders.lang
htdocs/langs/tr_TR/oscommerce.lang
htdocs/langs/tr_TR/other.lang
htdocs/langs/tr_TR/paybox.lang
htdocs/langs/tr_TR/paypal.lang
htdocs/langs/tr_TR/products.lang
htdocs/langs/tr_TR/projects.lang
htdocs/langs/tr_TR/propal.lang
htdocs/langs/tr_TR/sendings.lang
htdocs/langs/tr_TR/shop.lang
htdocs/langs/tr_TR/sms.lang
htdocs/langs/tr_TR/stocks.lang
htdocs/langs/tr_TR/suppliers.lang
htdocs/langs/tr_TR/trips.lang
htdocs/langs/tr_TR/users.lang
htdocs/langs/tr_TR/withdrawals.lang
htdocs/langs/tr_TR/workflow.lang
|
2013-06-11 10:43:36 +02:00 |
|
Laurent Destailleur
|
9ce993fada
|
Fix: skin
|
2013-06-10 19:18:36 +02:00 |
|
Laurent Destailleur
|
56d8807e92
|
Fix logo after renaming menu
|
2013-06-10 16:32:44 +02:00 |
|
Laurent Destailleur
|
4083d9a819
|
Merge remote-tracking branch 'origin/3.4' into develop
|
2013-06-06 09:49:54 +02:00 |
|
Laurent Destailleur
|
bf8fd7d34f
|
Fix: CSS
|
2013-06-06 09:42:39 +02:00 |
|
Laurent Destailleur
|
8e13c4eddf
|
Merge remote-tracking branch 'origin/3.4' into develop
|
2013-06-05 22:11:28 +02:00 |
|
Laurent Destailleur
|
56f9d8f50c
|
Fix: missing style
|
2013-06-05 22:10:43 +02:00 |
|
Laurent Destailleur
|
52407f88c4
|
Merge remote-tracking branch 'origin/3.4' into develop
|
2013-06-05 21:59:23 +02:00 |
|