Commit Graph

1187 Commits

Author SHA1 Message Date
Laurent Destailleur
6eac7e1bdc Fix: CRLF 2014-03-15 23:17:46 +01:00
Laurent Destailleur
1396fb1dbe Merge pull request #1448 from GPCsolutions/tcpdf-monotype
TCPDF: Replaced missing courier monotype font by provided freemono
2014-03-06 18:23:22 +01:00
Raphaël Doursenaud
2f150a8927 Updated dolibarr_changes 2014-03-06 18:15:50 +01:00
Laurent Destailleur
b2d9fac993 More complete sql file 2014-03-03 19:39:44 +01:00
Laurent Destailleur
c3bc0cc8d1 Add demo sql file for 3.6 2014-03-02 16:57:37 +01:00
Laurent Destailleur
473b0f73be New: build_class_from_table can work with a distant database server. 2014-02-26 10:42:45 +01:00
Marcos García de La Fuente
7aadeb0a98 Updated vagrant README 2014-02-24 21:46:41 +01:00
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
Laurent Destailleur
8642e2027c Fix: [ bug #1212 ] 'jqueryFileTree.php' directory traversal
vulnerability
2014-01-20 02:10:16 +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