[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] dfe1ee: Fix: count of notification em
From: |
Laurent Destailleur |
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] dfe1ee: Fix: count of notification emails was wrong |
Date: |
Fri, 13 Mar 2015 09:46:50 -0700 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: dfe1ee7e7d26dbb5d73a8fff685d5d8223309a95
https://github.com/Dolibarr/dolibarr/commit/dfe1ee7e7d26dbb5d73a8fff685d5d8223309a95
Author: Laurent Destailleur <address@hidden>
Date: 2015-03-13 (Fri, 13 Mar 2015)
Changed paths:
M htdocs/langs/en_US/other.lang
M htdocs/societe/notify/card.php
Log Message:
-----------
Fix: count of notification emails was wrong
Commit: 895b2c6e9c79dec5377c335b0843f974992a6392
https://github.com/Dolibarr/dolibarr/commit/895b2c6e9c79dec5377c335b0843f974992a6392
Author: Laurent Destailleur <address@hidden>
Date: 2015-03-13 (Fri, 13 Mar 2015)
Changed paths:
M htdocs/comm/action/peruser.php
M htdocs/core/lib/agenda.lib.php
Log Message:
-----------
Fix bad merge
Commit: a452823e1ed420c94091351390e340a558dd5476
https://github.com/Dolibarr/dolibarr/commit/a452823e1ed420c94091351390e340a558dd5476
Author: Laurent Destailleur <address@hidden>
Date: 2015-03-13 (Fri, 13 Mar 2015)
Changed paths:
M htdocs/core/tpl/objectline_create.tpl.php
M htdocs/core/tpl/objectline_edit.tpl.php
M htdocs/theme/eldy/ckeditor/config.js
Log Message:
-----------
Include option FCKEDITOR_ENABLE_DETAILS_FULL to restore compatibility
with 3.6
Commit: b47e16fbe9ce92c7bc406791b20c8c93b0a36188
https://github.com/Dolibarr/dolibarr/commit/b47e16fbe9ce92c7bc406791b20c8c93b0a36188
Author: Laurent Destailleur <address@hidden>
Date: 2015-03-13 (Fri, 13 Mar 2015)
Changed paths:
M ChangeLog
Log Message:
-----------
Update changelog
Commit: 5cc48c7c78b3d3cee1d84d1fc19de49d242824c5
https://github.com/Dolibarr/dolibarr/commit/5cc48c7c78b3d3cee1d84d1fc19de49d242824c5
Author: Laurent Destailleur <address@hidden>
Date: 2015-03-13 (Fri, 13 Mar 2015)
Changed paths:
R dev/deduplicatefilelinesrecursively.sh
M dev/fixdosfiles.sh
M dev/fixduplicatelangkey.sh
A dev/fixduplicatelines.sh
M dev/fixperms.sh
M dev/fixutf8bomfiles.sh
Log Message:
-----------
Prepare cleaning tools for release.
Commit: 927925f4fdb50898d9bbef98f25aee229e98b61a
https://github.com/Dolibarr/dolibarr/commit/927925f4fdb50898d9bbef98f25aee229e98b61a
Author: Laurent Destailleur <address@hidden>
Date: 2015-03-13 (Fri, 13 Mar 2015)
Changed paths:
A dev/fixaltlanguages.sh
M dev/translation/strip_language_file.php
Log Message:
-----------
Can also sync alternatives languages from transifex now.
Commit: f75749cc2b3232ab586d73e1cf04abe0f2fce4ed
https://github.com/Dolibarr/dolibarr/commit/f75749cc2b3232ab586d73e1cf04abe0f2fce4ed
Author: Laurent Destailleur <address@hidden>
Date: 2015-03-13 (Fri, 13 Mar 2015)
Changed paths:
M htdocs/langs/de_AT/admin.lang
M htdocs/langs/es_AR/admin.lang
M htdocs/langs/es_CL/admin.lang
M htdocs/langs/es_DO/admin.lang
M htdocs/langs/es_HN/admin.lang
M htdocs/langs/es_MX/admin.lang
M htdocs/langs/es_PE/admin.lang
M htdocs/langs/es_PR/admin.lang
M htdocs/langs/pt_BR/accountancy.lang
M htdocs/langs/pt_BR/admin.lang
M htdocs/langs/pt_BR/agenda.lang
M htdocs/langs/pt_BR/banks.lang
M htdocs/langs/pt_BR/boxes.lang
M htdocs/langs/pt_BR/categories.lang
M htdocs/langs/pt_BR/commercial.lang
M htdocs/langs/pt_BR/companies.lang
M htdocs/langs/pt_BR/compta.lang
M htdocs/langs/pt_BR/contracts.lang
M htdocs/langs/pt_BR/install.lang
M htdocs/langs/pt_BR/languages.lang
M htdocs/langs/pt_BR/mails.lang
M htdocs/langs/pt_BR/main.lang
M htdocs/langs/pt_BR/other.lang
M htdocs/langs/pt_BR/products.lang
M htdocs/langs/pt_BR/projects.lang
M htdocs/langs/pt_BR/resource.lang
M htdocs/langs/pt_BR/users.lang
Log Message:
-----------
Sync transifex
Commit: 687e3d250bb467cfd82685eca61e423405ca8f66
https://github.com/Dolibarr/dolibarr/commit/687e3d250bb467cfd82685eca61e423405ca8f66
Author: Laurent Destailleur <address@hidden>
Date: 2015-03-13 (Fri, 13 Mar 2015)
Changed paths:
M ChangeLog
R dev/deduplicatefilelinesrecursively.sh
A dev/fixaltlanguages.sh
M dev/fixdosfiles.sh
M dev/fixduplicatelangkey.sh
A dev/fixduplicatelines.sh
M dev/fixperms.sh
M dev/fixutf8bomfiles.sh
M dev/translation/strip_language_file.php
M htdocs/comm/action/peruser.php
M htdocs/core/tpl/objectline_create.tpl.php
M htdocs/core/tpl/objectline_edit.tpl.php
M htdocs/langs/de_AT/admin.lang
M htdocs/langs/en_US/other.lang
M htdocs/langs/es_AR/admin.lang
M htdocs/langs/es_CL/admin.lang
M htdocs/langs/es_DO/admin.lang
M htdocs/langs/es_HN/admin.lang
M htdocs/langs/es_MX/admin.lang
M htdocs/langs/es_PE/admin.lang
M htdocs/langs/es_PR/admin.lang
M htdocs/langs/pt_BR/accountancy.lang
M htdocs/langs/pt_BR/admin.lang
M htdocs/langs/pt_BR/agenda.lang
M htdocs/langs/pt_BR/banks.lang
M htdocs/langs/pt_BR/boxes.lang
M htdocs/langs/pt_BR/categories.lang
M htdocs/langs/pt_BR/commercial.lang
M htdocs/langs/pt_BR/companies.lang
M htdocs/langs/pt_BR/compta.lang
M htdocs/langs/pt_BR/contracts.lang
M htdocs/langs/pt_BR/install.lang
M htdocs/langs/pt_BR/languages.lang
M htdocs/langs/pt_BR/mails.lang
M htdocs/langs/pt_BR/main.lang
M htdocs/langs/pt_BR/other.lang
M htdocs/langs/pt_BR/products.lang
M htdocs/langs/pt_BR/projects.lang
M htdocs/langs/pt_BR/resource.lang
M htdocs/langs/pt_BR/users.lang
M htdocs/societe/notify/card.php
M htdocs/theme/eldy/ckeditor/config.js
Log Message:
-----------
Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
dev/fixdosfiles.sh
htdocs/core/tpl/objectline_edit.tpl.php
Compare:
https://github.com/Dolibarr/dolibarr/compare/279e16a8112c...687e3d250bb4