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, feature/twig-template-engine has been updated
via b428a9dd0483f23f4aed11a1d4f4f8b4fe24ea98 (commit)
via e5ce0594fc79107c25a945307a2066b1e58cf303 (commit)
via 31cbf2af607e87d8641bca400d17e059d1ff05af (commit)
via 8f6a28a37a26c316bc664a0980dbcf1510c53f87 (commit)
via 807e25b8bf9981086f999cc6db6e0511952ec5e7 (commit)
via a5c8c3c2653de2cd91443b7ee9639e765ffefcb0 (commit)
via 1bf2952570aa3d04792a3ea6fce1ed51b5effb24 (commit)
via 848df00f6c0a944f83a6cbce444d1021ca64ced4 (commit)
via 66a6f086dfffbe65d2efbfd32e504ef1645266ec (commit)
via f5e9eb79bb5fc6ba6057db6a6408e3a22d387633 (commit)
via 5c72dbf32036283ecec72556f919f95dd61d3cbb (commit)
via 4fdc095972d45b03a5a1576bdfda1db299fc38aa (commit)
via de1bfa135c0a6d4298e5e3c5b9a6bf6276a86c9a (commit)
via 7ad613e2af25123fde76eed1a151b5578fffa6d9 (commit)
via c41d4330fc84510ac03ad0dc174da575ddbf9747 (commit)
via 7a8e533d7b1c31392e12178866513d86967bccb7 (commit)
via 11dbb66b84578ac2650d72ab6a769c78a88a640e (commit)
via f4de37c176b6a76a5db62b1fea75a1a93aeabb76 (commit)
via 324eaaefca9997452978d8b2e337cdedfb61b987 (commit)
via 0eb62e68afdc1889d316c5860efec7f2999965cc (commit)
via ad64a4e2b3f0e31a805c26f1991fd888427c2052 (commit)
via 735dacb28ff9de2fb715b4c8d0db43ff6c7875ad (commit)
via 16a70f3ed60f65a91c9367080467c77d26c618ba (commit)
via 0061dc0154f45e72cf5b036418c0b751faff29a7 (commit)
via 1a7b4f115b89d8394ea2eaef0e85cf02880d4a98 (commit)
via ed11a6476618b8b2375ce312ae720e17daf1617b (commit)
via 5d3f251b0ee8e7feee918d4335ecff0398029938 (commit)
via 3d33d38dbbf90b58a2edca2a336f404a7804e8d5 (commit)
via 50e352e096a2bd22a56302c0f80c586ae29c31f1 (commit)
via 2eaaaaab6b15e459869196313840f5bd029e3dda (commit)
via 955503988ef401455d4275f3ac735dac16d4bf50 (commit)
via e4de45a2ede00b43543064c246916f3166d2281e (commit)
via c9c1b44cf5e9199b6661514522aa13e4791b79fb (commit)
via 504d69ca0679b3da70babf1ddefde7d061a4aa58 (commit)
via dbea4f585f61998cf17d70d2a7287e5559773d02 (commit)
via bcc366d97526a2021ab0941a6760cc2a9aeca492 (commit)
via c998a0a80c5398eddf69ac978a63f25f02fd4f22 (commit)
via 5aa5d488be13c5f83d18a07446966b4bbf10aad5 (commit)
via 451309bea8d51a65f52b902f50e4fb45f63fc435 (commit)
via 8c7d4c58d88331b52978193861c8ec69f297373a (commit)
via 3a56a5ef092bfd1cbe6e9f6aa88540b8d7ed4f96 (commit)
via b24b46cd24338d1559af6ae52119fb4b8fca3189 (commit)
via e3a61c1aac79fe0ba9f812e740e2fbb77964a26a (commit)
via 34b77b814323ca0cd19e777385c51a029749fa5c (commit)
via 559369d03160f7a3a921df4753cd2a48678317a5 (commit)
via b8f6d1d35fad18b5f3f6aafb39801b1eb420c0bf (commit)
via 62da2379df0bf38de2f3946e0e2e09e2e4979e6a (commit)
via b21fb65ab443f8847d033542af7d3ea7074fa0d5 (commit)
via 52e92f4c6b487307f6dffcc4bd25882f5f55ce58 (commit)
via eec57a8653b5395b6ecfd964efa7ac34837a4a60 (commit)
via 9e5ea81299a72d58fe558af2599a085d251ff302 (commit)
via fd51a4c8bb8e8d6699c98ea7d4ae124fb69734dc (commit)
via ba14d851a1a30ee0390f9f2577b303769883d8a4 (commit)
via bded8e874e35c60aa1a7a620fb7f4e31f72841e1 (commit)
via 6e945bff5a16c5013cb08dd835f95f9c6a1a23f9 (commit)
via ade24c73539d7f1fa4c50cb71478474185499ba2 (commit)
via 40d8a4ef372ee3c0fa22a50c227db41990367f3a (commit)
via e74d0f3f3717754e87a0a0ed8acc308b03e09bf3 (commit)
via ecf4f96a9dc301c74b2d1b59e096036633cca733 (commit)
via 5a3ff583e948659f3ce0b7437bc594e4c8ad73d7 (commit)
via 0f08fea166bcb8c8262d098ace376715ebba525f (commit)
via 1337a2d52f2959fca5063651bd83af848879f2b7 (commit)
via 9ae560896e4ad356a1ebd4a2af8e18ae232e37f9 (commit)
via d5719ff8fc1896343ac82d2196a856787fe0a497 (commit)
via 4dec972f4ba1e6a542e032d3ba8eec5cfb509ddd (commit)
via 64f8eab3b8d494119a9645e1c0ec3f9d27e32151 (commit)
via 2287abb6ebf54d21aa3d07f52fcc295d097253ec (commit)
via 145b928749c17ad981ce8a76f738335a0c55dc7a (commit)
via a310ad3e65082bebc169ba09116255e6b2e549f6 (commit)
via 9a852b322a9274301360d83dee14ce5c07ae63cb (commit)
via a3b518a0811d37517495b5203041c29bc27fa910 (commit)
via 7ab0eced433e44493c289612e7676a809dcb0087 (commit)
via 647b5d783f3c73baee6a5c12831aca6c27a067a7 (commit)
via e2995cf70b7c74f8e18a7748017da47fe1920e42 (commit)
via 1c0f2ceda34d746a4db6ae9e46e2562a620316bd (commit)
via 538255509f003e0c4cc32cb98080cc2764edf260 (commit)
via 8d43661a67bb812e9a0308021ede534521735c5e (commit)
via cfc06aa4470616edc5cec3269edb1744368aea22 (commit)
via a2f3070b002ee0be4cf252917196e977bcc898f7 (commit)
via 6e74e53ec4b646e74107273503cde4d66aa6c2cc (commit)
via 2d7825278d55318cb5e39d2a76503f8f467efdbf (commit)
via 81da26a8863c514df3680430b86e1aa9fe7fb3ca (commit)
via 2b2a644982287e13b06147c54112e1134181a236 (commit)
via 08f4255f53d743fb6552d47fd670458d7c6f5d04 (commit)
via a9b01c7a7f948c5bbae71637bc9f3f9f8ef5627c (commit)
via c7ec28f33771bfcc734fd31676cf7e1ae5549ba0 (commit)
via 6e8f8c4cd6bf7b3e6e6feb10d6e36a1969de726b (commit)
via f4586bde88702b296595024e19aa9ad093526064 (commit)
via a3ea37a7d0d29803347eb20927251ef9f9dfe813 (commit)
via d377d64198eec8b155314beb4aaef327ee4d180b (commit)
via 75473ef3c2073099b69260539e04a316ddd2377e (commit)
via ad528b661d4ce131777aea1076a7f016bfe441f6 (commit)
via dc040e3f5de92f4d096eb58776927e1b8d35f384 (commit)
via a758c001cf29236dfa51cb5f2666b00de3f0678a (commit)
via 2570526260a63012d5dbe6b156b09c1e5d6f3034 (commit)
via 1f38717787a7e6e652a28e86663aa2815ded9558 (commit)
via addfb9ca15447b8879d2d64c5bcb36a6ac242218 (commit)
via adb8835513c36771839a8ead07a7c80aa70640c1 (commit)
via 569b9e68be2a756a46d70cb763fc57cec472e530 (commit)
via 2c6cf8c5127be0fceb46a1ea2c92d1ee1da64845 (commit)
via e071151f7c0245ef4ff2488cdc916d677292762f (commit)
via 581b0a522ef625c2d6053e3c60cbd8d603627b8d (commit)
via e45727a86f7d251d304cb5104f625b04ae63642b (commit)
via 1a6dc7231c562105613e42a9eb2127878b9e5bf0 (commit)
via 1da92a5bb4f80f42df5d4cc03435d9641a771ee3 (commit)
via 999fa21891c3fa5724582a99509126f283bd34ff (commit)
via 949ab7e9bd6d561b1e358d0fde65ea29df673906 (commit)
via 714ee009925eecb195baa70b6e184daad9ed33c8 (commit)
via 1a2c1deb3dee8f1760e354e4af853727f068b061 (commit)
via 210f708ef35d9eee495fe8f2483f20870b6a8b03 (commit)
via 92c85a93862d714a50b01fe6eae58f0b00aeaaf8 (commit)
via 2bc498f457375f027173ff03119ee125fe5dfb48 (commit)
via 6bc2b95e2468d04e88a236105090d8abccca31a5 (commit)
via 17a73f26642dfe04ae0023682d15f6821db65bac (commit)
via 68fd3084e361c047acdc9104606692a3c97397be (commit)
via 9cf7e1a15347c0d7b306d28a6f8945f7765d3506 (commit)
via c1427ec3c9e90a2afbe038dc0b9110d25e06b35d (commit)
via b781a020d053054620752fac45463553a907f5dd (commit)
via 200abe4a4513a2d7456ccd068cf44b8eb7c43165 (commit)
via 9f8950f606f162d2b9970aa6602ac506928e9b9a (commit)
via fdbc4c10d7f25fa6a02eeb3e76b5ae545268d484 (commit)
via 87f96404504b845de1645b426f8e3893c5e733e8 (commit)
via 0dacd1c2a29464b4f1df9c956960101063356db5 (commit)
via 25e3cb5d778ef50218648dd52df966d2d5f5c7b3 (commit)
via e2fb71c23665bd6a598fc18bba0ffe49fd825597 (commit)
via 81f8ce9510b5827382dbcdeff9e9201bb0c36e93 (commit)
via 6a0a69204fbf3416f499065721d31783a07dc19c (commit)
via fa372dd85176ac90b446a5fd1e4796f3b69c38b0 (commit)
via 265e4983a0aad79e7dec3008a7e8a9401a63c31a (commit)
via f6d6c1937f494159ff928131c9db95eb192c6aa4 (commit)
via 31365c20b5afcdf38b85f472b7e8df19e158b41b (commit)
via e7cd36827e505cd727e73c8d4d82a45cec5c8606 (commit)
via b85125593a617da004a230239402cc087ecf2199 (commit)
via 14b6c687b26446e32f7405c78c21b4252d437b0c (commit)
via e46751b4758150644c4b91645e37ea6d2a0db895 (commit)
via b0621ee14a25c1099f8be74b5649cb0c95c99e09 (commit)
via 62af65ec0e683dd2a184a9c91fc233a44f0c3abb (commit)
via 0fef2ed80879207d42a355f3c98ad4c2a1514185 (commit)
via 0242ab86d1fe0a530e5fcb2b24dfc8923b11c1b6 (commit)
via 96c305e49e80515861cdae3bfd27f498b031bf27 (commit)
via fd8f704f6e0f984d9c9f04ce6aed5adda23c3996 (commit)
via 881fbf6803a19152d082f0580a192ad1e6a9bbad (commit)
via 4b4ea9f40a2a889d241500703213da93f417dbce (commit)
via 66b6824e2fc571533d69beb88bea58badcca9a4d (commit)
via c6eeffa9589c8cb890e05262bb4a5006a37ce1ec (commit)
via 26e3a6b61a104d34769c0a08d62909947e2af283 (commit)
via f5dcf7122210a298fa2d93233faac50503316227 (commit)
via 285f84a42d2a25c140a37acafa0e9772ab8c7d88 (commit)
via 22a90becb8c000ffee0ce53cf31c25053ab6ca4f (commit)
via 7f480d03b4ec1e3b74d6bdc91ddf5db3a3d7dd52 (commit)
via 98b2e2fe2748245a61ea3f33ceda099055775dc2 (commit)
via f5280b629495081c72938074f19ab9f9b5fbac5a (commit)
via 106612c1d7395aa9437f72c968a4c87b12540c92 (commit)
via ea59138f0746504c6e8a045a2c1d6c0fbdcd1d36 (commit)
via c557a93b70d7152d49eae3e2e525571d939106f1 (commit)
via 8786451ed3c68f291e37e38d8df2953632ccf1ad (commit)
via bdce2bd4bfe3bc28e53ab3e51b272d242ef510cb (commit)
via 0c2a18fdd5f3b600eaf4eccd7800309fd2ba6ffc (commit)
via 269167b0c7020d6e4bbe556e2cb883d3eb799433 (commit)
via 7a572843971d5ec6f61fe1ce1b4b64defc4a452f (commit)
via 7f6eacf23bef06b59b78449adb02daa7b1fe2ba3 (commit)
via e41f2800f279a3a91c1772a07f5d3ccbff1b8aea (commit)
via 23b2744afa7449331e41dd7b782a8d918c1d2d36 (commit)
via 6029573fc4fd53d4176817dd62270c49cdcf0c2c (commit)
via 1057fd6e7a381120fc1fb862c81205cfa095f5fe (commit)
via a82ce44786c4b53847312af3628198a568865138 (commit)
via 5830b32125b26b43857f904163b1db7e69bcc818 (commit)
via 331eeee98a1c9fd2db43909d20a58bafe65c7de1 (commit)
via 8d4295cc623ff51f45e35dd648ada31885384a5f (commit)
via 633d00be08a7097254b2f64c219200369ec36eec (commit)
via 2f6bc2a2dbe8d6285d4633d5621ae48a4a711545 (commit)
via d014a04368502c19b5fcfa9869e7451f6dd17640 (commit)
via 153e5e76f838ce1a5e2fae8e962e17ef200c53f1 (commit)
via 0bb431f129cb64aaa2f591ac34e45802b222f171 (commit)
via e1c11397deabbcc859fb6f50e2402f04b2b54e60 (commit)
via e4a3db02ee74d924992ace41bde66c97a72cab55 (commit)
via 11b7538d59dc3ce30450680269e9f8ce0f3a9d0a (commit)
via d3b6321bbc7a061c750f14a618e180deb844f596 (commit)
via 743f0142ec53fd122587481cab1e1adad6ded7ea (commit)
via 6ba67bfb39595d4f171a60e7430e0fd86ba83b0f (commit)
via c3069760ff5332865c1becd9ef1b3cb972f9f81f (commit)
via b1835ac7a1aee48f000b864a6bd2333890f5cba9 (commit)
via 3640cb08bb65b2f7226e1f51f46cf25f4a30607a (commit)
via 228cee058c93b41a5f56e98651e110de9bab9c92 (commit)
via b42ac36030b81be952303da734ffd7c8647af822 (commit)
via 8f8ae0edcdd668603ffa08c631c2fc7115685156 (commit)
via 1674217917d9e80b559dfa566386a81a046940ed (commit)
via d4d9992977e9c57b390814e138144906f3244214 (commit)
via b6c3db5ad9ba7d9695d473c56004045c9f792aaf (commit)
via fa4e18aa31ff0a889e1d05d2d0e208bbffb0f9fe (commit)
via 8d1eafc5df4c53b03e2808c74849f92660647b13 (commit)
via 637a7df6919fac4e97e0abca33a2ef16284702e2 (commit)
via 27a3796fff685b4fea466e8d74ae28b74698eb92 (commit)
via 5aed90bb3165c1ee18832239a0db13b3e7f8e9f7 (commit)
via a445f9b56499e94acba1599a92a84f1a3ee747d2 (commit)
via 337381df8c706be0dc3ab1cd2ed92062b47e1a6a (commit)
via d88b99d756d4094ac6d0a68bb6f729dca3ebac8b (commit)
via 300158ba2e380ac16ce445f208f2814298a6ab8e (commit)
via 74c8d5eafb58369ece86350d2f49f6b74cc41614 (commit)
via 1ab56f147ecefeb43332ea0ba9dd9d90fb0f5d5f (commit)
via d651a61858cd89a9e82b68c602e2bacd36facff4 (commit)
via 66ca526aab93b834c1c0afc410f3fb57762cc6d5 (commit)
via 29c23f80c554ce94fa73eac17f433e9d1fc78198 (commit)
from 2d45b34a09970b42802d9b578863164bf71c895b (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 -----------------------------------------------------------------
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=b428a9dd0483f23f4aed11a1d4f4f8b4fe24ea98
commit b428a9dd0483f23f4aed11a1d4f4f8b4fe24ea98
Merge: 2d45b34 e5ce059
Author: Roland Mas <[email protected]>
Date: Fri Dec 11 20:58:23 2015 +0100
Merge branch 'master' into feature/twig-template-engine
diff --cc src/debian/control.in
index 84d4da6,a71a36e..555bac1
--- a/src/debian/control.in
+++ b/src/debian/control.in
@@@ -79,7 -79,7 +79,7 @@@ Description: collaborative development
Package: fusionforge-web
Architecture: all
- Depends: fusionforge-common (=${source:Version}), fusionforge-db,
libapache2-mpm-itk | apache2-mpm-itk, php5-cli, libapache2-mod-php5,
libphp-simplepie, php-http, php-http-webdav-server, libjs-jquery-livequery,
python, poppler-utils, php-twig, ${misc:Depends}
-Depends: fusionforge-common (=${source:Version}), fusionforge-db,
libapache2-mpm-itk | apache2-mpm-itk, php5-cli, libapache2-mod-php5,
libphp-simplepie, php-http, php-http-webdav-server, libjs-jquery-livequery,
python, poppler-utils, openssl, ${misc:Depends}
++Depends: fusionforge-common (=${source:Version}), fusionforge-db,
libapache2-mpm-itk | apache2-mpm-itk, php5-cli, libapache2-mod-php5,
libphp-simplepie, php-http, php-http-webdav-server, libjs-jquery-livequery,
python, poppler-utils, openssl, php-twig, ${misc:Depends}
Recommends: locales-all, unoconv
Description: collaborative development tool - web part (using Apache)
FusionForge provides many tools to aid collaboration in a
diff --cc src/rpm/fusionforge.spec.in
index 7bb3e41,8d8086b..51f5548
--- a/src/rpm/fusionforge.spec.in
+++ b/src/rpm/fusionforge.spec.in
@@@ -183,7 -183,7 +183,7 @@@ It should be installed on only one serv
%package web
Summary: Collaborative development tool - web part (using Apache)
- Requires: %{name}-common = %{version}-%{release}, %{name}-db =
%{version}-%{release}, httpd, mod_ssl, php, php-pgsql, php-simplepie,
php-pear-HTTP, php-nusoap, php-mbstring, httpd-itk, mod_dav_svn, unoconv,
poppler-utils, php-twig
-Requires: %{name}-common = %{version}-%{release}, %{name}-db =
%{version}-%{release}, httpd, mod_ssl, php, php-pgsql, php-simplepie,
php-pear-HTTP, php-nusoap, php-mbstring, httpd-itk, mod_dav_svn, unoconv,
poppler-utils, openssl
++Requires: %{name}-common = %{version}-%{release}, %{name}-db =
%{version}-%{release}, httpd, mod_ssl, php, php-pgsql, php-simplepie,
php-pear-HTTP, php-nusoap, php-mbstring, httpd-itk, mod_dav_svn, unoconv,
poppler-utils, openssl, php-twig
%description web
FusionForge provides many tools to aid collaboration in a
development project, such as bug-tracking, task management,
diff --cc tests/func/10_Site/loginTest.php
index 3798712,4489eb6..2549b69
--- a/tests/func/10_Site/loginTest.php
+++ b/tests/func/10_Site/loginTest.php
@@@ -123,7 -123,32 +123,34 @@@ class LoginProcess extends FForge_Selen
$this->assertTrue($this->isTextPresent("Forge Admin"));
$this->assertTrue($this->isTextPresent("Log Out"));
+ // Test changing password through user account
+ $this->clickAndWait("link=My Account");
+ $this->clickAndWait("link=Change Password");
+ $this->type("old_passwd", "awrongpassword");
+ $this->type("passwd", FORGE_ADMIN_PASSWORD);
+ $this->type("passwd2", FORGE_ADMIN_PASSWORD);
+ $this->clickAndWait("submit");
+ $this->assertTrue($this->isTextPresent("Old password is
incorrect"));
+
+ $this->clickAndWait("link=My Account");
+ $this->clickAndWait("link=Change Password");
+ $this->type("old_passwd", FORGE_OTHER_PASSWORD);
+ $this->type("passwd", FORGE_ADMIN_PASSWORD);
+ $this->type("passwd2", FORGE_ADMIN_PASSWORD);
+ $this->clickAndWait("submit");
+
+ $this->logout();
+ $this->open( ROOT );
+ $this->click("link=Log In");
+ $this->waitForPageToLoad();
+ $this->type("form_loginname", FORGE_ADMIN_USERNAME);
+ $this->type("form_pw", FORGE_ADMIN_PASSWORD);
+ $this->click("login");
+ $this->waitForPageToLoad();
+ $this->assertTrue($this->isTextPresent("Forge Admin"));
+ $this->assertTrue($this->isTextPresent("Log Out"));
++
+ $this->changeTheme("Funky Twig");
}
}
diff --cc tests/func/SeleniumForge.php
index 48ea153,2c7aa91..e58c69a
--- a/tests/func/SeleniumForge.php
+++ b/tests/func/SeleniumForge.php
@@@ -172,14 -201,12 +201,13 @@@ class FForge_SeleniumTestCase extends P
/**
* Execute pending system tasks
*/
- protected function waitSystasks()
+ public function waitSystasks()
{
-
$this->runCommand(RUN_JOB_PATH.'/systasks_wait_until_empty.php');
+
$this->runCommand(dirname(__FILE__).'/../../src/bin/systasks_wait_until_empty.php');
}
- protected function init() {
- $this->switchUser (FORGE_ADMIN_USERNAME) ;
+ public function init() {
+ $this->changeTheme("Funky Twig");
$this->createAndGoto('ProjectA');
}
@@@ -302,14 -329,7 +330,14 @@@
$this->triggeredLogin($username);
}
+ protected function changeTheme($theme)
+ {
+ $this->clickAndWait("link=My Account");
+ $this->select("//select[@name='theme_id']","label=$theme");
+ $this->clickAndWait("submit");
+ }
+
- protected function triggeredLogin($username)
+ public function triggeredLogin($username)
{
if ($username == FORGE_ADMIN_USERNAME) {
$password = FORGE_ADMIN_PASSWORD;
-----------------------------------------------------------------------
Summary of changes:
autoinstall/build.sh | 12 +-
autoinstall/common-backports | 54 +-
autoinstall/install-gui.sh | 16 +-
autoinstall/install-src.sh | 9 +-
autoinstall/install.sh | 1 -
autoinstall/run-testsuite.sh | 88 -
htdocs/repo/el5/5.1/dag-rpmforge.repo | 17 -
htdocs/repo/el5/5.1/fusionforge.repo | 8 -
htdocs/repo/el5/5.2/dag-rpmforge.repo | 17 -
htdocs/repo/el5/5.2/epel.repo | 26 -
htdocs/repo/el5/5.2/fusionforge.repo | 8 -
src/CHANGES | 40 +-
src/GNUmakefile | 1 +
src/bin/refresh_nss.php | 10 +
src/bin/systasksd | 16 +-
src/common/docman/Document.class.php | 4 +-
src/common/docman/DocumentFactory.class.php | 45 +-
src/common/docman/DocumentGroup.class.php | 4 +-
src/common/docman/DocumentManager.class.php | 3 +-
src/common/docman/actions/addsubdocgroup.php | 9 +-
src/common/docman/actions/monitorfile.php | 1 +
src/common/docman/views/addfile.php | 10 +-
src/common/docman/views/additem.php | 5 +-
src/common/docman/views/addsubdocgroup.php | 12 +-
src/common/docman/views/admin.php | 4 +-
src/common/docman/views/editdocgroup.php | 7 +-
src/common/docman/views/editfile.php | 3 +-
src/common/docman/views/help.php | 10 +-
src/common/docman/views/listfile.php | 77 +-
src/common/docman/views/listtrashfile.php | 5 +-
src/common/docman/views/menu.php | 5 +-
src/common/docman/views/movefile.php | 16 +-
src/common/docman/views/pendingfiles.php | 22 +-
src/common/docman/views/reporting.php | 169 +-
src/common/docman/views/search.php | 226 +-
src/common/docman/views/tree.php | 10 +-
src/common/docman/views/views.php | 8 +-
src/common/include/FusionForge.class.php | 73 +-
src/common/include/Group.class.php | 80 +-
src/common/include/Plugin.class.php | 3 +-
src/common/include/User.class.php | 126 +-
src/common/include/account.php | 47 +-
src/common/include/session.php | 139 +-
src/common/include/system/pgsql.class.php | 31 +-
src/common/search/DocsSearchQuery.class.php | 63 +-
src/common/search/SearchQuery.class.php | 12 +-
src/common/tracker/ArtifactFactory.class.php | 4 +-
src/common/tracker/RoadmapFactory.class.php | 2 +-
src/common/tracker/actions/browse.php | 70 +-
src/common/tracker/actions/csv.php | 4 +-
src/common/tracker/actions/downloadcsv.php | 2 +-
.../widget/Widget_ProjectDescription.class.php | 14 +-
.../widget/Widget_ProjectPublicAreas.class.php | 6 +-
src/cronjobs/db/get_news_notapproved.php | 10 +-
...1-svntrackerToScmhookCommitTrackerMigration.php | 3 +-
...svncommitemailToScmHookCommitEmailMigration.php | 2 +-
src/db/20141105-frs-ziplatest.php | 56 +-
src/db/20150914-db_images-logo.sql | 1 +
src/db/20151112-drop-unsalted-md5.sql | 2 +
...> 20151209-docman-use-standardsearchengine.sql} | 21 +
src/debian/changelog | 33 +
src/debian/control.in | 2 +-
src/debian/fixup_upload.sh | 41 +
.../fusionforge-common.README.Debian-testing | 10 +
src/debian/plugins | 5 +-
src/debian/rules | 6 +-
src/debian/source/lintian-overrides | 9 +
src/etc/config.ini.d/defaults.ini | 2 +-
src/locale/zh_CN.po | 37079 +++++++++----------
.../admssw/common/RDFedFRSRelease.class.php | 2 +-
.../authbuiltin/common/AuthBuiltinPlugin.class.php | 14 +-
src/plugins/authbuiltin/www/post-login.php | 18 +-
.../hudson_Widget_JobBuildHistory.class.php | 5 +-
.../include/hudson_Widget_JobLastBuilds.class.php | 13 +-
.../include/hudson_Widget_JobTestResults.class.php | 8 +-
.../include/hudson_Widget_JobTestTrend.class.php | 12 +-
src/plugins/mediawiki/bin/mw-wrapper.php | 2 +
.../mediawiki/mediawiki-skin/FusionForge.php | 1 +
src/plugins/moinmoin/bin/install.sh | 16 +-
src/plugins/moinmoin/cronjobs/create-wikis.php | 3 +-
.../moinmoin/etc/plugins/moinmoin/moinmoin.conf | 2 +-
.../phpcaptcha/common/phpcaptchaPlugin.class.php | 19 +-
src/plugins/projects-hierarchy/COPYING | 339 -
.../common/projects-hierarchyPlugin.class.php | 19 +-
.../view/admin/viewProjectConfiguration.php | 3 +
.../projects-hierarchy/view/admin_project_link.php | 53 +-
src/plugins/scmgit/bin/install.sh | 2 +
src/plugins/scmgit/common/GitPlugin.class.php | 23 +-
src/plugins/scmhook/common/scmhookPlugin.class.php | 4 +-
.../library/scmgit/cronjobs/updateScmRepo.php | 1 -
.../scmhook/www/committracker/newcommitgit.php | 4 +-
src/plugins/scmsvn/bin/install.sh | 4 +-
src/plugins/scmsvn/common/SVNPlugin.class.php | 10 +-
src/plugins/taskboard/common/TaskBoard.class.php | 13 +-
.../common/TaskBoardColumnSource.class.php | 8 +-
.../taskboard/common/TaskBoardPlugin.class.php | 6 +-
.../taskboard/common/TaskBoardRelease.class.php | 6 +-
.../taskboard/common/actions/edit_release.php | 2 +-
.../common/include/TaskBoardHtml.class.php | 10 +-
.../taskboard/common/views/admin/columns.php | 2 +-
.../taskboard/common/views/releases/burndown.php | 16 +-
.../20150607-plugin-taskboard-integer-to-real.sql | 2 +-
src/plugins/taskboard/www/admin/index.php | 2 +-
src/plugins/taskboard/www/css/agile-board.css | 40 +-
src/plugins/taskboard/www/index.php | 46 +-
src/plugins/taskboard/www/js/agile-board.js | 20 +-
src/post-install.d/db/populate.sh | 4 +-
src/post-install.d/mta-exim4/mta-exim4.sh | 6 +
src/post-install.d/mta-postfix/mta-postfix.sh | 8 +-
src/post-install.d/web/web.sh | 1 +
src/rpm/fusionforge.spec.in | 7 +-
src/rpm/plugins | 3 +
src/vendor/jquery-storage/README | 2 +
src/www/account/change_pw.php | 2 +-
src/www/account/editsshkeys.php | 4 +-
src/www/account/index.php | 10 -
src/www/account/lostpw.php | 3 +-
src/www/account/register.php | 4 +-
src/www/activity/index.php | 21 +-
src/www/admin/grouplist.php | 206 +-
src/www/admin/index.php | 2 +-
src/www/admin/pending-news.php | 3 +-
src/www/admin/userlist.php | 113 +-
src/www/dbimage.php | 8 +-
src/www/docman/index.php | 18 +-
src/www/docman/scripts/DocManController.js | 38 +-
src/www/export/projhtml.php | 1 +
src/www/export/rss20_newreleases.php | 2 +-
src/www/include/Layout.class.php | 76 +-
src/www/include/features_boxes.php | 4 +-
src/www/include/html.php | 29 +-
src/www/include/login-form.php | 10 +-
src/www/include/project_summary.php | 19 +-
src/www/index_std.php | 2 +-
src/www/new/index.php | 2 +-
src/www/news/admin/index.php | 12 +-
src/www/news/admin/news_admin_utils.php | 41 +-
src/www/news/submit.php | 22 +-
src/www/pm/browse_task.php | 200 +-
src/www/pm/csv.php | 8 +-
src/www/pm/deletetask.php | 10 +-
src/www/pm/detail_task.php | 4 +-
src/www/pm/downloadcsv.php | 2 +-
src/www/pm/ganttpage.php | 12 +-
src/www/pm/include/ProjectTaskHTML.class.php | 24 +-
src/www/pm/mod_task.php | 59 +-
src/www/pm/t_follow.php | 2 +-
src/www/pm/t_lookup.php | 6 +-
src/www/project/admin/editimages.php | 211 +-
src/www/project/admin/massadd.php | 17 +-
src/www/project/admin/massfinish.php | 16 +-
src/www/register/index.php | 1 +
src/www/scm/viewvc.php | 2 +-
.../AdvancedSearchHtmlSearchRenderer.class.php | 6 +-
.../renderers/DocsHtmlSearchRenderer.class.php | 12 +-
.../renderers/FrsHtmlSearchRenderer.class.php | 3 +-
src/www/themes/funky-wOw/Theme.class.php | 5 +-
src/www/tracker/reporting/index.php | 7 +-
src/www/tracker/roadmap.php | 99 +-
tests/README | 2 +
tests/buildbot/{lxc => }/Makefile | 8 +-
tests/buildbot/common-functions | 152 +-
tests/buildbot/common-vm | 144 -
tests/buildbot/config/default | 74 +-
tests/buildbot/destroy_vm | 5 -
tests/buildbot/fusionforge-build-and-test.sh | 113 -
tests/buildbot/fusionforge-func_tests.sh | 188 +
...orge-unittests.sh => fusionforge-unit_tests.sh} | 4 +-
tests/buildbot/{lxc => }/init-jenkins.sh | 0
tests/buildbot/{lxc => }/lxc-wrapper | 0
tests/buildbot/start_vm | 25 -
tests/buildbot/stop_vm | 5 -
.../code_and_unit_tests.sh | 15 +-
tests/func/10_Site/loginTest.php | 31 +-
tests/func/10_Site/projectsTest.php | 2 +-
tests/func/10_Site/topTest.php | 2 +-
tests/func/10_Site/troveTest.php | 2 +-
tests/func/20_Docs/createDocURLTest.php | 13 +-
tests/func/20_FRS/FRSTest.php | 9 +-
tests/func/20_Forums/forumsTest.php | 30 +-
tests/func/20_News/newsTest.php | 19 +-
tests/func/20_Surveys/surveysTest.php | 9 +-
tests/func/20_Tasks/createTaskTest.php | 11 +-
tests/func/20_Trackers/relationTest.php | 10 +-
tests/func/20_Trackers/trackersTest.php | 20 +-
tests/func/20_Trackers/workflowTest.php | 10 +-
tests/func/30_RBAC/rbacTest.php | 14 +-
tests/func/30_Search/searchTest.php | 56 +-
tests/func/40_SSH/sshTest.php | 28 +-
tests/func/50_PluginsScmBzr/bzrTest.php | 9 +-
tests/func/50_PluginsScmGit/gitSSHTest.php | 24 +-
tests/func/50_PluginsScmGit/gitSmartHTTPTest.php | 24 +-
tests/func/50_PluginsScmGit/gitWUITest.php | 24 +-
tests/func/50_PluginsScmSvn/svnSSHTest.php | 24 +-
tests/func/50_PluginsScmSvn/svnWUITest.php | 24 +-
tests/func/50_PluginsScmSvn/svnWebDAVTest.php | 28 +-
tests/func/55_PluginsScmMulti/multiSCMTest.php | 24 +-
tests/func/60_PluginsBlocks/blocksTest.php | 9 +-
tests/func/60_PluginsMediawiki/mediawikiTest.php | 10 +-
tests/func/60_PluginsMessage/messageTest.php | 26 +-
tests/func/60_PluginsMoinMoin/moinmoinTest.php | 24 +-
.../60_PluginsOnlineHelp/contextualHelpTest.php | 8 +-
tests/func/70_SOAP/soapTest.php | 10 +-
tests/func/{Testing => }/SeleniumForge.php | 187 +-
tests/func/Testing/SeleniumRemoteSuite.php | 34 -
tests/func/config.php.buildbot | 54 -
tests/func/config.php.ffsandbox | 52 -
tests/func/config.php.sample | 48 -
tests/func/config.php.tests | 33 -
tests/func/{db_reload.sh => fixtures.sh} | 126 +-
.../func/fixtures/projecta.php | 13 +-
tests/func/phpunit-selenium.sh | 175 -
.../func_tests-xvnc.sh | 8 +-
tests/func_tests.php | 9 +-
tests/func_tests.sh | 219 +
tests/unit/common/account.php | 80 +
vm/packer/file/Desktop/build-and-install.desktop | 0
vm/packer/file/Desktop/run-testsuite.desktop | 4 +-
vm/packer/fusionforge-dev-centos.json | 15 +-
vm/packer/scripts/cleanup-centos.sh | 4 -
220 files changed, 20395 insertions(+), 23010 deletions(-)
delete mode 100755 autoinstall/run-testsuite.sh
delete mode 100644 htdocs/repo/el5/5.1/dag-rpmforge.repo
delete mode 100644 htdocs/repo/el5/5.1/fusionforge.repo
delete mode 100644 htdocs/repo/el5/5.2/dag-rpmforge.repo
delete mode 100644 htdocs/repo/el5/5.2/epel.repo
delete mode 100644 htdocs/repo/el5/5.2/fusionforge.repo
create mode 100644 src/db/20150914-db_images-logo.sql
create mode 100644 src/db/20151112-drop-unsalted-md5.sql
copy src/db/{20140304-fix_update_vectors_function.sql =>
20151209-docman-use-standardsearchengine.sql} (81%)
create mode 100755 src/debian/fixup_upload.sh
create mode 100644 src/debian/fusionforge-common.README.Debian-testing
create mode 100644 src/debian/source/lintian-overrides
delete mode 100644 src/plugins/projects-hierarchy/COPYING
create mode 100644 src/vendor/jquery-storage/README
rename tests/buildbot/{lxc => }/Makefile (77%)
delete mode 100644 tests/buildbot/common-vm
delete mode 100755 tests/buildbot/destroy_vm
delete mode 100755 tests/buildbot/fusionforge-build-and-test.sh
create mode 100755 tests/buildbot/fusionforge-func_tests.sh
rename tests/buildbot/{fusionforge-unittests.sh => fusionforge-unit_tests.sh}
(89%)
rename tests/buildbot/{lxc => }/init-jenkins.sh (100%)
rename tests/buildbot/{lxc => }/lxc-wrapper (100%)
delete mode 100755 tests/buildbot/start_vm
delete mode 100755 tests/buildbot/stop_vm
copy src/post-install.d/shell/upgrade-conf.sh => tests/code_and_unit_tests.sh
(73%)
rename tests/func/{Testing => }/SeleniumForge.php (77%)
delete mode 100644 tests/func/Testing/SeleniumRemoteSuite.php
delete mode 100644 tests/func/config.php.buildbot
delete mode 100644 tests/func/config.php.ffsandbox
delete mode 100644 tests/func/config.php.sample
delete mode 100644 tests/func/config.php.tests
rename tests/func/{db_reload.sh => fixtures.sh} (65%)
copy src/plugins/taskboard/common/taskboard-init.php =>
tests/func/fixtures/projecta.php (75%)
delete mode 100755 tests/func/phpunit-selenium.sh
rename autoinstall/vnc-run-testsuite.sh => tests/func_tests-xvnc.sh (77%)
create mode 100755 tests/func_tests.sh
create mode 100644 tests/unit/common/account.php
mode change 100644 => 100755 vm/packer/file/Desktop/build-and-install.desktop
mode change 100644 => 100755 vm/packer/file/Desktop/run-testsuite.desktop
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
