dolibarr-git
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Dolibarr-git] [Dolibarr/dolibarr] 2938b3: Merge remote-tracking branch


From: Laurent Destailleur
Subject: [Dolibarr-git] [Dolibarr/dolibarr] 2938b3: Merge remote-tracking branch 'origin/3.3' into 3.3...
Date: Sat, 28 Sep 2013 11:56:23 -0700

  Branch: refs/heads/3.4_backported
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 2938b3c715acc7d41569c6b598283127f22eb1c7
      
https://github.com/Dolibarr/dolibarr/commit/2938b3c715acc7d41569c6b598283127f22eb1c7
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-09-06 (Fri, 06 Sep 2013)

  Changed paths:
    M build/debian/changelog
    M build/debian/control
    M build/debian/copyright
    A build/debian/get-orig-source.sh
    R build/debian/wash
    A build/debian/watch
    M build/makepack-dolibarr.pl
    M doc/images/dolibarr_logo.png
    R doc/images/dolimamp_logo1.png
    R doc/images/doliwamp_468x60.jpg
    M htdocs/install/mysql/migration/repair.sql

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/3.3' into 3.3_backported


  Commit: 4bb3165223668be860ea95d0b4e9bd32312a2122
      
https://github.com/Dolibarr/dolibarr/commit/4bb3165223668be860ea95d0b4e9bd32312a2122
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-09-09 (Mon, 09 Sep 2013)

  Changed paths:
    A .travis.yml
    M test/phpunit/BuildDocTest.php
    M test/phpunit/PdfDocTest.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/3.3' into 3.3_backported


  Commit: 3c74a0be9a5415e9f9763ba9298f34669f13cd08
      
https://github.com/Dolibarr/dolibarr/commit/3c74a0be9a5415e9f9763ba9298f34669f13cd08
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-09-09 (Mon, 09 Sep 2013)

  Changed paths:
    M dev/initdata/mysqldump_dolibarr_3.3.0.sql
    M test/phpunit/BuildDocTest.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/3.3' into 3.3_backported


  Commit: 937b988b9678737f00a12013c94024289528b6a5
      
https://github.com/Dolibarr/dolibarr/commit/937b988b9678737f00a12013c94024289528b6a5
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-09-11 (Wed, 11 Sep 2013)

  Changed paths:
    M .travis.yml
    M COPYRIGHT
    M dev/codesniffer/ruleset.xml
    A htdocs/includes/jquery/js/jquery-latest.js
    A htdocs/includes/jquery/js/jquery-ui-latest.custom.js
    A htdocs/includes/jquery/plugins/jeditable/jquery.jeditable.js
    A htdocs/includes/jquery/plugins/jnotify/jquery.jnotify.js
    R htdocs/includes/jquery/plugins/jpicker/jquery-1.4.4.min.js
    R htdocs/includes/jquery/plugins/jstree/jquery.cookie.js
    R htdocs/includes/jquery/plugins/jstree/jquery.hotkeys.js
    R htdocs/includes/jquery/plugins/jstree/jquery.jstree.min.js
    R htdocs/includes/jquery/plugins/jstree/themes/apple/bg.jpg
    R htdocs/includes/jquery/plugins/jstree/themes/apple/d.png
    R htdocs/includes/jquery/plugins/jstree/themes/apple/dot_for_ie.gif
    R htdocs/includes/jquery/plugins/jstree/themes/apple/style.css
    R htdocs/includes/jquery/plugins/jstree/themes/apple/throbber.gif
    R htdocs/includes/jquery/plugins/jstree/themes/classic/d.gif
    R htdocs/includes/jquery/plugins/jstree/themes/classic/d.png
    R htdocs/includes/jquery/plugins/jstree/themes/classic/dot_for_ie.gif
    R htdocs/includes/jquery/plugins/jstree/themes/classic/style.css
    R htdocs/includes/jquery/plugins/jstree/themes/classic/throbber.gif
    R htdocs/includes/jquery/plugins/jstree/themes/default-rtl/d.gif
    R htdocs/includes/jquery/plugins/jstree/themes/default-rtl/d.png
    R htdocs/includes/jquery/plugins/jstree/themes/default-rtl/dots.gif
    R htdocs/includes/jquery/plugins/jstree/themes/default-rtl/style.css
    R htdocs/includes/jquery/plugins/jstree/themes/default-rtl/throbber.gif
    R htdocs/includes/jquery/plugins/jstree/themes/default/d.gif
    R htdocs/includes/jquery/plugins/jstree/themes/default/d.png
    R htdocs/includes/jquery/plugins/jstree/themes/default/style.css
    R htdocs/includes/jquery/plugins/jstree/themes/default/throbber.gif
    A htdocs/includes/jquery/plugins/mobile/jquery.mobile-latest.css
    A htdocs/includes/jquery/plugins/mobile/jquery.mobile-latest.js
    M htdocs/includes/jquery/plugins/mobile/jquery.mobile-latest.min.css
    M htdocs/includes/jquery/plugins/mobile/jquery.mobile-latest.min.js

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/3.3' into 3.3_backported


  Commit: ab214d16f2d7e40cfe7e2c9d52f3cee30855e57d
      
https://github.com/Dolibarr/dolibarr/commit/ab214d16f2d7e40cfe7e2c9d52f3cee30855e57d
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-09-14 (Sat, 14 Sep 2013)

  Changed paths:
    M build/debian/copyright

  Log Message:
  -----------
  Fix: Update copyright file


  Commit: 47e3ae99c1cc4dbaad63f2b63489385180ff6f1c
      
