Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

D

dolibarr
- Activity
- Members

Snippets Groups Projects

860d0b08

Commit 860d0b08 authored 10 years ago by Laurent Destailleur

Downloads
- Plain Diff

Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

parents 5dbfaec9 c8c1f741

No related branches found

No related tags found

No related merge requests found

Changes 1000

Show whitespace changes

Inline Side-by-side

Showing

.editorconfig 21 additions, 0 deletions

.editorconfig
.travis.yml 2 additions, 0 deletions

.travis.yml
.tx/config 12 additions, 7 deletions

.tx/config
build/debian/README.howto 6 additions, 0 deletions

build/debian/README.howto
build/makepack-dolibarr.pl 1 addition, 1 deletion

build/makepack-dolibarr.pl
dev/translation/strip_language_file.php 22 additions, 10 deletions

dev/translation/strip_language_file.php
htdocs/adherents/admin/adherent.php 18 additions, 1 deletion

htdocs/adherents/admin/adherent.php
htdocs/adherents/card_subscriptions.php 23 additions, 7 deletions

htdocs/adherents/card_subscriptions.php
htdocs/adherents/class/adherent.class.php 1 addition, 1 deletion

htdocs/adherents/class/adherent.class.php
htdocs/adherents/fiche_subscription.php 1 addition, 1 deletion

htdocs/adherents/fiche_subscription.php
htdocs/admin/boxes.php 113 additions, 103 deletions

htdocs/admin/boxes.php
htdocs/admin/const.php 1 addition, 1 deletion

htdocs/admin/const.php
htdocs/admin/supplierinvoice_extrafields.php 1 addition, 0 deletions

htdocs/admin/supplierinvoice_extrafields.php
htdocs/comm/action/card.php 27 additions, 28 deletions

htdocs/comm/action/card.php
htdocs/compta/bank/search.php 5 additions, 5 deletions

htdocs/compta/bank/search.php
htdocs/core/class/commonobject.class.php 3 additions, 3 deletions

htdocs/core/class/commonobject.class.php
htdocs/core/class/html.form.class.php 32 additions, 6 deletions

htdocs/core/class/html.form.class.php
htdocs/core/class/html.formfile.class.php 1 addition, 3 deletions

htdocs/core/class/html.formfile.class.php
htdocs/core/lib/agenda.lib.php 1 addition, 1 deletion

htdocs/core/lib/agenda.lib.php
htdocs/core/menus/init_menu_auguria.sql 3 additions, 2 deletions

htdocs/core/menus/init_menu_auguria.sql

with 294 additions and 180 deletions

Some changes are not shown.

For a faster browsing experience, only 20 of 1000+ files are shown. Download one of the files below to see all changes.

Plain diff Email patch

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment