Commit Graph

679 Commits

Author SHA1 Message Date
Marcos García de La Fuente
fb8ec21f72 Updated puphpet vagrant box 2014-02-24 21:42:40 +01:00
Marcos García de La Fuente
cb90181719 Updated doc and removed incompatible .vimrc file 2014-02-16 02:16:17 +01:00
Marcos García de La Fuente
e562930cc2 Corrected Vagrant box URL 2014-02-16 01:00:18 +01:00
Laurent Destailleur
46e9b5d550 Merge branch 'develop' of https://github.com/grandoc/dolibarr into
grandoc-develop

Conflicts:
	htdocs/langs/ar_SA/admin.lang
	htdocs/langs/el_GR/admin.lang
	htdocs/langs/es_ES/admin.lang
	htdocs/langs/nl_NL/admin.lang
	htdocs/langs/tr_TR/admin.lang
2014-02-10 01:30:48 +01:00
Laurent Destailleur
f6f6022b7a Add eu_ES language. 2014-02-08 03:44:53 +01:00
Laurent Destailleur
e22e4fc4d7 Sync from transifex 2014-02-05 23:10:44 +01:00
Laurent Destailleur
8d8e016115 Merge remote-tracking branch 'origin/3.5' into develop 2014-01-20 02:42:37 +01:00
Laurent Destailleur
0d18892506 Merge from 3.4 2014-01-20 02:21:30 +01:00
Marcos García de La Fuente
5f3d2aea51 Opensurvey polls tab cards can now be extended from external modules 2014-01-02 16:32:48 +01:00
Laurent Destailleur
eadccb5d9b Merge remote-tracking branch 'origin/3.5' into develop
Conflicts:
	htdocs/langs/bg_BG/main.lang
	htdocs/langs/el_GR/cron.lang
	htdocs/langs/el_GR/help.lang
	htdocs/langs/el_GR/main.lang
	htdocs/langs/el_GR/margins.lang
	htdocs/langs/el_GR/stocks.lang
	htdocs/langs/el_GR/suppliers.lang
	htdocs/langs/et_EE/admin.lang
	htdocs/langs/et_EE/agenda.lang
	htdocs/langs/et_EE/banks.lang
	htdocs/langs/et_EE/bills.lang
	htdocs/langs/et_EE/commercial.lang
	htdocs/langs/et_EE/companies.lang
	htdocs/langs/et_EE/compta.lang
	htdocs/langs/et_EE/dict.lang
	htdocs/langs/et_EE/help.lang
	htdocs/langs/et_EE/main.lang
	htdocs/langs/et_EE/margins.lang
	htdocs/langs/et_EE/other.lang
	htdocs/langs/et_EE/stocks.lang
	htdocs/langs/et_EE/suppliers.lang
	htdocs/langs/et_EE/users.lang
	htdocs/langs/et_EE/withdrawals.lang
	htdocs/langs/lv_LV/admin.lang
	htdocs/langs/lv_LV/agenda.lang
	htdocs/langs/lv_LV/banks.lang
	htdocs/langs/lv_LV/bills.lang
	htdocs/langs/lv_LV/boxes.lang
	htdocs/langs/lv_LV/opensurvey.lang
	htdocs/langs/lv_LV/users.lang
	htdocs/langs/ro_RO/admin.lang
	htdocs/langs/ro_RO/banks.lang
	htdocs/langs/ro_RO/bills.lang
	htdocs/langs/ro_RO/companies.lang
	htdocs/langs/ro_RO/compta.lang
	htdocs/langs/ro_RO/cron.lang
	htdocs/langs/ro_RO/dict.lang
	htdocs/langs/ro_RO/help.lang
	htdocs/langs/ro_RO/main.lang
	htdocs/langs/ro_RO/margins.lang
	htdocs/langs/ro_RO/other.lang
	htdocs/langs/ro_RO/stocks.lang
	htdocs/langs/ro_RO/suppliers.lang
	htdocs/langs/ro_RO/withdrawals.lang
	htdocs/langs/uz_UZ/main.lang
