Thorsten Glaser [Thu, 14 Feb 2013 09:44:55 +0000 (10:44 +0100)]
Merge branch 'Branch_5_2'
Conflicts:
src/common/widget/Widget_ProjectLatestNews.class.php
Ignored (refresh only):
src/translations/bg.po
src/translations/ca.po
src/translations/de.po
src/translations/el.po
src/translations/en.po
src/translations/eo.po
src/translations/es.po
src/translations/eu.po
src/translations/fr.po
src/translations/fusionforge.pot
src/translations/gl.po
src/translations/he.po
src/translations/id.po
src/translations/it.po
src/translations/ja.po
src/translations/ko.po
src/translations/la.po
src/translations/nb.po
src/translations/nl.po
src/translations/pl.po
src/translations/pt.po
src/translations/pt_BR.po
src/translations/ru.po
src/translations/sv.po
src/translations/th.po
src/translations/zh_CN.po
src/translations/zh_TW.po
Thorsten Glaser [Thu, 14 Feb 2013 09:32:08 +0000 (10:32 +0100)]
Merge branch 'Branch_5_1' into Branch_5_2
Conflicts:
src/www/tracker/tracker.php
Roland Mas [Wed, 13 Feb 2013 17:58:10 +0000 (17:58 +0000)]
Fix problem where updating an artifact would disable monitoring of this artifact for some users
Roland Mas [Tue, 12 Feb 2013 16:30:56 +0000 (17:30 +0100)]
Clean up files after the build
Roland Mas [Tue, 12 Feb 2013 15:24:02 +0000 (16:24 +0100)]
Refreshed gettext files
Roland Mas [Tue, 12 Feb 2013 14:58:58 +0000 (15:58 +0100)]
Merged from 5.2: Disable nscd during testsuite on Debian
Roland Mas [Tue, 12 Feb 2013 14:57:20 +0000 (15:57 +0100)]
Disable nscd during testsuite on Debian
Roland Mas [Mon, 11 Feb 2013 08:30:02 +0000 (09:30 +0100)]
Run all SQL scripts on plugin install
Franck Villaume [Sun, 10 Feb 2013 10:12:05 +0000 (11:12 +0100)]
Merge remote-tracking branch 'origin/Branch_5_2'
port from Branch_5_2: docman: fix tree
Conflicts:
.gitattributes
src/common/docman/DocumentManager.class.php
Franck Villaume [Sun, 10 Feb 2013 10:09:03 +0000 (11:09 +0100)]
docman: fix tree, patch from french ministry of education
Franck Villaume [Sun, 10 Feb 2013 09:52:47 +0000 (10:52 +0100)]
docman: fix session permission check
Roland Mas [Fri, 8 Feb 2013 16:01:16 +0000 (17:01 +0100)]
Add script to instanciate tables on install
Roland Mas [Fri, 8 Feb 2013 15:27:03 +0000 (16:27 +0100)]
Removed duplicate entries for headermenu
Roland Mas [Fri, 8 Feb 2013 15:24:02 +0000 (16:24 +0100)]
Added generic packaging for headermenu
Roland Mas [Fri, 8 Feb 2013 15:08:22 +0000 (16:08 +0100)]
Added NAME file so that headermenu is considered active
Roland Mas [Fri, 8 Feb 2013 13:49:59 +0000 (14:49 +0100)]
Contentless merge from 5.2
Roland Mas [Fri, 8 Feb 2013 13:36:54 +0000 (14:36 +0100)]
Let's try to fix this .spec file after the extratabs→headermenu migration
Thorsten Glaser [Thu, 7 Feb 2013 17:03:55 +0000 (18:03 +0100)]
unbreak rendering RSS of group news
Roland Mas [Wed, 6 Feb 2013 13:51:07 +0000 (14:51 +0100)]
Removed dangling symlink (useless, and breaks Jenkins's SVN reimplementation)
Roland Mas [Wed, 6 Feb 2013 13:26:39 +0000 (14:26 +0100)]
Patch [#475] from Jean-Christophe Masson to fix alignment of icons in a widget
Roland Mas [Wed, 6 Feb 2013 13:25:42 +0000 (14:25 +0100)]
Patch [#474] from Jean-Christophe Masson to fix display in the monitored documents widget
Roland Mas [Wed, 6 Feb 2013 13:24:28 +0000 (14:24 +0100)]
Patch [#444] from Jean-Christophe Masson to fix errors during login validation
Franck Villaume [Mon, 4 Feb 2013 22:55:33 +0000 (23:55 +0100)]
remove obsolete extratabs plugin
Olivier Berger [Fri, 19 Oct 2012 20:26:16 +0000 (22:26 +0200)]
Try normalizing to LF for PHP files
Olivier Berger [Fri, 19 Oct 2012 20:22:40 +0000 (22:22 +0200)]
Test removing .php stanzas from .gitattributes
Roland Mas [Wed, 30 Jan 2013 16:14:45 +0000 (17:14 +0100)]
Contentless merge from 5.2
Franck Villaume [Tue, 29 Jan 2013 22:43:36 +0000 (23:43 +0100)]
scmgit: final fix for use_dav
Franck Villaume [Mon, 28 Jan 2013 22:17:41 +0000 (23:17 +0100)]
scmgit: fix RW url when use_dav is enable
Roland Mas [Mon, 28 Jan 2013 16:09:42 +0000 (17:09 +0100)]
Contentless merge from 5.1
Roland Mas [Mon, 28 Jan 2013 16:07:27 +0000 (17:07 +0100)]
Merge from 5.2: fixes to Unix accounts and Debian-specific script
Roland Mas [Mon, 28 Jan 2013 16:06:21 +0000 (17:06 +0100)]
Hand-merge from 5.1: fixes to Unix accounts and Debian-specific script
Roland Mas [Mon, 28 Jan 2013 16:03:04 +0000 (17:03 +0100)]
Merged from 5.2: cosmetic commit to check whether I can still push to git
Roland Mas [Mon, 28 Jan 2013 15:59:15 +0000 (16:59 +0100)]
Cosmetic commit to check whether I can still push to git
Roland Mas [Mon, 28 Jan 2013 15:17:46 +0000 (15:17 +0000)]
Allow planning tasks up to 2038
Franck Villaume [Sun, 27 Jan 2013 18:02:51 +0000 (19:02 +0100)]
projects-hierarchy: fix group_delete, make add child more error proof, fix child validation link
Franck Villaume [Sun, 27 Jan 2013 15:48:41 +0000 (16:48 +0100)]
headermenu: migrate extratabs to headermenu
Franck Villaume [Sun, 27 Jan 2013 11:10:36 +0000 (12:10 +0100)]
headermenu: fix group_delete hook
Thorsten Glaser [Wed, 23 Jan 2013 10:31:18 +0000 (11:31 +0100)]
deleted unix accounts are 'D', not 'N', just like regular statūs
Thorsten Glaser [Wed, 23 Jan 2013 10:16:22 +0000 (11:16 +0100)]
improve compression ratio
Thorsten Glaser [Wed, 23 Jan 2013 10:14:08 +0000 (11:14 +0100)]
SECURITY: do not make homedir archives of deleted users world-readable
Thorsten Glaser [Wed, 23 Jan 2013 10:13:38 +0000 (11:13 +0100)]
make this a bit more legible and fix one case of indentation
Franck Villaume [Tue, 22 Jan 2013 19:17:05 +0000 (20:17 +0100)]
headermenu: add support for group_delete hook
Franck Villaume [Sun, 20 Jan 2013 14:42:54 +0000 (15:42 +0100)]
fix clone and missing project reference
Franck Villaume [Sat, 19 Jan 2013 12:34:17 +0000 (13:34 +0100)]
prepare 5.2.1
Franck Villaume [Sat, 19 Jan 2013 12:21:25 +0000 (13:21 +0100)]
prepare 5.1.2
Franck Villaume [Tue, 15 Jan 2013 20:02:18 +0000 (21:02 +0100)]
fix [#525]: test error: thank to David Goujeon
Franck Villaume [Tue, 15 Jan 2013 19:07:59 +0000 (20:07 +0100)]
fix updateLinkValue action
Franck Villaume [Mon, 14 Jan 2013 23:42:15 +0000 (00:42 +0100)]
fix js syntax
Franck Villaume [Mon, 14 Jan 2013 23:34:26 +0000 (00:34 +0100)]
rebase master
Franck Villaume [Mon, 14 Jan 2013 22:44:56 +0000 (23:44 +0100)]
modify CHANGES entry
Franck Villaume [Mon, 14 Jan 2013 21:57:18 +0000 (22:57 +0100)]
better ajax handling
Franck Villaume [Sun, 6 Jan 2013 21:32:40 +0000 (22:32 +0100)]
support ordering in globaladmin view
Franck Villaume [Sun, 6 Jan 2013 18:44:40 +0000 (19:44 +0100)]
remove useless column
Franck Villaume [Sun, 6 Jan 2013 17:43:10 +0000 (18:43 +0100)]
add copyright
Franck Villaume [Sun, 6 Jan 2013 16:44:34 +0000 (17:44 +0100)]
implement backend action validateOrder
Franck Villaume [Sun, 6 Jan 2013 14:07:14 +0000 (15:07 +0100)]
complete support for reorder link in groupmenu
Franck Villaume [Sat, 5 Jan 2013 12:32:10 +0000 (13:32 +0100)]
add support for reorder in js controler
Franck Villaume [Mon, 31 Dec 2012 16:56:38 +0000 (17:56 +0100)]
add support for iframe in groupmenu
Franck Villaume [Mon, 31 Dec 2012 10:27:22 +0000 (11:27 +0100)]
add support for html page in groupmenu
Franck Villaume [Sun, 30 Dec 2012 19:38:42 +0000 (20:38 +0100)]
start htmlcode support in groupmenu
Franck Villaume [Sun, 30 Dec 2012 18:56:25 +0000 (19:56 +0100)]
support delete link in groupmenu
Franck Villaume [Sat, 22 Dec 2012 19:28:10 +0000 (20:28 +0100)]
start implement groupmenu hook in headermenu
Franck Villaume [Tue, 1 Jan 2013 19:47:10 +0000 (20:47 +0100)]
add notice and reorg display in global
Franck Villaume [Tue, 1 Jan 2013 15:35:35 +0000 (16:35 +0100)]
start implement reorder
Franck Villaume [Tue, 1 Jan 2013 14:01:46 +0000 (15:01 +0100)]
make the update works
Franck Villaume [Tue, 1 Jan 2013 13:44:52 +0000 (14:44 +0100)]
support for edit link in groupmenu
Franck Villaume [Mon, 31 Dec 2012 17:10:59 +0000 (18:10 +0100)]
add new column: ordering, to support order between link
Franck Villaume [Mon, 31 Dec 2012 16:56:38 +0000 (17:56 +0100)]
add support for iframe in groupmenu
Franck Villaume [Mon, 31 Dec 2012 14:23:15 +0000 (15:23 +0100)]
fix selected entry in html code for groupmenu
Franck Villaume [Mon, 31 Dec 2012 10:27:22 +0000 (11:27 +0100)]
add support for html page in groupmenu
Franck Villaume [Sun, 30 Dec 2012 19:38:42 +0000 (20:38 +0100)]
start htmlcode support in groupmenu
Franck Villaume [Sun, 30 Dec 2012 18:56:25 +0000 (19:56 +0100)]
support delete link in groupmenu
Franck Villaume [Sun, 30 Dec 2012 18:22:55 +0000 (19:22 +0100)]
support add link in groupmenu
Franck Villaume [Sun, 23 Dec 2012 20:28:40 +0000 (21:28 +0100)]
sync CHANGES
Franck Villaume [Sat, 22 Dec 2012 19:28:10 +0000 (20:28 +0100)]
start implement groupmenu hook in headermenu
Franck Villaume [Mon, 14 Jan 2013 22:44:56 +0000 (23:44 +0100)]
modify CHANGES entry
Franck Villaume [Mon, 14 Jan 2013 21:57:18 +0000 (22:57 +0100)]
better ajax handling
Franck Villaume [Mon, 14 Jan 2013 20:00:53 +0000 (21:00 +0100)]
Merge remote-tracking branch 'origin/master' into headermenu
Thorsten Glaser [Fri, 11 Jan 2013 09:06:48 +0000 (10:06 +0100)]
Debian package version syntax: epochs are numeric, colons allowed later
Roland Mas [Fri, 11 Jan 2013 08:56:09 +0000 (09:56 +0100)]
Fail on error
Roland Mas [Fri, 11 Jan 2013 08:54:03 +0000 (09:54 +0100)]
Filter out epoch
Roland Mas [Fri, 11 Jan 2013 08:49:47 +0000 (09:49 +0100)]
Trim string
Roland Mas [Fri, 11 Jan 2013 08:43:13 +0000 (09:43 +0100)]
Use an existing version of the mediawiki package
Roland Mas [Thu, 10 Jan 2013 07:56:35 +0000 (08:56 +0100)]
Contentless merge from 5.2
Roland Mas [Thu, 10 Jan 2013 07:55:06 +0000 (08:55 +0100)]
Backport from trunk: deleted reference to buildbot3
Roland Mas [Thu, 10 Jan 2013 07:54:07 +0000 (08:54 +0100)]
Backport from trunk: deleted reference to buildbot3
Roland Mas [Wed, 9 Jan 2013 18:05:05 +0000 (19:05 +0100)]
Use different URLs in the docman testsuite
Roland Mas [Wed, 9 Jan 2013 09:46:39 +0000 (10:46 +0100)]
Removed references to buildbot3.ff.org
Roland Mas [Mon, 7 Jan 2013 14:31:21 +0000 (15:31 +0100)]
Merged from 5.2: remove trailing ?>
Thorsten Glaser [Mon, 7 Jan 2013 08:14:42 +0000 (09:14 +0100)]
remove trailing ?>
Franck Villaume [Sun, 6 Jan 2013 21:32:40 +0000 (22:32 +0100)]
support ordering in globaladmin view
Franck Villaume [Sun, 6 Jan 2013 18:44:40 +0000 (19:44 +0100)]
remove useless column
Franck Villaume [Sun, 6 Jan 2013 17:45:21 +0000 (18:45 +0100)]
Merge remote-tracking branch 'origin/master' into headermenu
Franck Villaume [Sun, 6 Jan 2013 17:43:10 +0000 (18:43 +0100)]
add copyright
Franck Villaume [Sun, 6 Jan 2013 17:36:48 +0000 (18:36 +0100)]
fix warning
Franck Villaume [Sun, 6 Jan 2013 16:44:34 +0000 (17:44 +0100)]
implement backend action validateOrder
Franck Villaume [Sun, 6 Jan 2013 14:07:14 +0000 (15:07 +0100)]
complete support for reorder link in groupmenu
Franck Villaume [Sat, 5 Jan 2013 12:32:10 +0000 (13:32 +0100)]
add support for reorder in js controler
Franck Villaume [Sat, 5 Jan 2013 08:57:08 +0000 (09:57 +0100)]
Merge branch 'headermenu' of git+ssh://fusionforge.org/scmrepos/git/fusionforge/users/nerville into headermenu
Franck Villaume [Tue, 1 Jan 2013 19:47:10 +0000 (20:47 +0100)]
add notice and reorg display in global