https://github.com/Dolibarr/dolibarr/commit/47e3ae99c1cc4dbaad63f2b63489385180ff6f1c
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-09-14 (Sat, 14 Sep 2013)

  Changed paths:
    M build/exe/doliwamp/doliwamp.iss
    M build/makepack-dolibarr.pl
    M build/makepack-howto.txt
    M build/tgz/tar_exclude.txt
    M build/zip/zip_exclude.txt
    A htdocs/includes/ckeditor/_source/adapters/jquery.js
    A htdocs/includes/ckeditor/_source/core/_bootstrap.js
    A htdocs/includes/ckeditor/_source/core/ckeditor.js
    A htdocs/includes/ckeditor/_source/core/ckeditor_base.js
    A htdocs/includes/ckeditor/_source/core/ckeditor_basic.js
    A htdocs/includes/ckeditor/_source/core/command.js
    A htdocs/includes/ckeditor/_source/core/commanddefinition.js
    A htdocs/includes/ckeditor/_source/core/config.js
    A htdocs/includes/ckeditor/_source/core/dataprocessor.js
    A htdocs/includes/ckeditor/_source/core/dom.js
    A htdocs/includes/ckeditor/_source/core/dom/comment.js
    A htdocs/includes/ckeditor/_source/core/dom/document.js
    A htdocs/includes/ckeditor/_source/core/dom/documentfragment.js
    A htdocs/includes/ckeditor/_source/core/dom/domobject.js
    A htdocs/includes/ckeditor/_source/core/dom/element.js
    A htdocs/includes/ckeditor/_source/core/dom/elementpath.js
    A htdocs/includes/ckeditor/_source/core/dom/event.js
    A htdocs/includes/ckeditor/_source/core/dom/node.js
    A htdocs/includes/ckeditor/_source/core/dom/nodelist.js
    A htdocs/includes/ckeditor/_source/core/dom/range.js
    A htdocs/includes/ckeditor/_source/core/dom/rangelist.js
    A htdocs/includes/ckeditor/_source/core/dom/text.js
    A htdocs/includes/ckeditor/_source/core/dom/walker.js
    A htdocs/includes/ckeditor/_source/core/dom/window.js
    A htdocs/includes/ckeditor/_source/core/dtd.js
    A htdocs/includes/ckeditor/_source/core/editor.js
    A htdocs/includes/ckeditor/_source/core/editor_basic.js
    A htdocs/includes/ckeditor/_source/core/env.js
    A htdocs/includes/ckeditor/_source/core/event.js
    A htdocs/includes/ckeditor/_source/core/eventInfo.js
    A htdocs/includes/ckeditor/_source/core/focusmanager.js
    A htdocs/includes/ckeditor/_source/core/htmlparser.js
    A htdocs/includes/ckeditor/_source/core/htmlparser/basicwriter.js
    A htdocs/includes/ckeditor/_source/core/htmlparser/cdata.js
    A htdocs/includes/ckeditor/_source/core/htmlparser/comment.js
    A htdocs/includes/ckeditor/_source/core/htmlparser/element.js
    A htdocs/includes/ckeditor/_source/core/htmlparser/filter.js
    A htdocs/includes/ckeditor/_source/core/htmlparser/fragment.js
    A htdocs/includes/ckeditor/_source/core/htmlparser/text.js
    A htdocs/includes/ckeditor/_source/core/lang.js
    A htdocs/includes/ckeditor/_source/core/loader.js
    A htdocs/includes/ckeditor/_source/core/plugindefinition.js
    A htdocs/includes/ckeditor/_source/core/plugins.js
    A htdocs/includes/ckeditor/_source/core/resourcemanager.js
    A htdocs/includes/ckeditor/_source/core/scriptloader.js
    A htdocs/includes/ckeditor/_source/core/skins.js
    A htdocs/includes/ckeditor/_source/core/themes.js
    A htdocs/includes/ckeditor/_source/core/tools.js
    A htdocs/includes/ckeditor/_source/core/ui.js
    A htdocs/includes/ckeditor/_source/lang/_languages.js
    A htdocs/includes/ckeditor/_source/lang/_translationstatus.txt
    A htdocs/includes/ckeditor/_source/lang/af.js
    A htdocs/includes/ckeditor/_source/lang/ar.js
    A htdocs/includes/ckeditor/_source/lang/bg.js
    A htdocs/includes/ckeditor/_source/lang/bn.js
    A htdocs/includes/ckeditor/_source/lang/bs.js
    A htdocs/includes/ckeditor/_source/lang/ca.js
    A htdocs/includes/ckeditor/_source/lang/cs.js
    A htdocs/includes/ckeditor/_source/lang/cy.js
    A htdocs/includes/ckeditor/_source/lang/da.js
    A htdocs/includes/ckeditor/_source/lang/de.js
    A htdocs/includes/ckeditor/_source/lang/el.js
    A htdocs/includes/ckeditor/_source/lang/en-au.js
    A htdocs/includes/ckeditor/_source/lang/en-ca.js
    A htdocs/includes/ckeditor/_source/lang/en-gb.js
    A htdocs/includes/ckeditor/_source/lang/en.js
    A htdocs/includes/ckeditor/_source/lang/eo.js
    A htdocs/includes/ckeditor/_source/lang/es.js
    A htdocs/includes/ckeditor/_source/lang/et.js
    A htdocs/includes/ckeditor/_source/lang/eu.js
    A htdocs/includes/ckeditor/_source/lang/fa.js
    A htdocs/includes/ckeditor/_source/lang/fi.js
    A htdocs/includes/ckeditor/_source/lang/fo.js
    A htdocs/includes/ckeditor/_source/lang/fr-ca.js
    A htdocs/includes/ckeditor/_source/lang/fr.js
    A htdocs/includes/ckeditor/_source/lang/gl.js
    A htdocs/includes/ckeditor/_source/lang/gu.js
    A htdocs/includes/ckeditor/_source/lang/he.js
    A htdocs/includes/ckeditor/_source/lang/hi.js
    A htdocs/includes/ckeditor/_source/lang/hr.js
    A htdocs/includes/ckeditor/_source/lang/hu.js
    A htdocs/includes/ckeditor/_source/lang/id.js
    A htdocs/includes/ckeditor/_source/lang/is.js
    A htdocs/includes/ckeditor/_source/lang/it.js
    A htdocs/includes/ckeditor/_source/lang/ja.js
    A htdocs/includes/ckeditor/_source/lang/ka.js
    A htdocs/includes/ckeditor/_source/lang/km.js
    A htdocs/includes/ckeditor/_source/lang/ko.js
    A htdocs/includes/ckeditor/_source/lang/lt.js
    A htdocs/includes/ckeditor/_source/lang/lv.js
    A htdocs/includes/ckeditor/_source/lang/mk.js
    A htdocs/includes/ckeditor/_source/lang/mn.js
    A htdocs/includes/ckeditor/_source/lang/ms.js
    A htdocs/includes/ckeditor/_source/lang/nb.js
    A htdocs/includes/ckeditor/_source/lang/nl.js
    A htdocs/includes/ckeditor/_source/lang/no.js
    A htdocs/includes/ckeditor/_source/lang/pl.js
    A htdocs/includes/ckeditor/_source/lang/pt-br.js
    A htdocs/includes/ckeditor/_source/lang/pt.js
    A htdocs/includes/ckeditor/_source/lang/ro.js
    A htdocs/includes/ckeditor/_source/lang/ru.js
    A htdocs/includes/ckeditor/_source/lang/sk.js
    A htdocs/includes/ckeditor/_source/lang/sl.js
    A htdocs/includes/ckeditor/_source/lang/sr-latn.js
    A htdocs/includes/ckeditor/_source/lang/sr.js
    A htdocs/includes/ckeditor/_source/lang/sv.js
    A htdocs/includes/ckeditor/_source/lang/th.js
    A htdocs/includes/ckeditor/_source/lang/tr.js
    A htdocs/includes/ckeditor/_source/lang/ug.js
    A htdocs/includes/ckeditor/_source/lang/uk.js
    A htdocs/includes/ckeditor/_source/lang/vi.js
    A htdocs/includes/ckeditor/_source/lang/zh-cn.js
    A htdocs/includes/ckeditor/_source/lang/zh.js
    A htdocs/includes/ckeditor/_source/plugins/a11yhelp/dialogs/a11yhelp.js
    A 
