Commit Graph

4868 Commits

Author SHA1 Message Date
Laurent Destailleur
d6e907b69b Fix: Nb of holidays was not using correct user 2013-02-17 19:26:33 +01:00
Laurent Destailleur
2bad9c0d9a Fix: Nb of holidays was not using correct user 2013-02-17 19:25:55 +01:00
Laurent Destailleur
249a03dd57 Merge pull request #659 from jfefe/extrafields
Work on extrafields
2013-02-16 14:19:24 -08:00
Laurent Destailleur
2ea62073b6 Merge pull request #660 from grandoc/develop
fix : doesn't work with a /
2013-02-16 14:14:30 -08:00
Laurent Destailleur
b1ee14ce60 New: Can define a hierarchical responsible on users. 2013-02-15 18:39:27 +01:00
Grand Philippe
cddd59d98d fix : doesnt work with a \/ 2013-02-15 14:23:35 +01:00
jfefe
14f21bc9f1 Add select list in extrafields type 2013-02-15 00:17:42 +01:00
Laurent Destailleur
031bc911ea Fix: Mass save or update of const fails. 2013-02-13 16:47:25 +01:00
Laurent Destailleur
f869004b95 Fix: Mass save or update of const fails. 2013-02-13 16:46:28 +01:00
Laurent Destailleur
6bbac00c22 Merge remote-tracking branch 'origin/3.3' into develop
Conflicts:
	htdocs/holiday/class/holiday.class.php
	htdocs/user/fiche.php
2013-02-12 15:17:22 +01:00
Laurent Destailleur
4c936ffffd Merge pull request #645 from FHenry/dev_contactcombox
Task [ task #711 ]
2013-02-12 06:08:04 -08:00
Laurent Destailleur
8a72ff8fc2 Fix: bad translation 2013-02-12 14:48:51 +01:00
Laurent Destailleur
112526e8b1 Fix: bad translation 2013-02-12 14:48:12 +01:00
fhenry
d8d4b669ab Task [ task #711 ] 2013-02-12 09:49:27 +01:00
Laurent Destailleur
4d9f22c909 Renamed "Salvador" into "El Salvador" 2013-02-10 22:09:25 +01:00
Grand Philippe
b492c7e754 fix some translations 2013-02-04 09:53:42 +01:00
simnandez
a9de14c145 Trad: Add missing translations 2013-02-01 17:49:41 +01:00
simnandez
7134ab5594 Trad: Add missing translations 2013-02-01 09:28:02 +01:00
Laurent Destailleur
c2d334624b Qual: Simplify system for menu manager. Only one file, one class per
manager.
2013-01-25 17:44:23 +01:00
Laurent Destailleur
d411310651 Trad 2013-01-19 17:58:20 +01:00
Laurent Destailleur
2b8aa54f68 Merge remote-tracking branch 'origin/3.3' into develop 2013-01-17 10:32:49 +01:00
simnandez
e820e62c03 Trad: Best ca_ES and es_ES translations 2013-01-16 18:19:48 +01:00
Laurent Destailleur
6a51db82e9 Qual: We can enable box by default because a warning is output to user. 2013-01-15 15:53:35 +01:00
fhenry
51098c1227 Add standard extrafield type :
- mail
	- phone
	- price
2013-01-14 16:13:09 +01:00
Laurent Destailleur
29e6d01e51 Merge remote-tracking branch 'origin/3.3' into develop
Conflicts:
	htdocs/core/tpl/freeproductline_create.tpl.php
	htdocs/core/tpl/predefinedproductline_create.tpl.php
2013-01-13 19:33:54 +01:00
fhenry
d39368fd36 Add boolean (checkbox) standard extrafield feature 2013-01-12 14:02:39 +01:00
Laurent Destailleur
275cecccbc Merge pull request #587 from marcosgdf/translations
Fixed problems with translations
2013-01-10 12:09:45 -08:00
Laurent Destailleur
de03f57620 Fix: Translation 2013-01-10 18:02:06 +01:00
Regis Houssin
9a305c9066 New: add date format with second 2013-01-10 06:13:02 +01:00
Marcos García
a1e17978d1 Little es_ES typo (again) 2013-01-09 21:24:40 +01:00
Marcos García
7b1aed65cf Little es_ES typo 2013-01-09 21:23:50 +01:00
Marcos García
3f42c198db Little typo in es_ES translation 2013-01-09 20:53:28 +01:00
Laurent Destailleur
5c51905f63 Merge remote-tracking branch 'origin/3.3' into develop 2013-01-09 19:15:51 +01:00
Laurent Destailleur
24b50b8ed3 Fix: Example an label of category import 2013-01-09 13:29:12 +01:00
Laurent Destailleur
64d2a662de Merge pull request #582 from marcosgdf/translations
Improvements in translations
2013-01-08 14:03:52 -08:00
Regis Houssin
dd08da6ea8 Merge pull request #583 from FHenry/develop
[ task #664 ] Add extrafields behaviours to Member Type
2013-01-08 10:58:46 -08:00
fhenry
23b2aa6a7b [ task #664 ] Add extrafields behaviours to Member Type 2013-01-08 19:16:39 +01:00
Laurent Destailleur
db0aa49cad Merge remote-tracking branch 'origin/3.3' into develop 2013-01-08 18:37:59 +01:00
Laurent Destailleur
334b5b5dac Fix: Minor fix 2013-01-08 18:31:55 +01:00
Marcos García
ae98ebc793 There is no need to warn the user as the picto already does 2013-01-08 12:14:11 +01:00
eldy
2c59c6311f Merge remote-tracking branch 'origin/3.3' into develop 2013-01-06 21:36:39 +01:00
Marcos García
ad5d2c3459 Added missing translations, improved es_ES translations and translated untranslated text in modules admin page 2013-01-05 19:23:16 +01:00
Laurent Destailleur
5f99488c99 Merge remote-tracking branch 'origin/3.3' into develop
Conflicts:
	htdocs/langs/es_ES/admin.lang
2013-01-05 16:41:08 +01:00
Marcos García
5bf93ca41a Added missing es_ES translation & fixed typo 2013-01-04 23:56:22 +01:00
Marcos García
d27519338a Added missing translations
Reverted removal of strings in PR #570
Added missing strings to en_US
2013-01-04 22:34:55 +01:00
simnandez
a585d8b455 Trad: Add missing ca_ES and es_ES translations 2013-01-04 20:54:31 +01:00
simnandez
b9ec558501 Trad: Add missing ca_ES and es_ES translations 2013-01-04 16:13:03 +01:00
Laurent Destailleur
96416735df Fix: [ bug #618 ] External accounts can access confidential informations
(a lot)
2013-01-02 18:43:59 +01:00
Laurent Destailleur
cd6e3464db Fix: Several fixes for bad management of external/internal users. 2013-01-02 14:35:16 +01:00
Marcos García
674034e648 Translated some strings in the code 2012-12-31 05:55:06 +01:00