2013-12-31 12:18:31 +01:00
Laurent Destailleur
f44a45feb2 Fix: Missing some languages into the transifex sync script.
Trans: Sync language files from transifex.
2013-12-31 12:03:37 +01:00
Laurent Destailleur
f0151ce112 Merge remote-tracking branch 'origin/3.5' into develop 2013-12-30 12:44:46 +01:00
Laurent Destailleur
2e0fc364bd Merge remote-tracking branch 'origin/3.4' into 3.5 2013-12-30 12:42:14 +01:00
Laurent Destailleur
f0bda47d96 Merge remote-tracking branch 'origin/3.3' into 3.4 2013-12-30 12:39:30 +01:00
Laurent Destailleur
a59a0151fb Fix: Removed analytics tags 2013-12-30 12:35:32 +01:00
Marcos García de La Fuente
098e6f4560 Added new tab types in modMyModule.class.php 2013-12-25 03:17:16 +01:00
Laurent Destailleur
3f89f27a0c Merge pull request #1329 from GPCsolutions/vagrant
Vagrant
2013-11-29 06:38:48 -08:00
Raphaël Doursenaud
b391de1b23 Added initdata info to vagrant readme 2013-11-29 15:27:04 +01:00
Raphaël Doursenaud
507e648adb Use latest release initdata 2013-11-29 15:24:29 +01:00
Raphaël Doursenaud
0f34f81dc7 Moved VM vhost to dev.dolibarr.org
This helps avoid Google Chrome doing a search instead of an HTTP request
2013-11-29 15:22:31 +01:00
Raphaël Doursenaud
cb210650de Added more information about the dolibarrdev vagrant box 2013-11-29 15:22:30 +01:00
Raphaël Doursenaud
694eeeb2bb Fixed vagrant shared folder permissions 2013-11-29 15:22:30 +01:00
Raphaël Doursenaud
9bba60ebee Added basic readme about Vagrant 2013-11-29 15:22:30 +01:00
Raphaël Doursenaud
0f9c616890 Added vagrant development box 2013-11-29 15:22:30 +01:00
Raphaël Doursenaud
a7afe07538 Scripts should be executable 2013-11-28 15:17:58 +01:00
Raphaël Doursenaud
9ae9a02b95 SQL files shouldn't be executable 2013-11-28 15:17:39 +01:00
Laurent Destailleur
c3af8b6b29 Sync from transifex 2013-11-27 14:59:02 +01:00
Laurent Destailleur
b75137d4ff Fix files that should not mix tab and spaces indent. 2013-11-24 13:02:20 +01:00
Raphaël Doursenaud
83f99b5ba6 Use LF instead of CRLF 2013-11-19 14:36:55 +01:00
Laurent Destailleur
33d55faf6b Fix: error into dump file 2013-11-16 15:42:05 +01:00
Laurent Destailleur
c5230ea2ff Fix: option --skip on by default 2013-11-15 23:39:44 +01:00
Peter Fontaine
3d7d8c7d5d add tests
add default_rib column in mysqldump
2013-11-14 10:48:36 +01:00
Laurent Destailleur
27fede8848 Update demo file 2013-11-07 02:28:32 +01:00
Laurent Destailleur
e88faf0f0f Update sql 2013-11-07 00:46:12 +01:00
Laurent Destailleur
db9e9a3372 Prepare 3.5.0 beta 2013-11-07 00:41:27 +01:00
Laurent Destailleur
19ae524ad9 Fix: Local for SeparatorDecimal and SeparatorThousand were lost during
transifex synchro.
2013-10-25 12:27:13 +02:00
Laurent Destailleur
94716c5314 Removed not used key 2013-10-23 14:05:26 +02:00
Laurent Destailleur
0cb9ef37c0 Add option into usage 2013-10-23 11:22:56 +02:00
Laurent Destailleur
5735c9252a Fix: Files must be saved with utf8 2013-10-23 10:49:44 +02:00
Laurent Destailleur
7eaffc186b Update demo with new structure 2013-10-22 00:36:53 +02:00
Laurent Destailleur
d12240e087 Add doc 2013-10-10 22:37:07 +02:00
Laurent Destailleur
6c47ee22b4 Merge remote-tracking branch 'origin/3.4' into develop
Conflicts:
	.travis.yml
2013-09-11 23:12:47 +02:00
Laurent Destailleur
301187a117 Merge remote-tracking branch 'origin/3.3' into 3.4
Conflicts:
	COPYRIGHT
	dev/initdata/mysqldump_dolibarr_3.3.0.sql
	htdocs/includes/jquery/plugins/mobile/jquery.mobile-latest.min.js
2013-09-11 21:54:57 +02:00
Laurent Destailleur
72557437ef Checkstyle 2013-09-10 14:19:36 +02:00
Laurent Destailleur
943f8108ab Fix a rule 2013-09-10 12:11:08 +02:00
Laurent Destailleur
376a7e2e3c Remove checkstyle outpout that is too verbose.
USe instead option -s
Disable a rule
2013-09-10 11:59:15 +02:00
Laurent Destailleur
e2110e620c Fix: syntax error in ruleset.xml 2013-09-10 02:32:39 +02:00
Laurent Destailleur
2f0ad6a22c Fix: syntax error in ruleset.xml 2013-09-10 02:32:33 +02:00
Laurent Destailleur
c351ac5bbd Fix: syntax error in ruleset.xml 2013-09-10 02:32:24 +02:00
Laurent Destailleur
11992dca9f Fix init data sql 2013-09-09 20:37:44 +02:00
Laurent Destailleur
1b526b7aa5 Merge remote-tracking branch 'origin/3.4' into develop
Conflicts:
	.travis.yml
	htdocs/fourn/facture/index.php