htdocs/includes/ckeditor/_source/plugins/a11yhelp/lang/_translationstatus.txt
    A htdocs/includes/ckeditor/_source/plugins/a11yhelp/lang/cs.js
    A htdocs/includes/ckeditor/_source/plugins/a11yhelp/lang/cy.js
    A htdocs/includes/ckeditor/_source/plugins/a11yhelp/lang/da.js
    A htdocs/includes/ckeditor/_source/plugins/a11yhelp/lang/de.js
    A htdocs/includes/ckeditor/_source/plugins/a11yhelp/lang/el.js
    A htdocs/includes/ckeditor/_source/plugins/a11yhelp/lang/en.js
    A htdocs/includes/ckeditor/_source/plugins/a11yhelp/lang/eo.js
    A htdocs/includes/ckeditor/_source/plugins/a11yhelp/lang/fa.js
    A htdocs/includes/ckeditor/_source/plugins/a11yhelp/lang/fi.js
    A htdocs/includes/ckeditor/_source/plugins/a11yhelp/lang/fr.js
    A htdocs/includes/ckeditor/_source/plugins/a11yhelp/lang/gu.js
    A htdocs/includes/ckeditor/_source/plugins/a11yhelp/lang/he.js
    A htdocs/includes/ckeditor/_source/plugins/a11yhelp/lang/it.js
    A htdocs/includes/ckeditor/_source/plugins/a11yhelp/lang/mk.js
    A htdocs/includes/ckeditor/_source/plugins/a11yhelp/lang/nb.js
    A htdocs/includes/ckeditor/_source/plugins/a11yhelp/lang/nl.js
    A htdocs/includes/ckeditor/_source/plugins/a11yhelp/lang/no.js
    A htdocs/includes/ckeditor/_source/plugins/a11yhelp/lang/pt-br.js
    A htdocs/includes/ckeditor/_source/plugins/a11yhelp/lang/ro.js
    A htdocs/includes/ckeditor/_source/plugins/a11yhelp/lang/tr.js
    A htdocs/includes/ckeditor/_source/plugins/a11yhelp/lang/ug.js
    A htdocs/includes/ckeditor/_source/plugins/a11yhelp/lang/vi.js
    A htdocs/includes/ckeditor/_source/plugins/a11yhelp/lang/zh-cn.js
    A htdocs/includes/ckeditor/_source/plugins/a11yhelp/plugin.js
    A htdocs/includes/ckeditor/_source/plugins/about/dialogs/about.js
    A htdocs/includes/ckeditor/_source/plugins/about/dialogs/logo_ckeditor.png
    A htdocs/includes/ckeditor/_source/plugins/about/plugin.js
    A htdocs/includes/ckeditor/_source/plugins/adobeair/plugin.js
    A htdocs/includes/ckeditor/_source/plugins/ajax/plugin.js
    A htdocs/includes/ckeditor/_source/plugins/autogrow/plugin.js
    A htdocs/includes/ckeditor/_source/plugins/basicstyles/plugin.js
    A htdocs/includes/ckeditor/_source/plugins/bbcode/plugin.js
    A htdocs/includes/ckeditor/_source/plugins/bidi/plugin.js
    A htdocs/includes/ckeditor/_source/plugins/blockquote/plugin.js
    A htdocs/includes/ckeditor/_source/plugins/button/plugin.js
    A htdocs/includes/ckeditor/_source/plugins/clipboard/dialogs/paste.js
    A htdocs/includes/ckeditor/_source/plugins/clipboard/plugin.js
    A htdocs/includes/ckeditor/_source/plugins/colorbutton/plugin.js
    A 
htdocs/includes/ckeditor/_source/plugins/colordialog/dialogs/colordialog.js
    A htdocs/includes/ckeditor/_source/plugins/colordialog/plugin.js
    A htdocs/includes/ckeditor/_source/plugins/contextmenu/plugin.js
    A 
