Commit Graph

39690 Commits

Author SHA1 Message Date
Laurent Destailleur
8e51a4683f Check parameters of script 2013-12-01 15:20:57 +01:00
Laurent Destailleur
519919889c Fix comment 2013-11-30 16:57:11 +01:00
Laurent Destailleur
e0dd3090c9 Remove hardcoded strings 2013-11-30 10:58:43 +01:00
Laurent Destailleur
abec634960 Look: Better support for jmobile 2013-11-30 02:31:17 +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
37031410f9 Ignore vagrant generated files 2013-11-29 15:22:30 +01:00
Raphaël Doursenaud
0f9c616890 Added vagrant development box 2013-11-29 15:22:30 +01:00
Laurent Destailleur
e27d109f2d Merge pull request #1328 from csalvador/develop-fixAJAX
Develop fix ajax
2013-11-29 02:59:11 -08:00
Laurent Destailleur
ea51e9ec77 Merge remote-tracking branch 'origin/3.5' into develop 2013-11-28 18:57:43 +01:00
Laurent Destailleur
d0b05bb5af Fix: Restore style code lost by a commit. 2013-11-28 18:55:36 +01:00
Laurent Destailleur
5715e9c986 Merge remote-tracking branch 'origin/3.5' into develop 2013-11-28 17:06:11 +01:00
Laurent Destailleur
d1e62bebf0 Fix: Removed a merged that we ddidn't want. 2013-11-28 17:01:37 +01:00
Laurent Destailleur
bdf8100d84 Merge remote-tracking branch 'origin/3.4' into 3.5
Conflicts:
	htdocs/core/lib/agenda.lib.php
	htdocs/product/stats/commande_fournisseur.php
2013-11-28 15:54:12 +01:00
Cédric Salvador
ec3fc4e6e6 indentation 2013-11-28 15:53:28 +01:00
Cédric Salvador
2da88a2966 made getVATRates synchronous to avoid concurrency problems 2013-11-28 15:52:26 +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
a3e55822a4 Missing translation 2013-11-28 14:36:13 +01:00
Laurent Destailleur
88ae0a7945 Fix: the rename function is bugged with some windows. I add a
workaround.
Fix: Add also a workaround for [ bug 1064 ] Date/Time in ICS incorrect.
2013-11-28 12:58:02 +01:00
Laurent Destailleur
894e6a296f Merge pull request #1324 from FHenry/3.4
Fix [ bug #1156 ] Update TVA mass update tools do not work
2013-11-27 16:09:35 -08:00
Laurent Destailleur
74d6698f7d Merge pull request #1325 from FHenry/3.5
[ bug #1153 ] SQL Error on the VAT main screen (with pgsql)
2013-11-27 16:08:02 -08:00
Florian Henry
5f8e896e0c Fix [ bug #1154 ] Error when closing a service in a contract (pgsql) 2013-11-27 22:58:49 +01:00
Florian Henry
afc729c694 [ bug #1153 ] SQL Error on the VAT main screen (with pgsql) 2013-11-27 22:49:54 +01:00
Florian Henry
2178ab6007 Fix [ bug #1156 ] Update TVA mass update tools do not work 2013-11-27 22:05:29 +01:00
Laurent Destailleur
cd5f2b8239 Add tool to make stress tests 2013-11-27 20:00:18 +01:00
Laurent Destailleur
89f32bf46e Update doc 2013-11-27 18:45:04 +01:00
Laurent Destailleur
c3af8b6b29 Sync from transifex 2013-11-27 14:59:02 +01:00
Laurent Destailleur
02837e0029 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-11-27 13:38:16 +01:00
Laurent Destailleur
8981f506dc Fix: typo 2013-11-27 13:28:06 +01:00
Laurent Destailleur
b71406f12d Merge pull request #1322 from aspangaro/develop
Improvement of the Skype button
2013-11-26 07:29:37 -08:00
Laurent Destailleur
6729f03ee6 Merge pull request #1323 from grandoc/3.5
fix language and standardize code
2013-11-26 07:28:30 -08:00
Laurent Destailleur
0383dc4706 Fix: 2 bugs during validation of a member 2013-11-26 13:10:00 +01:00
Laurent Destailleur
7ea595fa6d Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-11-26 13:05:07 +01:00
Laurent Destailleur
854cfc741e Fix: 2 bugs during validation of a member 2013-11-26 13:04:15 +01:00
Laurent Destailleur
01f3ba81af Update doc 2013-11-25 21:19:57 +01:00
Laurent Destailleur
18ed9d5ca7 Fix: Filter on accountancy report were lost when using "print" view. 2013-11-25 16:51:30 +01:00
Grand Philippe
e8e5f4d943 missing trad 2013-11-25 13:55:01 +01:00
Grand Philippe
203a98d4ae fix language and standardize code 2013-11-25 10:30:02 +01:00
aspangaro
e1b4d01235 Improvement of the Skype button
Perm & add a button"Chat"
2013-11-24 21:28:15 +01:00
Laurent Destailleur
216e9b390d Merge pull request #1321 from FHenry/3.4
Fix [ bug #1145 ] Agenda button list type do not display
2013-11-24 12:16:27 -08:00
Laurent Destailleur
4cf2e2503c Merge pull request #1320 from grandoc/3.5
3.5
2013-11-24 12:13:48 -08:00
Laurent Destailleur
baebc7e91d Fix: Not coherent filename 2013-11-24 19:33:22 +01:00
Florian Henry
f1d0879419 Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4 2013-11-24 18:07:47 +01:00
Florian Henry
8f9143cef7 revert param_ihm 2013-11-24 18:07:40 +01:00