2013-09-09 20:00:12 +02:00
Laurent Destailleur
904f29c7cc Fix: data init 2013-09-09 19:29:47 +02:00
Laurent Destailleur
558dde4c50 Fix: sql init data does not match 3.4 data 2013-09-09 17:33:52 +02:00
Laurent Destailleur
d191dd98a4 Update demo file for 3.5 2013-09-09 01:16:35 +02:00
Laurent Destailleur
7f762fdbf8 Fix: doc 2013-09-03 00:06:42 +02:00
Laurent Destailleur
710c9517f4 Cleaner example 2013-08-28 16:39:23 +02:00
Laurent Destailleur
d4499c6eea Qual: Removed duplicated file 2013-08-20 11:24:10 +02:00
Laurent Destailleur
04b08f7bdd Can choose window size in utility to resize window (for screenshot) 2013-08-07 01:41:33 +02:00
Laurent Destailleur
c41a955cbe Fix: Permissions on files 2013-08-06 00:36:04 +02:00
Laurent Destailleur
549675d48e Merge remote-tracking branch 'origin/3.4' into develop 2013-08-05 23:28:07 +02:00
Laurent Destailleur
b01fd7b739 Fix: Permission into git repo are wrong for some files. 2013-08-05 12:54:34 +02:00
Laurent Destailleur
447d0063af Merge remote-tracking branch 'origin/3.4' into develop
Conflicts:
	htdocs/langs/ca_ES/withdrawals.lang
	htdocs/langs/es_ES/withdrawals.lang
	htdocs/langs/fr_FR/withdrawals.lang
	htdocs/langs/ja_JP/compta.lang
	htdocs/langs/ja_JP/contracts.lang
	htdocs/langs/sl_SI/withdrawals.lang
	htdocs/langs/zh_CN/admin.lang
	htdocs/langs/zh_CN/agenda.lang
	htdocs/langs/zh_CN/bills.lang
	htdocs/langs/zh_CN/boxes.lang
	htdocs/langs/zh_CN/commercial.lang
	htdocs/langs/zh_CN/companies.lang
	htdocs/langs/zh_CN/compta.lang
	htdocs/langs/zh_CN/contracts.lang
	htdocs/langs/zh_CN/errors.lang
	htdocs/langs/zh_CN/exports.lang
	htdocs/langs/zh_CN/install.lang
	htdocs/langs/zh_CN/interventions.lang
	htdocs/langs/zh_CN/mails.lang
	htdocs/langs/zh_CN/main.lang
	htdocs/langs/zh_CN/members.lang
	htdocs/langs/zh_CN/orders.lang
	htdocs/langs/zh_CN/other.lang
	htdocs/langs/zh_CN/products.lang
	htdocs/langs/zh_CN/propal.lang
	htdocs/langs/zh_CN/stocks.lang
	htdocs/langs/zh_CN/suppliers.lang
	htdocs/langs/zh_CN/users.lang
	htdocs/langs/zh_TW/admin.lang
	htdocs/langs/zh_TW/agenda.lang
	htdocs/langs/zh_TW/banks.lang
	htdocs/langs/zh_TW/boxes.lang
	htdocs/langs/zh_TW/companies.lang
	htdocs/langs/zh_TW/compta.lang
	htdocs/langs/zh_TW/contracts.lang
	htdocs/langs/zh_TW/errors.lang
	htdocs/langs/zh_TW/exports.lang
	htdocs/langs/zh_TW/install.lang
	htdocs/langs/zh_TW/interventions.lang
	htdocs/langs/zh_TW/mails.lang
	htdocs/langs/zh_TW/members.lang
	htdocs/langs/zh_TW/orders.lang
	htdocs/langs/zh_TW/propal.lang
	htdocs/langs/zh_TW/suppliers.lang
