Regis Houssin
1b1bb551d9
Fix: Perl-style comments are not allowed. Use "// Comment." or "/*
...
comment */" instead.
2011-11-06 10:11:23 +01:00
Regis Houssin
38c4c88b5f
Fix: Avoid function calls in a FOR loop test part
2011-11-06 10:00:45 +01:00
Regis Houssin
75ed344520
Fix: invalid EOL char
2011-11-06 09:51:55 +01:00
Laurent Destailleur
2240f5db44
Fix: Localisation of prices
2011-11-06 00:40:42 +01:00
Regis Houssin
029c405b7d
Fix: hide edit in place icon if MAIN_EDIT_ALSO_INLINE is not defined
2011-11-06 00:14:08 +01:00
Laurent Destailleur
6d0f72dfed
Look: Uniformize buttons
2011-11-05 23:22:32 +01:00
Laurent Destailleur
40da2e23d2
Qual: Reduce sub-options of module fckeditor. This make code cleaner
...
and all this duplicated options were useless.
2011-11-05 23:18:49 +01:00
Regis Houssin
995e07041a
Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop
2011-11-05 22:32:43 +01:00
Regis Houssin
94b393e760
Fix: show icon if edit in place is possible
2011-11-05 22:32:25 +01:00
Laurent Destailleur
5de1db527c
Fix: Autocalculate rows and cols
2011-11-05 22:20:02 +01:00
Laurent Destailleur
c9b7bdf22f
Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git
...
into develop
Conflicts:
htdocs/compta/deplacement/fiche.php
2011-11-05 21:47:41 +01:00
Laurent Destailleur
06c5f3427c
New: There is now two "inline edit" solution: Solution 1 use jquery
...
and is enabled if MAIN_USE_JQUERY_JEDITABLE is on. Solution 2 use a link
"edit field" on resubmit page for eache field (this is by default). And
we are ready to add more.
New: Add also option MAIN_EDIT_ALSO_INLINE. Goal of this option is to
say: Even if this field can be edited by a global edit form, we allow
field to be edited with the "inline edit" feature (whatever is the
inline edit solution active). This option is to keep the standard
behaviour "We must click a "modify" button to allow to edit globally all
fields at once working and have only this way. If option is on, we can
also use the inlinde edit. If off, inline edit is available only for
fields not included into a global "modify" form.
line
2011-11-05 21:24:55 +01:00
Regis Houssin
fd49fc97c8
Fix: bad function name
2011-11-05 19:44:48 +01:00
Laurent Destailleur
2b9285384c
Merge editfield and editInPlace
2011-11-05 18:25:04 +01:00
Laurent Destailleur
cf365593dc
Qual: Revert parameter order (optionnal at end)
2011-11-05 15:43:07 +01:00
Laurent Destailleur
3f30cebce3
Qual: Prepare to merge editfield and editInPlace
2011-11-05 15:12:37 +01:00
Laurent Destailleur
cd514693c5
Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop
2011-11-05 13:23:22 +01:00
Laurent Destailleur
c60a2ff76f
Fix: new lines not correctly outputed
2011-11-05 13:22:00 +01:00
Laurent Destailleur
f16b751642
Fix: Missing menu icons
2011-11-05 13:11:10 +01:00
Regis Houssin
356409bd72
Fix: add json_decode function for old PHP
2011-11-05 12:45:13 +01:00
Laurent Destailleur
fd9e0d8643
Qual: Removed code that must be stored into external modules
2011-11-05 12:34:54 +01:00
Laurent Destailleur
97573659c2
Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop
2011-11-05 03:18:19 +01:00
Laurent Destailleur
c819b3b87c
Fix: Must work with PHP 5.*
2011-11-05 03:15:35 +01:00
Laurent Destailleur
de8018a5f0
Fix: Error management
2011-11-05 03:15:11 +01:00
Regis Houssin
4482c6ac0a
Fix: change for external modules
...
Fix: add osx files in gitignore
2011-11-05 00:24:13 +08:00
Regis Houssin
4dc318c9fd
Fix: translation
2011-11-04 11:09:13 +01:00
Regis Houssin
9be80725d0
Fix: increase size of fields
2011-11-04 10:22:14 +01:00
Regis Houssin
6bbc1a1a77
Fix: move transverse mode parameters in conf.php
2011-11-04 09:09:53 +01:00
Regis Houssin
0c5648dd6f
Fix: indent
2011-11-04 08:29:10 +01:00
Regis Houssin
1b568deaf6
Fix: avoid warning
2011-11-04 08:21:47 +01:00
Laurent Destailleur
61fc8b6081
Fix: Wrong field
2011-11-04 02:53:31 +01:00
Laurent Destailleur
68ece6228b
Fix admin login creation
2011-11-04 02:00:19 +01:00
Laurent Destailleur
fbdb483510
Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop
2011-11-04 00:28:53 +01:00
Laurent Destailleur
c16c09a451
Qual: Mutualize code to delete previews
2011-11-04 00:27:30 +01:00
Regis Houssin
7c54bf489d
Fix: problem with multicompany
2011-11-03 18:39:06 +01:00
Regis Houssin
42e608bd63
Fix: chmod 644
2011-11-03 18:03:52 +01:00
Regis Houssin
fdaadc31da
Fix: uniform code
...
Fix: entity filter
2011-11-03 17:38:04 +01:00
Regis Houssin
832b78911c
Fix: optimize code
2011-11-03 11:49:22 +01:00
Regis Houssin
ea94610492
Fix: security
...
Add another restriction
2011-11-03 10:35:52 +01:00
Regis Houssin
9cc3bf0f87
Fix: security
...
"javascript" is not necessary for send javascript code
2011-11-03 10:07:09 +01:00
Laurent Destailleur
d872f4d389
Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop
2011-11-03 02:02:50 +01:00
Laurent Destailleur
7f0cca8fb9
Look: Enhancements into themes.
2011-11-03 01:59:13 +01:00
Laurent Destailleur
9444e8d63d
Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git
...
into develop
Conflicts:
htdocs/admin/boxes.php
htdocs/admin/ihm.php
htdocs/core/lib/usergroups.lib.php
htdocs/main.inc.php
2011-11-02 22:51:52 +01:00
Laurent Destailleur
253a21eb33
Perf: Little optimization
2011-11-02 22:41:34 +01:00
Laurent Destailleur
ee92964ef7
Security: Fix more security holes
2011-11-02 22:15:59 +01:00
Juanjo Menent
2f7365043c
Fix: [bug 227] LocalTaxes: Suppliers calculate problem
2011-11-02 21:06:21 +01:00
Regis Houssin
0c8e4b8f1b
Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git
...
into develop
Conflicts:
htdocs/user/index.php
htdocs/user/info.php
htdocs/user/note.php
htdocs/user/param_ihm.php
2011-11-02 20:29:27 +01:00
Regis Houssin
921a379740
Fix: security
2011-11-02 20:24:51 +01:00
Laurent Destailleur
7f4944da31
Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop
2011-11-02 20:18:48 +01:00
Laurent Destailleur
074939b4ff
Security: A lot of security fixes
2011-11-02 20:17:55 +01:00
