This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".
The branch, master has been updated
via 4e38ca3652e845700ab31f92f5c8b69b4217fb6a (commit)
via d63672879fdd068809fedc25e603293ead3adb50 (commit)
via 4bfa852daee1f6d3fd39b8142d311b0f33a3da4e (commit)
via df10014490ca945c1248303c35ceb8754dbb4ce6 (commit)
via 78a6eed0ccc24d58ead1fcb2d0aa1279388bbc39 (commit)
via 1c98ff1c2941f4abef0e8c7ed9c7d45c90d0c5da (commit)
via 6be8b27afec159ac80da91db604ef5f910554574 (commit)
via b5e43cd88eb211f1d34da9942459ae119ae3141c (commit)
via 55e6da7a8b21eafdc8bff330ef828d08a914837a (commit)
via e7ff6d71ecf3ba3c71a550acf56832386eca0f01 (commit)
via f9137bfb0fa6f4d038032fcb301a1afe014b79c8 (commit)
via 3004b6903bb4f5ccbdd054be466b0ca50e833250 (commit)
via 4c39665a5e8281bb4932931eb9a1d2b1372087cf (commit)
via dad37574492789add570afbc0b6166e0be0bdf86 (commit)
via eba340342a21afe37fc4822327362086213fb2c8 (commit)
via 14d1214fdc331571942ce92cf46309adecfffb4b (commit)
via 46457e98aba26896b26e30d734ba720984074091 (commit)
from 5114310e9ec2cd253a86b235b3275f6ec1922c2a (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 4e38ca3652e845700ab31f92f5c8b69b4217fb6a
Merge: 5114310 d636728
Author: Franck Villaume <[email protected]>
Date: Sat Jun 21 09:25:33 2014 +0200
merge Branch_5_3
diff --cc src/CHANGES
index 0144109,554b44e..fb48c37
--- a/src/CHANGES
+++ b/src/CHANGES
@@@ -1,14 -1,10 +1,21 @@@
+Fusionforge-X.X:
+* [#658] Docman: Basic Webdav write mkcol, delete, put, move support
(TrivialDev)
+* [#657] Docman: Add move mass actions (TrivialDev)
+* [#692] FRS: Reorganise code (TrivialDev)
+* [#656] General: drop tipsy plugin, use standard jQuery UI tooltip already
provided (TrivialDev)
+* [#663] General: FusionForge Theme & jQuery UI theme sync (TrivialDev)
+* [#664] General: Update the jQuery & jQuery UI frameworks (TrivialDev)
+* [#669] General: feedback, error_msg, warning_msg are now store in cookie.
(TrivialDev)
+* Plugin scmhook: Update git post-receive eMail hook (tarent solutions GmbH,
Teckids e.V.)
+* [#684] Widget Public Area: display FRS link (TrivialDev)
+
+ Fusionforge-5.3.2:
+ * Software map: fix "value too long for type character varying(255)" error in
cron db_trove_maint.php (Inria)
+ * SCM Git: suppress 'warning: You appear to have cloned an empty repository.'
in create_scm_repos.php (Inria)
+ * SCM Git: handle bad encoding when gathering stats (Inria)
+ * Plugin mediawiki: fix paths in import/export scripts (Inria)
+ * Admin: fix edit table themes, fix frs_processor sequence [#691] (TrivialDev)
+
Fusionforge-5.3.1:
* Docman: Basic Webdav write mkcol support (TrivialDev)
* Docman: fix Webdav access in some PHP configurations (Inria)
diff --cc src/common/include/session.php
index 3996108,3d193be..aa3c7e9
--- a/src/common/include/session.php
+++ b/src/common/include/session.php
@@@ -423,9 -428,8 +433,9 @@@ function session_redirect_uri($loc, $pe
*
* @param string $loc Absolute path within the site
*/
- function session_redirect($loc) {
+ function session_redirect($loc, $permanent=true) {
+ util_save_messages();
- session_redirect_uri(util_make_url($loc));
+ session_redirect_uri(util_make_url($loc), $permanent);
exit;
}
-----------------------------------------------------------------------
Summary of changes:
src/CHANGES | 7 +++++++
src/common/frs/FRSPackage.class.php | 2 +-
src/common/include/exit.php | 3 ++-
src/common/include/session.php | 24 ++++++++++++++-------
src/db/20140616-sync-trove_agg-type.sql | 5 +++++
src/db/20140621-set-frs_processor_seq.sql | 1 +
src/plugins/mediawiki/bin/mw-fulldump | 28 +++++++++++++++++--------
src/plugins/mediawiki/bin/mw-fullrestore | 23 ++++++++++----------
src/plugins/scmgit/common/GitPlugin.class.php | 8 +++++--
src/www/admin/admin_table.php | 11 +++++-----
src/www/tracker/download.php | 4 +++-
11 files changed, 78 insertions(+), 38 deletions(-)
create mode 100644 src/db/20140616-sync-trove_agg-type.sql
create mode 100644 src/db/20140621-set-frs_processor_seq.sql
mode change 100644 => 100755 src/plugins/mediawiki/bin/mw-fulldump
mode change 100644 => 100755 src/plugins/mediawiki/bin/mw-fullrestore
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