htdocs/includes/ckeditor/_source/plugins/devtools/lang/_translationstatus.txt
    A htdocs/includes/ckeditor/_source/plugins/devtools/lang/bg.js
    A htdocs/includes/ckeditor/_source/plugins/devtools/lang/cs.js
    A htdocs/includes/ckeditor/_source/plugins/devtools/lang/cy.js
    A htdocs/includes/ckeditor/_source/plugins/devtools/lang/da.js
    A htdocs/includes/ckeditor/_source/plugins/devtools/lang/de.js
    A htdocs/includes/ckeditor/_source/plugins/devtools/lang/el.js
    A htdocs/includes/ckeditor/_source/plugins/devtools/lang/en.js
    A htdocs/includes/ckeditor/_source/plugins/devtools/lang/eo.js
    A htdocs/includes/ckeditor/_source/plugins/devtools/lang/et.js
    A htdocs/includes/ckeditor/_source/plugins/devtools/lang/fa.js
    A htdocs/includes/ckeditor/_source/plugins/devtools/lang/fi.js
    A htdocs/includes/ckeditor/_source/plugins/devtools/lang/fr.js
    A htdocs/includes/ckeditor/_source/plugins/devtools/lang/gu.js
    A htdocs/includes/ckeditor/_source/plugins/devtools/lang/he.js
    A htdocs/includes/ckeditor/_source/plugins/devtools/lang/hr.js
    A htdocs/includes/ckeditor/_source/plugins/devtools/lang/it.js
    A htdocs/includes/ckeditor/_source/plugins/devtools/lang/nb.js
    A htdocs/includes/ckeditor/_source/plugins/devtools/lang/nl.js
    A htdocs/includes/ckeditor/_source/plugins/devtools/lang/no.js
    A htdocs/includes/ckeditor/_source/plugins/devtools/lang/pl.js
    A htdocs/includes/ckeditor/_source/plugins/devtools/lang/pt-br.js
    A htdocs/includes/ckeditor/_source/plugins/devtools/lang/tr.js
    A htdocs/includes/ckeditor/_source/plugins/devtools/lang/ug.js
    A htdocs/includes/ckeditor/_source/plugins/devtools/lang/uk.js
    A htdocs/includes/ckeditor/_source/plugins/devtools/lang/vi.js
    A htdocs/includes/ckeditor/_source/plugins/devtools/lang/zh-cn.js
    A htdocs/includes/ckeditor/_source/plugins/devtools/plugin.js
    A htdocs/includes/ckeditor/_source/plugins/dialog/dialogDefinition.js
    A htdocs/includes/ckeditor/_source/plugins/dialog/plugin.js
    A htdocs/includes/ckeditor/_source/plugins/dialogadvtab/plugin.js
    A htdocs/includes/ckeditor/_source/plugins/dialogui/plugin.js
    A htdocs/includes/ckeditor/_source/plugins/div/dialogs/div.js
    A htdocs/includes/ckeditor/_source/plugins/div/plugin.js
    A htdocs/includes/ckeditor/_source/plugins/docprops/dialogs/docprops.js
    A htdocs/includes/ckeditor/_source/plugins/docprops/plugin.js
    A htdocs/includes/ckeditor/_source/plugins/domiterator/plugin.js
    A htdocs/includes/ckeditor/_source/plugins/editingblock/plugin.js
    A htdocs/includes/ckeditor/_source/plugins/elementspath/plugin.js
    A htdocs/includes/ckeditor/_source/plugins/enterkey/plugin.js
    A htdocs/includes/ckeditor/_source/plugins/entities/plugin.js
    A htdocs/includes/ckeditor/_source/plugins/fakeobjects/plugin.js
    A htdocs/includes/ckeditor/_source/plugins/filebrowser/plugin.js
    A htdocs/includes/ckeditor/_source/plugins/find/dialogs/find.js
    A htdocs/includes/ckeditor/_source/plugins/find/plugin.js
    A htdocs/includes/ckeditor/_source/plugins/flash/dialogs/flash.js
    A htdocs/includes/ckeditor/_source/plugins/flash/images/placeholder.png
    A htdocs/includes/ckeditor/_source/plugins/flash/plugin.js
    A htdocs/includes/ckeditor/_source/plugins/floatpanel/plugin.js
    A htdocs/includes/ckeditor/_source/plugins/font/plugin.js
    A htdocs/includes/ckeditor/_source/plugins/format/plugin.js
    A htdocs/includes/ckeditor/_source/plugins/forms/dialogs/button.js
    A htdocs/includes/ckeditor/_source/plugins/forms/dialogs/checkbox.js
    A htdocs/includes/ckeditor/_source/plugins/forms/dialogs/form.js
    A htdocs/includes/ckeditor/_source/plugins/forms/dialogs/hiddenfield.js
    A htdocs/includes/ckeditor/_source/plugins/forms/dialogs/radio.js
    A htdocs/includes/ckeditor/_source/plugins/forms/dialogs/select.js
    A htdocs/includes/ckeditor/_source/plugins/forms/dialogs/textarea.js
    A htdocs/includes/ckeditor/_source/plugins/forms/dialogs/textfield.js
    A htdocs/includes/ckeditor/_source/plugins/forms/images/hiddenfield.gif
    A htdocs/includes/ckeditor/_source/plugins/forms/plugin.js
    A htdocs/includes/ckeditor/_source/plugins/horizontalrule/plugin.js
    A htdocs/includes/ckeditor/_source/plugins/htmldataprocessor/plugin.js
    A htdocs/includes/ckeditor/_source/plugins/htmlwriter/plugin.js
    A htdocs/includes/ckeditor/_source/plugins/iframe/dialogs/iframe.js
    A htdocs/includes/ckeditor/_source/plugins/iframe/images/placeholder.png
    A htdocs/includes/ckeditor/_source/plugins/iframe/plugin.js
    A htdocs/includes/ckeditor/_source/plugins/iframedialog/plugin.js
    A htdocs/includes/ckeditor/_source/plugins/image/dialogs/image.js
    A htdocs/includes/ckeditor/_source/plugins/image/plugin.js
    A htdocs/includes/ckeditor/_source/plugins/indent/plugin.js
    A htdocs/includes/ckeditor/_source/plugins/justify/plugin.js
    A htdocs/includes/ckeditor/_source/plugins/keystrokes/plugin.js
    A htdocs/includes/ckeditor/_source/plugins/link/dialogs/anchor.js
    A htdocs/includes/ckeditor/_source/plugins/link/dialogs/link.js
    A htdocs/includes/ckeditor/_source/plugins/link/images/anchor.gif
    A htdocs/includes/ckeditor/_source/plugins/link/plugin.js
    A htdocs/includes/ckeditor/_source/plugins/list/plugin.js
    A htdocs/includes/ckeditor/_source/plugins/listblock/plugin.js
    A htdocs/includes/ckeditor/_source/plugins/liststyle/dialogs/liststyle.js
    A htdocs/includes/ckeditor/_source/plugins/liststyle/plugin.js
    A htdocs/includes/ckeditor/_source/plugins/maximize/plugin.js
    A htdocs/includes/ckeditor/_source/plugins/menu/plugin.js
    A htdocs/includes/ckeditor/_source/plugins/menubutton/plugin.js
    A htdocs/includes/ckeditor/_source/plugins/newpage/plugin.js
    A htdocs/includes/ckeditor/_source/plugins/pagebreak/images/pagebreak.gif
    A htdocs/includes/ckeditor/_source/plugins/pagebreak/plugin.js
    A htdocs/includes/ckeditor/_source/plugins/panel/plugin.js
    A htdocs/includes/ckeditor/_source/plugins/panelbutton/plugin.js
    A htdocs/includes/ckeditor/_source/plugins/pastefromword/filter/default.js
    A htdocs/includes/ckeditor/_source/plugins/pastefromword/plugin.js
    A htdocs/includes/ckeditor/_source/plugins/pastetext/dialogs/pastetext.js
    A htdocs/includes/ckeditor/_source/plugins/pastetext/plugin.js
    A 
