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
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
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
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
Regis Houssin
356409bd72
Fix: add json_decode function for old PHP
2011-11-05 12:45:13 +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
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
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
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
Laurent Destailleur
ee92964ef7
Security: Fix more security holes
2011-11-02 22:15:59 +01:00
Laurent Destailleur
074939b4ff
Security: A lot of security fixes
2011-11-02 20:17:55 +01:00
Laurent Destailleur
e6d27e0731
Doxygen
2011-11-02 14:15:44 +01:00
Laurent Destailleur
e764f2137d
Doxygen
2011-11-02 14:14:46 +01:00
Laurent Destailleur
4c95c486f6
Qual: Removed hardcoded code for external module. Replaced by hook.
2011-11-01 18:36:06 +01:00
Regis Houssin
7bb76a8cb2
Fix: translation
2011-11-01 15:18:33 +01:00
Laurent Destailleur
2996ee7639
New: Add trigger ACTION_DELETE and ACTION_MODIFY
...
Fix: LOG_ERROR must be LOG_ERR
2011-11-01 13:22:39 +01:00
Laurent Destailleur
28d6fc03f9
New: Add ref_ext on actions
2011-11-01 04:58:47 +01:00
Laurent Destailleur
ecb6c1e67d
Fix: DST is correctly detected
2011-11-01 04:57:45 +01:00
Laurent Destailleur
b8e73966f2
Fix: Usage of FirePHP does not erase set_include_path done
2011-11-01 02:31:33 +01:00
Regis Houssin
9f4ab4c1b1
Fix: css problem
...
New: add change year and month in jQuery datepicker
2011-10-31 18:38:17 +01:00
Regis Houssin
d9eb4cbeb9
New: add edit in place with ckeditor
...
Fix: remove unused jQuery plugin ckeip
2011-10-31 16:57:10 +01:00
Regis Houssin
419eb248c1
Fix: add generic edit in place select input
2011-10-31 14:34:11 +01:00
Regis Houssin
44c4a16c9f
Add load method for type of fees
2011-10-31 11:49:47 +01:00
Regis Houssin
2aaf7552c0
Fix: optimize code
2011-10-31 10:21:32 +01:00
Laurent Destailleur
a7fbe00d4e
Fix: type must be text/javascript
2011-10-31 01:03:59 +01:00
Laurent Destailleur
6a13f0bfeb
Support log level with FirePHP
2011-10-31 00:55:58 +01:00
Laurent Destailleur
3d3c7a2223
Set day of week
2011-10-31 00:32:55 +01:00
Laurent Destailleur
d0711215ab
Complete locales
2011-10-30 23:51:07 +01:00
Laurent Destailleur
410efe0427
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2011-10-30 23:46:58 +01:00
Laurent Destailleur
c3aafe05a8
Merge branch 'develop' of ssh://github.com/Dolibarr/dolibarr into develop
...
Conflicts:
htdocs/core/js/datepicker.js.php
2011-10-30 23:43:39 +01:00
Laurent Destailleur
a508d18693
Set other locales.
2011-10-30 19:38:01 +01:00
Regis Houssin
64f3401658
Fix: translation
...
Fix: remove translation treatment
2011-10-30 19:29:11 +01:00
Regis Houssin
a20a83fce6
Fix: use another method
2011-10-30 19:05:01 +01:00
Regis Houssin
41f265d8be
Add TODO for add specific parameters for country
2011-10-30 18:59:36 +01:00
Laurent Destailleur
0c3e604de0
Fix: Missing closing db
2011-10-30 18:58:30 +01:00
Regis Houssin
a08352633d
Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop
2011-10-30 18:56:16 +01:00
Regis Houssin
3daf797d3f
Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop
2011-10-30 18:55:07 +01:00
Laurent Destailleur
5f6b52a7e5
Force charset
2011-10-30 18:55:00 +01:00
Laurent Destailleur
ef0fac8000
Force type javascript
2011-10-30 18:48:40 +01:00