Laurent Destailleur
fd206dbb55
Fix ruleset.xml
2015-02-11 14:28:20 +01:00
Laurent Destailleur
f124079817
Fix ruleset
2015-02-10 21:49:39 +01:00
Laurent Destailleur
4fdc287717
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/accountancy/customer/card.php
htdocs/accountancy/journal/sellsjournal.php
htdocs/admin/menus.php
htdocs/fourn/commande/card.php
htdocs/install/check.php
2015-01-30 15:53:06 +01:00
Laurent Destailleur
b61c475aa8
Clean code for validate permissions. "validate" is a status to say, "now
...
it exists, it is no more a draft", so by default we don't need this
permissions (it is same than create). We keep "validate" permissions as
an "advanced" permission only.
2015-01-25 21:32:40 +01:00
Laurent Destailleur
820fc3dbc9
Merge pull request #2276 from aspangaro/3.7
...
Correct link & typo
2015-01-25 18:13:29 +01:00
Laurent Destailleur
6bda61436b
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
dev/codesniffer/ruleset.xml
htdocs/core/class/html.formfile.class.php
htdocs/core/lib/functions2.lib.php
htdocs/projet/element.php
2015-01-22 21:52:55 +01:00
Laurent Destailleur
04afe935a5
Merge remote-tracking branch 'origin/3.6' into 3.7
2015-01-22 21:47:32 +01:00
Laurent Destailleur
b7cff09ce6
Fixed travis errors
2015-01-22 21:46:22 +01:00
aspangaro
e9e552533f
Correct link
2015-01-22 21:13:08 +01:00
Laurent Destailleur
5c007e53be
Update sample examples
2015-01-22 18:35:02 +01:00
aspangaro
6f3d9200bf
Correct link
2015-01-22 07:15:14 +01:00
frederic34
73fda2cb86
WIP PSR2
2015-01-08 18:36:03 +01:00
Laurent Destailleur
2a3bb96c34
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/core/lib/ecm.lib.php
2014-12-22 03:14:22 +01:00
Laurent Destailleur
38b51c0a14
Prepare 3.7 release
2014-12-21 21:07:31 +01:00
Laurent Destailleur
8996953077
Fix: error reported by scrutinizer
2014-12-20 15:42:03 +01:00
Laurent Destailleur
5bcb195c15
Update codesniffer to remove travis errors.
2014-12-20 00:14:53 +01:00
Laurent Destailleur
d8838f9438
Update codesniffer to remove travis errors.
2014-12-20 00:11:43 +01:00
Laurent Destailleur
11368e48fe
Update codesniffer to remove travis errors.
2014-12-20 00:11:12 +01:00
Laurent Destailleur
78ef12cc0d
Merge remote-tracking branch 'origin/3.7' into develop
2014-12-19 19:12:05 +01:00
Laurent Destailleur
748b076d61
Merge remote-tracking branch 'origin/3.6' into 3.7
2014-12-19 19:11:06 +01:00
Laurent Destailleur
789d588fde
Update codesniffer to remove travis errors.
2014-12-19 19:10:41 +01:00
Laurent Destailleur
0bb431c4d0
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
dev/codesniffer/ruleset.xml
2014-12-19 19:03:05 +01:00
Laurent Destailleur
47cab90336
Update codesniffer to remove travis errors.
2014-12-19 19:01:29 +01:00
Laurent Destailleur
c120e7b3df
Clean deprecated files.
...
Add utility tool
2014-12-19 16:10:11 +01:00
Laurent Destailleur
c163223957
Moved vagrant dir into obsolete repo
2014-12-19 12:39:20 +01:00
Laurent Destailleur
c3ac607e4f
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
dev/codesniffer/ruleset.xml
2014-12-18 23:56:40 +01:00
Laurent Destailleur
c571013fc9
Merge remote-tracking branch 'origin/3.6' into 3.7
2014-12-18 23:55:07 +01:00
Laurent Destailleur
3debf56c68
Update phpcs
2014-12-18 23:54:39 +01:00
Laurent Destailleur
b1c4d32fbf
Update phpcs file
2014-12-18 23:53:17 +01:00
Laurent Destailleur
ad515ef5e5
Exclude test
2014-12-18 23:49:07 +01:00
Laurent Destailleur
711b033844
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/contrat/card.php
htdocs/core/class/html.form.class.php
htdocs/product/stock/card.php
2014-12-14 12:35:13 +01:00
Laurent Destailleur
cf641194a1
Fix: CRLF
2014-12-09 00:02:43 +01:00
Laurent Destailleur
72c3954f36
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
.travis.yml
2014-12-05 21:12:35 +01:00
Laurent Destailleur
df066c3741
Fix: PHPCS
2014-12-05 20:34:36 +01:00
Laurent Destailleur
344aa40858
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
.travis.yml
dev/codesniffer/ruleset.xml
htdocs/core/class/conf.class.php
htdocs/langs/en_US/productbatch.lang
2014-12-05 20:21:40 +01:00
Laurent Destailleur
9b5a03fa82
Fix: PHPCS
2014-12-05 20:08:37 +01:00
Laurent Destailleur
46f9ab15da
Fixed: PHPCS
2014-12-05 19:26:21 +01:00
Laurent Destailleur
5755a046c5
Fix: PHPCS
2014-12-05 19:25:08 +01:00
Laurent Destailleur
4ad93cd069
Fix: PHPCS
2014-12-05 17:49:27 +01:00
Laurent Destailleur
a5bdf952ee
Fix: PHPCS
2014-12-05 17:44:47 +01:00
Laurent Destailleur
c36d362248
Fix: PHPCS 2.0
2014-12-05 17:38:34 +01:00
Laurent Destailleur
f884f16564
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/admin/boxes.php
htdocs/comm/action/card.php
htdocs/core/class/html.formfile.class.php
2014-12-03 12:54:42 +01:00
Laurent Destailleur
931c1fc671
Sync from transifex
2014-11-30 16:20:58 +01:00
Laurent Destailleur
ef4bdcdb2a
Merge remote-tracking branch 'origin/3.7' into develop
2014-11-30 15:43:04 +01:00
Laurent Destailleur
86e04cb62f
Enhance tool to fix images
2014-11-30 15:40:28 +01:00
Laurent Destailleur
e395fd8096
Fix CRLF
2014-11-30 15:24:39 +01:00
Laurent Destailleur
d39dbe66c8
Fix: Removed duplicate entrie into language files
...
Renamed tool so all script to run before release start with "fix".
2014-11-30 14:51:57 +01:00
aspangaro
c4c69e191b
Replace <center> tags
2014-11-25 20:13:43 +01:00
Raphaël Doursenaud
7a7097a106
Work around bug #1643
2014-11-17 14:58:48 +01:00
Laurent Destailleur
445f696d28
Fix: Pb of object with wrong type.
2014-11-15 18:24:38 +01:00