htdocs/includes/ckeditor/_source/plugins/placeholder/dialogs/placeholder.js
    A 
htdocs/includes/ckeditor/_source/plugins/placeholder/lang/_translationstatus.txt
    A htdocs/includes/ckeditor/_source/plugins/placeholder/lang/bg.js
    A htdocs/includes/ckeditor/_source/plugins/placeholder/lang/cs.js
    A htdocs/includes/ckeditor/_source/plugins/placeholder/lang/cy.js
    A htdocs/includes/ckeditor/_source/plugins/placeholder/lang/da.js
    A htdocs/includes/ckeditor/_source/plugins/placeholder/lang/de.js
    A htdocs/includes/ckeditor/_source/plugins/placeholder/lang/el.js
    A htdocs/includes/ckeditor/_source/plugins/placeholder/lang/en.js
    A htdocs/includes/ckeditor/_source/plugins/placeholder/lang/eo.js
    A htdocs/includes/ckeditor/_source/plugins/placeholder/lang/et.js
    A htdocs/includes/ckeditor/_source/plugins/placeholder/lang/fa.js
    A htdocs/includes/ckeditor/_source/plugins/placeholder/lang/fi.js
    A htdocs/includes/ckeditor/_source/plugins/placeholder/lang/fr.js
    A htdocs/includes/ckeditor/_source/plugins/placeholder/lang/he.js
    A htdocs/includes/ckeditor/_source/plugins/placeholder/lang/hr.js
    A htdocs/includes/ckeditor/_source/plugins/placeholder/lang/it.js
    A htdocs/includes/ckeditor/_source/plugins/placeholder/lang/nb.js
    A htdocs/includes/ckeditor/_source/plugins/placeholder/lang/nl.js
    A htdocs/includes/ckeditor/_source/plugins/placeholder/lang/no.js
    A htdocs/includes/ckeditor/_source/plugins/placeholder/lang/pl.js
    A htdocs/includes/ckeditor/_source/plugins/placeholder/lang/pt-br.js
    A htdocs/includes/ckeditor/_source/plugins/placeholder/lang/tr.js
    A htdocs/includes/ckeditor/_source/plugins/placeholder/lang/ug.js
    A htdocs/includes/ckeditor/_source/plugins/placeholder/lang/uk.js
    A htdocs/includes/ckeditor/_source/plugins/placeholder/lang/vi.js
    A htdocs/includes/ckeditor/_source/plugins/placeholder/lang/zh-cn.js
    A htdocs/includes/ckeditor/_source/plugins/placeholder/placeholder.gif
    A htdocs/includes/ckeditor/_source/plugins/placeholder/plugin.js
    A htdocs/includes/ckeditor/_source/plugins/popup/plugin.js
    A htdocs/includes/ckeditor/_source/plugins/preview/plugin.js
    A htdocs/includes/ckeditor/_source/plugins/preview/preview.html
    A htdocs/includes/ckeditor/_source/plugins/print/plugin.js
    A htdocs/includes/ckeditor/_source/plugins/removeformat/plugin.js
    A htdocs/includes/ckeditor/_source/plugins/resize/plugin.js
    A htdocs/includes/ckeditor/_source/plugins/richcombo/plugin.js
    A htdocs/includes/ckeditor/_source/plugins/save/plugin.js
    A htdocs/includes/ckeditor/_source/plugins/scayt/dialogs/options.js
    A htdocs/includes/ckeditor/_source/plugins/scayt/dialogs/toolbar.css
    A htdocs/includes/ckeditor/_source/plugins/scayt/plugin.js
    A htdocs/includes/ckeditor/_source/plugins/selection/plugin.js
    A 
htdocs/includes/ckeditor/_source/plugins/showblocks/images/block_address.png
    A 
htdocs/includes/ckeditor/_source/plugins/showblocks/images/block_blockquote.png
    A htdocs/includes/ckeditor/_source/plugins/showblocks/images/block_div.png
    A htdocs/includes/ckeditor/_source/plugins/showblocks/images/block_h1.png
    A htdocs/includes/ckeditor/_source/plugins/showblocks/images/block_h2.png
    A htdocs/includes/ckeditor/_source/plugins/showblocks/images/block_h3.png
    A htdocs/includes/ckeditor/_source/plugins/showblocks/images/block_h4.png
    A htdocs/includes/ckeditor/_source/plugins/showblocks/images/block_h5.png
    A htdocs/includes/ckeditor/_source/plugins/showblocks/images/block_h6.png
    A htdocs/includes/ckeditor/_source/plugins/showblocks/images/block_p.png
    A htdocs/includes/ckeditor/_source/plugins/showblocks/images/block_pre.png
    A htdocs/includes/ckeditor/_source/plugins/showblocks/plugin.js
    A htdocs/includes/ckeditor/_source/plugins/showborders/plugin.js
    A htdocs/includes/ckeditor/_source/plugins/smiley/dialogs/smiley.js
    A htdocs/includes/ckeditor/_source/plugins/smiley/images/angel_smile.gif
    A htdocs/includes/ckeditor/_source/plugins/smiley/images/angry_smile.gif
    A htdocs/includes/ckeditor/_source/plugins/smiley/images/broken_heart.gif
    A htdocs/includes/ckeditor/_source/plugins/smiley/images/confused_smile.gif
    A htdocs/includes/ckeditor/_source/plugins/smiley/images/cry_smile.gif
    A htdocs/includes/ckeditor/_source/plugins/smiley/images/devil_smile.gif
    A 
