Laurent Destailleur
|
d87f14b7ce
|
Fix: minor change
|
2012-03-17 23:38:44 +01:00 |
|
Laurent Destailleur
|
8d1b9055b4
|
Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git
into develop
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/core/tpl/notes.tpl.php
|
2012-03-17 23:32:28 +01:00 |
|
Laurent Destailleur
|
21a1d47130
|
New: Can define if ckeditor is opened or not in editval
New: Can use a width of 100% in ckeditor
|
2012-03-17 23:27:53 +01:00 |
|
Laurent Destailleur
|
4c2da4f5fa
|
New: Can define if ckeditor is opened or not in editval
New: Can use a width of 100% in ckeditor
|
2012-03-17 23:11:25 +01:00 |
|
Laurent Destailleur
|
e5190a00c8
|
Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop
|
2012-03-17 21:32:32 +01:00 |
|
Laurent Destailleur
|
d59848e18e
|
New: Enhance box management
|
2012-03-17 21:32:10 +01:00 |
|
Regis Houssin
|
c41fd9c314
|
Fix: test with auguria
|
2012-03-17 18:38:34 +01:00 |
|
Regis Houssin
|
bd4b24f1eb
|
Fix: add <br> for default note tab
|
2012-03-17 18:27:31 +01:00 |
|
Regis Houssin
|
815ee68f8f
|
Fix: use div instead table
|
2012-03-17 18:10:59 +01:00 |
|
Regis Houssin
|
e8b40ab22c
|
Try to build table with div and css
|
2012-03-17 17:37:15 +01:00 |
|
Regis Houssin
|
281c6b7f2a
|
New: sharing code of contact and note tabs
|
2012-03-17 16:05:58 +01:00 |
|
Laurent Destailleur
|
1ddcd5ffb0
|
Prepare to allow to define nb of lines fox each box
|
2012-03-17 14:59:45 +01:00 |
|
Laurent Destailleur
|
da94f76364
|
New: When a module with boxes is activated, box is also activated by
default for everybody, except for users that had personlized their box
view.
|
2012-03-17 14:29:48 +01:00 |
|
Laurent Destailleur
|
1d51ee3aab
|
Perf: Reduce quantity of code for boxes.
|
2012-03-17 14:04:16 +01:00 |
|
Laurent Destailleur
|
88a1a0f06d
|
fix: Checkstyle
|
2012-03-17 14:03:31 +01:00 |
|
Regis Houssin
|
ffa3e2af09
|
Fix: remove trailing slash
|
2012-03-17 12:21:41 +01:00 |
|
Regis Houssin
|
d7c0eb1b85
|
Fix: remove conf dir
|
2012-03-17 12:15:41 +01:00 |
|
Regis Houssin
|
e16b1067cd
|
Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git
into develop
Conflicts:
htdocs/core/ajax/extraparams.php
|
2012-03-17 09:47:56 +01:00 |
|
Regis Houssin
|
181fac1d9d
|
Fix: End of line character is invalid; expected "\n" but found "\r\n"
|
2012-03-17 09:45:14 +01:00 |
|
Regis Houssin
|
938d0beccf
|
Fix: End of line character is invalid; expected "\n" but found "\r\n"
|
2012-03-17 09:30:49 +01:00 |
|
Regis Houssin
|
5e43b326fe
|
Try to avoid phpunit error
|
2012-03-17 09:08:54 +01:00 |
|
Regis Houssin
|
da4a29462e
|
Fix: php unit test error
|
2012-03-17 08:50:09 +01:00 |
|
Laurent Destailleur
|
d8becd3cdb
|
Doxygen
|
2012-03-17 01:13:10 +01:00 |
|
Laurent Destailleur
|
02cdd86066
|
Doxygen
|
2012-03-17 00:47:01 +01:00 |
|
Laurent Destailleur
|
a458ea3582
|
Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop
|
2012-03-17 00:23:17 +01:00 |
|
Laurent Destailleur
|
3f11e51fbb
|
Doxygen
|
2012-03-17 00:22:48 +01:00 |
|
Laurent Destailleur
|
4806f2ad54
|
New: Add webservice to get all product ids.
|
2012-03-16 23:06:38 +01:00 |
|
Regis Houssin
|
e84c77ba31
|
New: add template for infos and contacts tabs and show/hide bloc system
|
2012-03-16 22:02:14 +01:00 |
|
Regis Houssin
|
60a6c3fa95
|
Fix: missing fetch for get extraparams
|
2012-03-16 19:16:17 +01:00 |
|
Regis Houssin
|
81a97edf9c
|
Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop
|
2012-03-16 18:37:16 +01:00 |
|
Regis Houssin
|
205f884ec0
|
Fix: try to use div title with show/hide effect
|
2012-03-16 18:36:32 +01:00 |
|
Laurent Destailleur
|
826a5f80e9
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
|
2012-03-16 18:36:03 +01:00 |
|
Laurent Destailleur
|
aa195b9ecf
|
New: Add web service to list product. Not stable yet.
|
2012-03-16 18:35:39 +01:00 |
|
Regis Houssin
|
8ab71288a6
|
Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop
|
2012-03-16 17:40:41 +01:00 |
|
Regis Houssin
|
ccf1665837
|
Fix: missing status after set draft
|
2012-03-16 17:37:18 +01:00 |
|
Regis Houssin
|
5de859d14b
|
Fix: missing colspan if view line number is active
|
2012-03-16 17:26:19 +01:00 |
|
Regis Houssin
|
fb38bba794
|
Merge pull request #133 from simnandez/develop
Trad: Add ca_ES and es_ES missing translations
|
2012-03-16 09:01:27 -07:00 |
|
Regis Houssin
|
b862b37731
|
New: update CKEditor to 3.6.2
|
2012-03-16 16:56:18 +01:00 |
|
simnandez
|
017701b3f1
|
Trad: Add ca_ES and es_ES missing translations
|
2012-03-16 16:33:27 +01:00 |
|
Regis Houssin
|
09e6867029
|
New: add view/edit notes in "deplacement" and "fichinter" cards
|
2012-03-16 16:01:45 +01:00 |
|
Regis Houssin
|
77de410491
|
Fix: doxygen
|
2012-03-16 14:41:22 +01:00 |
|
Regis Houssin
|
5a0ee19a0b
|
Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop
|
2012-03-16 14:33:03 +01:00 |
|
Regis Houssin
|
391ce8490f
|
New: add "extraparams" field for stock extra parameters with json
|
2012-03-16 14:32:37 +01:00 |
|
Laurent Destailleur
|
e27bdac81a
|
Fix: Restore correct name of field.
|
2012-03-16 13:27:03 +01:00 |
|
Laurent Destailleur
|
a0f6d5824d
|
Fix: Better warning message. To lock install, recommanded solution is having an install.lock file, not deleting directory.
|
2012-03-16 11:23:53 +01:00 |
|
Regis Houssin
|
1622a86d71
|
New: possibility to view/edit notes in invoice card
|
2012-03-16 11:12:59 +01:00 |
|
Laurent Destailleur
|
7e69c79a29
|
Comments
|
2012-03-16 11:08:04 +01:00 |
|
Regis Houssin
|
0df083a8d8
|
Fix: update security
|
2012-03-16 10:55:29 +01:00 |
|
Regis Houssin
|
88d5cbc678
|
New: possibility to view/edit notes in order card
|
2012-03-16 09:46:21 +01:00 |
|
Regis Houssin
|
ae54a229fb
|
Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop
|
2012-03-16 09:39:45 +01:00 |
|