2013-08-03 16:24:52 +02:00
Laurent Destailleur
3dd1841ab6 New: Add language code files for South Africa. 2013-08-03 02:02:25 +02:00
Laurent Destailleur
012228aca7 Another try to sync with transifex 2013-07-31 16:35:57 +02:00
Laurent Destailleur
68e13b09e9 Enhance tx tool. 2013-07-31 14:11:58 +02:00
Laurent Destailleur
c943ef8edb Fix: doxygen 2013-07-18 23:39:29 +02:00
Laurent Destailleur
b5820315f9 Fix: Correct permissions on files 2013-07-13 10:34:19 +02:00
Laurent Destailleur
27a435994a Qual: Some methods object->addline used a first parameter that was
object->id, some not. Of course this was not a good pratice, since
object->id is already known so no need to provide it as parameter.
All methods addline in this case were modified to match good
pratice and be uniformed with others.
2013-07-10 17:29:54 +02:00
Laurent Destailleur
1ee67bd5b9 Prepare code to uniformize method addline. 2013-07-10 16:07:57 +02:00
Laurent Destailleur
c5a7540b37 Update script to update source ref. 2013-07-02 00:21:03 +02:00
Laurent Destailleur
e0742a3439 Fix: Add missing extension (.js, .cml) into script to detect and fix DOS
files.
2013-07-01 13:02:52 +02:00
Laurent Destailleur
a5ba59312d Fix: Fix some bug into script to detect bad utf8 and dos files 2013-06-24 19:03:33 +02:00
Laurent Destailleur
a8547b5375 New: Add property hidden into module descriptor to allow to hide a
module according to some dynamic conditions.
2013-06-24 18:31:56 +02:00
Laurent Destailleur
e18a4d8e74 Qual: Move feature of a script as an option of other. This reduce number
of scripts to support.
2013-06-22 23:28:44 +02:00
Laurent Destailleur
9becf83d70 Keep zapfdingbats. 2013-06-17 22:10:44 +02:00
Laurent Destailleur
c748f3d834 Qual: Removed useless methods
Qual: Removed deprecated vars
Qual: Free memory
2013-06-16 21:31:21 +02:00
Laurent Destailleur
a50cd7b698 Fix bug into script that fix CRLF into LF 2013-06-12 11:59:55 +02:00
Laurent Destailleur
89ee79f5cf New: Implement same rule for return value of all command line scripts (0
when success, <>0 if error).
2013-06-09 14:40:33 +02:00
Laurent Destailleur
5d1dfdc7c1 Upgrade tcpdf to 6.0 2013-06-08 16:29:59 +02:00
Laurent Destailleur
c1dd2f20cd Qual: Clean code. 2013-06-03 15:18:36 +02:00
Laurent Destailleur
dee7ac2823 Add missing lang files 2013-05-27 12:02:31 +02:00
Laurent Destailleur
ce45291c00 Add tx scripts 2013-05-27 10:32:47 +02:00
Laurent Destailleur
e9df560b74 New: Show process id in all command line scripts 2013-05-22 12:23:42 +02:00
Marcos García
b2a4f5d1bb Typo in skeleton module class 2013-05-10 17:50:26 +02:00
Marcos García
661071286e Typo in skeleton module class 2013-05-08 17:23:41 +02:00
Laurent Destailleur
ff80e3b031 Fix: latin to utf8 2013-05-03 12:28:28 +02:00
Laurent Destailleur
4e0ef01389 Qual: nowrap="nowrap" is replaced with a CSS class style .nowrap 2013-04-25 01:13:13 +02:00
Laurent Destailleur
854b9df96d Qual: Clean code of box management 2013-04-23 16:18:26 +02:00
Laurent Destailleur
ecb19e2225 Fix: Removed warning 2013-04-22 00:28:12 +02:00
Laurent Destailleur
83f88af269 doxygen 2013-04-14 11:42:39 +02:00
Laurent Destailleur
ba93a4bfe2 Fix: Codesniffer 2013-04-10 12:20:45 +02:00
Laurent Destailleur
fb048ccfda Update skeleton 2013-04-03 10:20:08 +02:00
Laurent Destailleur
c6835e711a New: Add tool to make screenshots easier. 2013-04-02 09:56:54 +02:00
Laurent Destailleur
4208f11d87 Enhance fixutf8bomfiles and fixdosfiles tools. 2013-03-30 15:57:54 +01:00
Laurent Destailleur
89365786a8 New: enhance tool fixdosfiles.sh
Convert DOS files to unix
2013-03-30 14:27:13 +01:00
Laurent Destailleur
2b03420445 Add dump for 3.4 2013-03-24 19:41:08 +01:00
Laurent Destailleur
f3f65c01df Update define key examples 2013-03-24 19:01:30 +01:00
Laurent Destailleur
7fab08eae1 Save example 2013-03-24 00:35:51 +01:00
Laurent Destailleur
f4fe3de1c1 Qual: Update skeleton of script 2013-03-12 16:34:20 +01:00
Laurent Destailleur
633a15f10d Fix: Usage of order into export broken when filters are used 2013-03-11 14:20:08 +01:00