htdocs/includes/ckeditor/_source/plugins/smiley/images/embaressed_smile.gif
    A htdocs/includes/ckeditor/_source/plugins/smiley/images/envelope.gif
    A htdocs/includes/ckeditor/_source/plugins/smiley/images/heart.gif
    A htdocs/includes/ckeditor/_source/plugins/smiley/images/kiss.gif
    A htdocs/includes/ckeditor/_source/plugins/smiley/images/lightbulb.gif
    A htdocs/includes/ckeditor/_source/plugins/smiley/images/omg_smile.gif
    A htdocs/includes/ckeditor/_source/plugins/smiley/images/regular_smile.gif
    A htdocs/includes/ckeditor/_source/plugins/smiley/images/sad_smile.gif
    A htdocs/includes/ckeditor/_source/plugins/smiley/images/shades_smile.gif
    A htdocs/includes/ckeditor/_source/plugins/smiley/images/teeth_smile.gif
    A htdocs/includes/ckeditor/_source/plugins/smiley/images/thumbs_down.gif
    A htdocs/includes/ckeditor/_source/plugins/smiley/images/thumbs_up.gif
    A htdocs/includes/ckeditor/_source/plugins/smiley/images/tounge_smile.gif
    A 
htdocs/includes/ckeditor/_source/plugins/smiley/images/whatchutalkingabout_smile.gif
    A htdocs/includes/ckeditor/_source/plugins/smiley/images/wink_smile.gif
    A htdocs/includes/ckeditor/_source/plugins/smiley/plugin.js
    A htdocs/includes/ckeditor/_source/plugins/sourcearea/plugin.js
    A 
htdocs/includes/ckeditor/_source/plugins/specialchar/dialogs/specialchar.js
    A 
htdocs/includes/ckeditor/_source/plugins/specialchar/lang/_translationstatus.txt
    A htdocs/includes/ckeditor/_source/plugins/specialchar/lang/cs.js
    A htdocs/includes/ckeditor/_source/plugins/specialchar/lang/cy.js
    A htdocs/includes/ckeditor/_source/plugins/specialchar/lang/de.js
    A htdocs/includes/ckeditor/_source/plugins/specialchar/lang/el.js
    A htdocs/includes/ckeditor/_source/plugins/specialchar/lang/en.js
    A htdocs/includes/ckeditor/_source/plugins/specialchar/lang/eo.js
    A htdocs/includes/ckeditor/_source/plugins/specialchar/lang/et.js
    A htdocs/includes/ckeditor/_source/plugins/specialchar/lang/fa.js
    A htdocs/includes/ckeditor/_source/plugins/specialchar/lang/fi.js
    A htdocs/includes/ckeditor/_source/plugins/specialchar/lang/fr.js
    A htdocs/includes/ckeditor/_source/plugins/specialchar/lang/he.js
    A htdocs/includes/ckeditor/_source/plugins/specialchar/lang/hr.js
    A htdocs/includes/ckeditor/_source/plugins/specialchar/lang/it.js
    A htdocs/includes/ckeditor/_source/plugins/specialchar/lang/nb.js
    A htdocs/includes/ckeditor/_source/plugins/specialchar/lang/nl.js
    A htdocs/includes/ckeditor/_source/plugins/specialchar/lang/no.js
    A htdocs/includes/ckeditor/_source/plugins/specialchar/lang/pt-br.js
    A htdocs/includes/ckeditor/_source/plugins/specialchar/lang/tr.js
    A htdocs/includes/ckeditor/_source/plugins/specialchar/lang/ug.js
    A htdocs/includes/ckeditor/_source/plugins/specialchar/lang/zh-cn.js
    A htdocs/includes/ckeditor/_source/plugins/specialchar/plugin.js
    A htdocs/includes/ckeditor/_source/plugins/styles/plugin.js
    A htdocs/includes/ckeditor/_source/plugins/styles/styles/default.js
    A htdocs/includes/ckeditor/_source/plugins/stylescombo/plugin.js
    A htdocs/includes/ckeditor/_source/plugins/stylesheetparser/plugin.js
    A htdocs/includes/ckeditor/_source/plugins/tab/plugin.js
    A htdocs/includes/ckeditor/_source/plugins/table/dialogs/table.js
    A htdocs/includes/ckeditor/_source/plugins/table/plugin.js
    A htdocs/includes/ckeditor/_source/plugins/tableresize/plugin.js
    A htdocs/includes/ckeditor/_source/plugins/tabletools/dialogs/tableCell.js
    A htdocs/includes/ckeditor/_source/plugins/tabletools/plugin.js
    A htdocs/includes/ckeditor/_source/plugins/templates/dialogs/templates.js
    A htdocs/includes/ckeditor/_source/plugins/templates/plugin.js
    A htdocs/includes/ckeditor/_source/plugins/templates/templates/default.js
    A 
htdocs/includes/ckeditor/_source/plugins/templates/templates/images/template1.gif
    A 
htdocs/includes/ckeditor/_source/plugins/templates/templates/images/template2.gif
    A 
htdocs/includes/ckeditor/_source/plugins/templates/templates/images/template3.gif
    A htdocs/includes/ckeditor/_source/plugins/toolbar/plugin.js
    A htdocs/includes/ckeditor/_source/plugins/uicolor/dialogs/uicolor.js
    A 
