lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
55,774 Commits 43 Branches 150 Tags 886 MiB
29634304fd
Commit Graph

55774 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
29634304fd Merge pull request #5795 from atm-ph/fix_4.0_value_too_long 
Fix fields too long for database
 2016-09-28 17:58:57 +02:00
Laurent Destailleur
e4f17c8763 FIX #5793 Normalise code. 2016-09-28 17:56:54 +02:00
Laurent Destailleur
c110297032 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-09-28 17:54:10 +02:00
Laurent Destailleur
d953d3795f FIX #5803 2016-09-28 17:53:49 +02:00
Juanjo Menent
b1aa4d01d6 Merge pull request #5807 from atm-florian/develop 
FIX  : travis new ruselset.xml path
 2016-09-28 16:57:06 +02:00
florian HENRY
c5cf2be72e FIX : travis new ruselset.xml path 2016-09-28 14:52:15 +02:00
Laurent Destailleur
dcb18cd637 Clean and reorganize dev tools 2016-09-27 19:43:34 +02:00
phf
058cf61ae0 Fix fields too long for database 2016-09-27 10:06:22 +02:00
Laurent Destailleur
586b223221 Work on remote integrity checker 2016-09-26 15:24:43 +02:00
Laurent Destailleur
e92184a738 Fix bad var $db 2016-09-26 14:55:36 +02:00
Laurent Destailleur
9b26db4151 Fix remove var_dump 2016-09-26 14:55:10 +02:00
Laurent Destailleur
6232e59fd2 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 2016-09-26 14:17:36 +02:00
Laurent Destailleur
b50d92e712 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 
Conflicts:
	htdocs/compta/localtax/index.php
 2016-09-26 14:16:53 +02:00
Laurent Destailleur
5d7f182f59 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-09-26 14:14:56 +02:00
Laurent Destailleur
8775a51cec Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2016-09-26 14:14:26 +02:00
Laurent Destailleur
67a1bf2b59 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.8 2016-09-26 14:13:26 +02:00
Laurent Destailleur
e60d2b0ae5 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 
Conflicts:
	htdocs/core/actions_sendmails.inc.php
 2016-09-26 14:10:39 +02:00
Laurent Destailleur
fac946dbb8 FIX The email test sender in email setup was broken 2016-09-26 14:08:14 +02:00
Laurent Destailleur
108537746c git push origin developMerge branch 'EuskalMoneta-rest-api-add-accounts' into develop 2016-09-26 02:28:29 +02:00
Laurent Destailleur
3cb13e16d1 Merge branch 'rest-api-add-accounts' of 
https://github.com/EuskalMoneta/dolibarr into
EuskalMoneta-rest-api-add-accounts

Conflicts:
	htdocs/api/index.php
	htdocs/commande/class/api_orders.class.php
 2016-09-26 02:28:16 +02:00
Laurent Destailleur
d39d7d92c9 Uniformize code. 2016-09-26 02:13:58 +02:00
Laurent Destailleur
48b188d200 Merge pull request #5785 from EuskalMoneta/rest-api-add-countries-and-towns 
NEW Add Countries and Towns to the REST API.
 2016-09-26 01:33:56 +02:00
Laurent Destailleur
100312aac2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/adherents/class/cotisation.class.php
 2016-09-26 01:32:50 +02:00
Laurent Destailleur
ac2c685e7d Fix bad commit 2016-09-26 01:13:55 +02:00
Laurent Destailleur
e9a073b223 git push origin developMerge branch 'EuskalMoneta-rest-api-add-members-and-subscriptions' into develop 2016-09-26 01:12:05 +02:00
Laurent Destailleur
0809be6680 Merge branch 'rest-api-add-members-and-subscriptions' of https://github.com/EuskalMoneta/dolibarr into EuskalMoneta-rest-api-add-members-and-subscriptions 2016-09-26 01:11:20 +02:00
Laurent Destailleur
0ab3728276 Merge pull request #5780 from aspangaro/5.0-p14 
Review of subscription
 2016-09-26 01:09:50 +02:00
Laurent Destailleur
17f3e09689 Fix link https 2016-09-26 01:04:48 +02:00
Laurent Destailleur
813f9120f6 Merge pull request #5781 from aspangaro/5.0-p15 
Typo "Execuete"
 2016-09-26 00:51:40 +02:00
Laurent Destailleur
4f2ce0ef30 Merge pull request #5782 from aspangaro/5.0-p16 
Correct presentation
 2016-09-26 00:51:15 +02:00
Laurent Destailleur
e531735444 Merge pull request #5777 from atm-florian/4.0_fixODTwithextrafieldsCheckbox 
FIX : #5776
 2016-09-26 00:49:02 +02:00
Laurent Destailleur
ea09eb13da Uniformize code 2016-09-26 00:10:29 +02:00
Xebax
fe2498ffc1 Fix coding style errors. 2016-09-25 19:11:16 +02:00
Xebax
0f3e308dd3 Fix coding style errors. 2016-09-25 19:05:49 +02:00
Xebax
58179f71fc Add Accounts to REST API. 2016-09-25 17:48:48 +02:00
Laurent Destailleur
34378d8bef Fix phpcs 2016-09-25 17:48:48 +02:00
Xebax
7e366c303e Add Towns to the REST API. 2016-09-25 17:43:15 +02:00
Xebax
d5ee73a1b7 Add Countries to the REST API. 2016-09-25 17:43:15 +02:00
Xebax
d05c8d32b1 Add Subscriptions to the REST API. 2016-09-25 17:40:45 +02:00
Xebax
cd11ccbedb Add Members to the REST API. 2016-09-25 17:40:29 +02:00
Laurent Destailleur
8829db7d65 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-09-25 16:45:16 +02:00
Laurent Destailleur
4cccaae831 Fix warning 2016-09-25 16:44:55 +02:00
Laurent Destailleur
02a978bc4d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-09-25 15:45:19 +02:00
aspangaro
69452e91ca Merge remote-tracking branch 'Upstream/develop' into 5.0-p16 2016-09-25 05:49:33 +02:00
aspangaro
8f83b8cefd Merge remote-tracking branch 'Upstream/develop' into 5.0-p14 2016-09-25 05:48:36 +02:00
aspangaro
bac23ce422 Merge remote-tracking branch 'Upstream/develop' into 5.0-p15 
Conflicts:
	htdocs/commande/class/api_orders.class.php
 2016-09-25 05:45:58 +02:00
Laurent Destailleur
a7db09c020 Fix phpcs 2016-09-24 23:06:09 +02:00
aspangaro
8dc6a8fd1d Correct presentation 2016-09-24 14:47:51 +02:00
aspangaro
922495d72d Correct travis & typo "Execuete" 2016-09-24 07:18:38 +02:00
aspangaro
2dbeeedd14 Move tab menu for subscription in member.lib 
Move all pages for subscription member in adherent/subscription (Card / Info / List)
Rename llx_cotisation in llx_subscription
Rename all db field cotisation in subscription
Rename class Cotisation in class Subscription
 2016-09-24 06:48:40 +02:00