htdocs/includes/ckeditor/_source/plugins/uicolor/lang/_translationstatus.txt
    A htdocs/includes/ckeditor/_source/plugins/uicolor/lang/bg.js
    A htdocs/includes/ckeditor/_source/plugins/uicolor/lang/cs.js
    A htdocs/includes/ckeditor/_source/plugins/uicolor/lang/cy.js
    A htdocs/includes/ckeditor/_source/plugins/uicolor/lang/da.js
    A htdocs/includes/ckeditor/_source/plugins/uicolor/lang/de.js
    A htdocs/includes/ckeditor/_source/plugins/uicolor/lang/el.js
    A htdocs/includes/ckeditor/_source/plugins/uicolor/lang/en.js
    A htdocs/includes/ckeditor/_source/plugins/uicolor/lang/eo.js
    A htdocs/includes/ckeditor/_source/plugins/uicolor/lang/et.js
    A htdocs/includes/ckeditor/_source/plugins/uicolor/lang/fa.js
    A htdocs/includes/ckeditor/_source/plugins/uicolor/lang/fi.js
    A htdocs/includes/ckeditor/_source/plugins/uicolor/lang/fr.js
    A htdocs/includes/ckeditor/_source/plugins/uicolor/lang/he.js
    A htdocs/includes/ckeditor/_source/plugins/uicolor/lang/hr.js
    A htdocs/includes/ckeditor/_source/plugins/uicolor/lang/it.js
    A htdocs/includes/ckeditor/_source/plugins/uicolor/lang/mk.js
    A htdocs/includes/ckeditor/_source/plugins/uicolor/lang/nb.js
    A htdocs/includes/ckeditor/_source/plugins/uicolor/lang/nl.js
    A htdocs/includes/ckeditor/_source/plugins/uicolor/lang/no.js
    A htdocs/includes/ckeditor/_source/plugins/uicolor/lang/pl.js
    A htdocs/includes/ckeditor/_source/plugins/uicolor/lang/pt-br.js
    A htdocs/includes/ckeditor/_source/plugins/uicolor/lang/tr.js
    A htdocs/includes/ckeditor/_source/plugins/uicolor/lang/ug.js
    A htdocs/includes/ckeditor/_source/plugins/uicolor/lang/uk.js
    A htdocs/includes/ckeditor/_source/plugins/uicolor/lang/vi.js
    A htdocs/includes/ckeditor/_source/plugins/uicolor/lang/zh-cn.js
    A htdocs/includes/ckeditor/_source/plugins/uicolor/plugin.js
    A htdocs/includes/ckeditor/_source/plugins/uicolor/uicolor.gif
    A htdocs/includes/ckeditor/_source/plugins/uicolor/yui/assets/hue_bg.png
    A htdocs/includes/ckeditor/_source/plugins/uicolor/yui/assets/hue_thumb.png
    A 
htdocs/includes/ckeditor/_source/plugins/uicolor/yui/assets/picker_mask.png
    A 
htdocs/includes/ckeditor/_source/plugins/uicolor/yui/assets/picker_thumb.png
    A htdocs/includes/ckeditor/_source/plugins/uicolor/yui/assets/yui.css
    A htdocs/includes/ckeditor/_source/plugins/uicolor/yui/yui.js
    A htdocs/includes/ckeditor/_source/plugins/undo/plugin.js
    A htdocs/includes/ckeditor/_source/plugins/wsc/dialogs/ciframe.html
    A htdocs/includes/ckeditor/_source/plugins/wsc/dialogs/tmpFrameset.html
    A htdocs/includes/ckeditor/_source/plugins/wsc/dialogs/wsc.css
    A htdocs/includes/ckeditor/_source/plugins/wsc/dialogs/wsc.js
    A htdocs/includes/ckeditor/_source/plugins/wsc/plugin.js
    A htdocs/includes/ckeditor/_source/plugins/wysiwygarea/plugin.js
    A htdocs/includes/ckeditor/_source/plugins/xml/plugin.js
    A htdocs/includes/ckeditor/_source/skins/kama/dialog.css
    A htdocs/includes/ckeditor/_source/skins/kama/editor.css
    A htdocs/includes/ckeditor/_source/skins/kama/elementspath.css
    A htdocs/includes/ckeditor/_source/skins/kama/icons.css
    A htdocs/includes/ckeditor/_source/skins/kama/icons.png
    A htdocs/includes/ckeditor/_source/skins/kama/icons_rtl.png
    A htdocs/includes/ckeditor/_source/skins/kama/images/dialog_sides.gif
    A htdocs/includes/ckeditor/_source/skins/kama/images/dialog_sides.png
    A htdocs/includes/ckeditor/_source/skins/kama/images/dialog_sides_rtl.png
    A htdocs/includes/ckeditor/_source/skins/kama/images/mini.gif
    A htdocs/includes/ckeditor/_source/skins/kama/images/noimage.png
    A htdocs/includes/ckeditor/_source/skins/kama/images/sprites.png
    A htdocs/includes/ckeditor/_source/skins/kama/images/sprites_ie6.png
    A htdocs/includes/ckeditor/_source/skins/kama/images/toolbar_start.gif
    A htdocs/includes/ckeditor/_source/skins/kama/mainui.css
    A htdocs/includes/ckeditor/_source/skins/kama/menu.css
    A htdocs/includes/ckeditor/_source/skins/kama/panel.css
    A htdocs/includes/ckeditor/_source/skins/kama/presets.css
    A htdocs/includes/ckeditor/_source/skins/kama/reset.css
    A htdocs/includes/ckeditor/_source/skins/kama/richcombo.css
    A htdocs/includes/ckeditor/_source/skins/kama/skin.js
    A htdocs/includes/ckeditor/_source/skins/kama/templates.css
    A htdocs/includes/ckeditor/_source/skins/kama/toolbar.css
    A htdocs/includes/ckeditor/_source/skins/office2003/dialog.css
    A htdocs/includes/ckeditor/_source/skins/office2003/editor.css
    A htdocs/includes/ckeditor/_source/skins/office2003/elementspath.css
    A htdocs/includes/ckeditor/_source/skins/office2003/icons.css
    A htdocs/includes/ckeditor/_source/skins/office2003/icons.png
    A htdocs/includes/ckeditor/_source/skins/office2003/icons_rtl.png
    A htdocs/includes/ckeditor/_source/skins/office2003/images/dialog_sides.gif
    A htdocs/includes/ckeditor/_source/skins/office2003/images/dialog_sides.png
    A 
htdocs/includes/ckeditor/_source/skins/office2003/images/dialog_sides_rtl.png
    A htdocs/includes/ckeditor/_source/skins/office2003/images/mini.gif
    A htdocs/includes/ckeditor/_source/skins/office2003/images/noimage.png
    A htdocs/includes/ckeditor/_source/skins/office2003/images/sprites.png
    A htdocs/includes/ckeditor/_source/skins/office2003/images/sprites_ie6.png
    A htdocs/includes/ckeditor/_source/skins/office2003/mainui.css
    A htdocs/includes/ckeditor/_source/skins/office2003/menu.css
    A htdocs/includes/ckeditor/_source/skins/office2003/panel.css
    A htdocs/includes/ckeditor/_source/skins/office2003/presets.css
    A htdocs/includes/ckeditor/_source/skins/office2003/reset.css
    A htdocs/includes/ckeditor/_source/skins/office2003/richcombo.css
    A htdocs/includes/ckeditor/_source/skins/office2003/skin.js
    A htdocs/includes/ckeditor/_source/skins/office2003/templates.css
    A htdocs/includes/ckeditor/_source/skins/office2003/toolbar.css
    A htdocs/includes/ckeditor/_source/skins/v2/dialog.css
    A htdocs/includes/ckeditor/_source/skins/v2/editor.css
    A htdocs/includes/ckeditor/_source/skins/v2/elementspath.css
    A htdocs/includes/ckeditor/_source/skins/v2/icons.css
    A htdocs/includes/ckeditor/_source/skins/v2/icons.png
    A htdocs/includes/ckeditor/_source/skins/v2/icons_rtl.png
    A htdocs/includes/ckeditor/_source/skins/v2/images/dialog_sides.gif
    A htdocs/includes/ckeditor/_source/skins/v2/images/dialog_sides.png
    A htdocs/includes/ckeditor/_source/skins/v2/images/dialog_sides_rtl.png
    A htdocs/includes/ckeditor/_source/skins/v2/images/mini.gif
    A htdocs/includes/ckeditor/_source/skins/v2/images/noimage.png
    A htdocs/includes/ckeditor/_source/skins/v2/images/sprites.png
    A htdocs/includes/ckeditor/_source/skins/v2/images/sprites_ie6.png
    A htdocs/includes/ckeditor/_source/skins/v2/images/toolbar_start.gif
    A htdocs/includes/ckeditor/_source/skins/v2/mainui.css
    A htdocs/includes/ckeditor/_source/skins/v2/menu.css
    A htdocs/includes/ckeditor/_source/skins/v2/panel.css
    A htdocs/includes/ckeditor/_source/skins/v2/presets.css
    A htdocs/includes/ckeditor/_source/skins/v2/reset.css
    A htdocs/includes/ckeditor/_source/skins/v2/richcombo.css
    A htdocs/includes/ckeditor/_source/skins/v2/skin.js
    A htdocs/includes/ckeditor/_source/skins/v2/templates.css
    A htdocs/includes/ckeditor/_source/skins/v2/toolbar.css
    A htdocs/includes/ckeditor/_source/themes/default/theme.js
    R htdocs/includes/jsgantt/jsgantt.compressed.js
    A htdocs/includes/jsgantt/jsgantt.min.js

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/3.3' into 3.3_backported


  Commit: 52a27a42020034e027a51db7c74c27ee0c2fb0fc
      
https://github.com/Dolibarr/dolibarr/commit/52a27a42020034e027a51db7c74c27ee0c2fb0fc
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-09-22 (Sun, 22 Sep 2013)

  Changed paths:
    M build/debian/get-orig-source.sh
    M build/debian/watch
    M build/tgz/tar_exclude.txt
    M htdocs/comm/action/fiche.php
    M htdocs/core/modules/action/rapport.pdf.php
    M htdocs/core/modules/cheque/pdf/pdf_blochet.class.php
    M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
    M htdocs/core/modules/expedition/doc/pdf_expedition_merou.modules.php
    M htdocs/core/modules/expedition/doc/pdf_expedition_rouget.modules.php
    M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
    M htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
    M htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
    M htdocs/core/modules/project/pdf/pdf_baleine.modules.php
    M htdocs/core/modules/propale/doc/pdf_azur.modules.php
    M htdocs/core/modules/rapport/pdf_paiement.class.php
    M htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
    M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/3.3' into 3.3_backported

Conflicts:
        htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php


  Commit: 9fedc424b9302e914349b16b334619fc1806c80c
      
https://github.com/Dolibarr/dolibarr/commit/9fedc424b9302e914349b16b334619fc1806c80c
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-09-25 (Wed, 25 Sep 2013)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/3.3' into 3.3_backported


  Commit: 836aa085472b1738877ffd0a59666106398d06cd
      
https://github.com/Dolibarr/dolibarr/commit/836aa085472b1738877ffd0a59666106398d06cd
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-09-28 (Sat, 28 Sep 2013)

  Changed paths:
    M ChangeLog
    M htdocs/core/class/html.form.class.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/product/class/product.class.php

  Log Message:
  -----------
  New: Add hidden option MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS

Conflicts:
        ChangeLog


  Commit: 4506122f35be65fd0ffbb3d1eae4bf0854db786e
      
https://github.com/Dolibarr/dolibarr/commit/4506122f35be65fd0ffbb3d1eae4bf0854db786e
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-09-28 (Sat, 28 Sep 2013)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/3.3_backported' into 3.4_backported


Compare: 
https://github.com/Dolibarr/dolibarr/compare/3ac305e6a168...4506122f35be

reply via email to

[Prev in Thread] Current Thread [Next in Thread]