You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by jo...@apache.org on 2013/10/03 19:14:06 UTC
[01/50] git commit: [#6392] ticket:432 Fix bug with saving
permissions when there are blocked users
Updated Branches:
refs/heads/cj/6422 05ff83e59 -> 21a2113b9 (forced update)
[#6392] ticket:432 Fix bug with saving permissions when there are blocked users
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/52b70435
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/52b70435
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/52b70435
Branch: refs/heads/cj/6422
Commit: 52b70435c67873c3cecd94b95dbdcf4003898131
Parents: 19327f4
Author: Igor Bondarenko <je...@gmail.com>
Authored: Fri Sep 13 13:29:48 2013 +0300
Committer: Tim Van Steenburgh <tv...@gmail.com>
Committed: Tue Sep 24 17:36:24 2013 +0000
----------------------------------------------------------------------
Allura/allura/app.py | 29 ++++++++++++++++++++---
Allura/allura/tests/functional/test_admin.py | 22 +++++++++++++++++
2 files changed, 48 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/52b70435/Allura/allura/app.py
----------------------------------------------------------------------
diff --git a/Allura/allura/app.py b/Allura/allura/app.py
index a9a8816..74d9c4d 100644
--- a/Allura/allura/app.py
+++ b/Allura/allura/app.py
@@ -730,18 +730,41 @@ class DefaultAdminController(BaseController):
if isinstance(group_ids, basestring):
group_ids = [ group_ids ]
+ # ACE.deny() entries for blocked users will end up in del_group_ids after the following
for acl in old_acl:
if (acl['permission']==perm) and (str(acl['role_id']) not in group_ids):
del_group_ids.append(str(acl['role_id']))
- if new_group_ids or del_group_ids:
+ get_role = lambda _id: model.ProjectRole.query.get(_id=ObjectId(_id))
+ groups = map(get_role, group_ids)
+ new_groups = map(get_role, new_group_ids)
+ del_groups = map(get_role, del_group_ids)
+
+ def split_group_user_roles(roles):
+ group_roles = []
+ user_roles = []
+ for role in roles:
+ if role.user_id and not role.name:
+ user_roles.append(role)
+ else:
+ group_roles.append(role)
+ return group_roles, user_roles
+
+ del_groups, user_roles = split_group_user_roles(del_groups)
+
+ if new_groups or del_groups:
model.AuditLog.log('updated "%s" permission: "%s" => "%s" for %s' % (
perm,
- ', '.join(map(lambda id: model.ProjectRole.query.get(_id=ObjectId(id)).name, group_ids+del_group_ids)),
- ', '.join(map(lambda id: model.ProjectRole.query.get(_id=ObjectId(id)).name, group_ids+new_group_ids)),
+ ', '.join(map(lambda role: role.name, groups+del_groups)),
+ ', '.join(map(lambda role: role.name, groups+new_groups)),
self.app.config.options['mount_point']))
role_ids = map(ObjectId, group_ids + new_group_ids)
self.app.config.acl += [
model.ACE.allow(r, perm) for r in role_ids]
+
+ # Add all ACEs for user roles back
+ user_roles_ids = map(lambda role: role._id, user_roles)
+ user_aces = filter(lambda ace: ace.permission == perm and ace.role_id in user_roles_ids, old_acl)
+ self.app.config.acl += user_aces
redirect(request.referer)
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/52b70435/Allura/allura/tests/functional/test_admin.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/functional/test_admin.py b/Allura/allura/tests/functional/test_admin.py
index a0378e1..b5a3569 100644
--- a/Allura/allura/tests/functional/test_admin.py
+++ b/Allura/allura/tests/functional/test_admin.py
@@ -229,6 +229,28 @@ class TestProjectAdmin(TestController):
r = self.app.get('/admin/wiki/permissions')
assert '<a href="#" class="block-list">' not in r
+ @td.with_wiki
+ def test_blocked_users_remains_after_saving_all_permissions(self):
+ self.app.post('/admin/wiki/block_user', params={'username': 'test-user', 'perm': 'read', 'reason': 'Comment'})
+ self.app.post('/admin/wiki/block_user', params={'username': 'test-user', 'perm': 'post', 'reason': 'Comment'})
+ user = M.User.by_username('test-user')
+ user_role = user.project_role()
+ app = M.Project.query.get(shortname='test').app_instance('wiki')
+ assert M.ACL.contains(M.ACE.deny(user_role._id, 'read'), app.acl)
+ assert M.ACL.contains(M.ACE.deny(user_role._id, 'post'), app.acl)
+ old_acl = app.acl
+
+ permissions_page = self.app.get('/admin/wiki/permissions')
+ permissions_page.forms[0].submit()
+
+ # deny ACEs for user still should be there
+ app = M.Project.query.get(shortname='test').app_instance('wiki')
+ assert M.ACL.contains(M.ACE.deny(user_role._id, 'read'), app.acl)
+ assert M.ACL.contains(M.ACE.deny(user_role._id, 'post'), app.acl)
+ # ...and all old ACEs also
+ for ace in old_acl:
+ assert_in(ace, app.acl)
+
def test_tool_permissions(self):
BUILTIN_APPS = ['activity', 'blog', 'discussion', 'git', 'link',
'shorturl', 'svn', 'tickets', 'userstats', 'wiki']
[27/50] git commit: [#6612] fail faster if an import fails
Posted by jo...@apache.org.
[#6612] fail faster if an import fails
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/7fc8966d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/7fc8966d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/7fc8966d
Branch: refs/heads/cj/6422
Commit: 7fc8966d35d4a995d8525f5c9f12f13db6814c4a
Parents: acfb7b5
Author: Dave Brondsema <db...@slashdotmedia.com>
Authored: Fri Sep 27 16:18:17 2013 +0000
Committer: Dave Brondsema <db...@slashdotmedia.com>
Committed: Fri Sep 27 16:18:17 2013 +0000
----------------------------------------------------------------------
.../forgetracker/tests/functional/test_import.py | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/7fc8966d/ForgeTracker/forgetracker/tests/functional/test_import.py
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/tests/functional/test_import.py b/ForgeTracker/forgetracker/tests/functional/test_import.py
index 9a36db6..b352f0f 100644
--- a/ForgeTracker/forgetracker/tests/functional/test_import.py
+++ b/ForgeTracker/forgetracker/tests/functional/test_import.py
@@ -117,8 +117,9 @@ class TestImportController(TestRestApiBase):
doc_text = open(here_dir + '/data/sf.json').read()
doc_json = json.loads(doc_text)
ticket_json = doc_json['trackers']['default']['artifacts'][0]
- self.api_post('/rest/p/test/bugs/perform_import',
+ r = self.api_post('/rest/p/test/bugs/perform_import',
doc=doc_text, options='{"user_map": {"hinojosa4": "test-admin", "ma_boehm": "test-user"}}')
+ assert r.json['status'], r.json
ming.orm.ThreadLocalORMSession.flush_all()
M.MonQTask.run_ready()
@@ -183,8 +184,9 @@ class TestImportController(TestRestApiBase):
self.set_api_token(api_ticket)
doc_text = open(here_dir + '/data/milestone-tickets.json').read()
- self.api_post('/rest/p/test/bugs/perform_import', doc=doc_text,
+ r = self.api_post('/rest/p/test/bugs/perform_import', doc=doc_text,
options='{"user_map": {"hinojosa4": "test-admin", "ma_boehm": "test-user"}}')
+ assert r.json['status'], r.json
ming.orm.ThreadLocalORMSession.flush_all()
M.MonQTask.run_ready()
@@ -224,8 +226,9 @@ class TestImportController(TestRestApiBase):
self.set_api_token(api_ticket)
doc_text = open(os.path.dirname(__file__) + '/data/sf.json').read()
- self.api_post('/rest/p/test/bugs/perform_import',
+ r = self.api_post('/rest/p/test/bugs/perform_import',
doc=doc_text, options='{"user_map": {"hinojosa4": "test-admin", "ma_boehm": "test-user"}}')
+ assert r.json['status'], r.json
r = self.app.get('/p/test/bugs/204/')
ticket = TM.Ticket.query.get(app_config_id=c.app.config._id,
@@ -247,8 +250,9 @@ class TestImportController(TestRestApiBase):
self.set_api_token(api_ticket)
doc_text = open(os.path.dirname(__file__) + '/data/sf.json').read()
- self.api_post('/rest/p/test/bugs/perform_import',
+ r = self.api_post('/rest/p/test/bugs/perform_import',
doc=doc_text, options='{"user_map": {"hinojosa4": "test-admin", "ma_boehm": "test-user"}}')
+ assert r.json['status'], r.json
ticket = TM.Ticket.query.get(app_config_id=c.app.config._id,
ticket_num=204)
comments = ticket.discussion_thread.post_class().query.find(dict(
[47/50] git commit: [#6422] Bubbled up LICENSE items from
Allura/LICENSE and condensed to pointers
Posted by jo...@apache.org.
[#6422] Bubbled up LICENSE items from Allura/LICENSE and condensed to pointers
Signed-off-by: Cory Johns <cj...@slashdotmedia.com>
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/8574e372
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/8574e372
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/8574e372
Branch: refs/heads/cj/6422
Commit: 8574e372396b13bf5f9740c0464582aedf80a44c
Parents: 32204be
Author: Cory Johns <cj...@slashdotmedia.com>
Authored: Tue Sep 17 21:25:48 2013 +0000
Committer: Cory Johns <cj...@slashdotmedia.com>
Committed: Wed Oct 2 19:01:26 2013 +0000
----------------------------------------------------------------------
Allura/LICENSE | 401 ++--------------------------
Allura/allura/public/nf/js/spin.min.js | 25 +-
LICENSE | 25 +-
3 files changed, 71 insertions(+), 380 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/8574e372/Allura/LICENSE
----------------------------------------------------------------------
diff --git a/Allura/LICENSE b/Allura/LICENSE
index b38e207..de4eeac 100644
--- a/Allura/LICENSE
+++ b/Allura/LICENSE
@@ -208,380 +208,27 @@ separate copyright notices and license terms. Your use of the source code
for the these subcomponents is subject to the terms and conditions of the
following licenses.
-For jQueryUI, in files
-allura/lib/widgets/resources/css/autocomplete.css
-allura/lib/widgets/resources/css/jquery.ui.datepicker.css
-allura/public/nf/css/forge/accordion.css
-allura/public/nf/css/smoothness/jquery-ui-1.8.4.custom.css
-allura/public/nf/js/jquery-base.js
-
- Copyright 2010 jQuery Foundation and other contributors,
- http://jqueryui.com/
-
- This software consists of voluntary contributions made by many
- individuals (AUTHORS.txt, http://jqueryui.com/about) For exact
- contribution history, see the revision history and logs, available
- at http://jquery-ui.googlecode.com/svn/
-
- Permission is hereby granted, free of charge, to any person obtaining
- a copy of this software and associated documentation files (the
- "Software"), to deal in the Software without restriction, including
- without limitation the rights to use, copy, modify, merge, publish,
- distribute, sublicense, and/or sell copies of the Software, and to
- permit persons to whom the Software is furnished to do so, subject to
- the following conditions:
-
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-For jQuery Font selector plugin, in file
-allura/lib/widgets/resources/js/jqfontselector.js
-
- Copyright (c) 2012 James Carmichael
-
- Permission is hereby granted, free of charge, to any person obtaining
- a copy of this software and associated documentation files (the "Software"),
- to deal in the Software without restriction, including without limitation
- the rights to use, copy, modify, merge, publish, distribute, sublicense,
- and/or sell copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following conditions:
-
- The above copyright notice and this permission notice shall be included
- in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- DEALINGS IN THE SOFTWARE.
-
-For Autosize, in file
-allura/lib/widgets/resources/js/jquery.autosize-min.js
-
- Copyright (c) 2012 Jack Moore - jacklmoore.com
-
- Permission is hereby granted, free of charge, to any person obtaining
- a copy of this software and associated documentation files (the "Software"),
- to deal in the Software without restriction, including without limitation
- the rights to use, copy, modify, merge, publish, distribute, sublicense,
- and/or sell copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following conditions:
-
- The above copyright notice and this permission notice shall be included
- in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- DEALINGS IN THE SOFTWARE.
-
-For Really Simple Color Picker in jQuery, in file
-allura/lib/widgets/resources/js/jquery.colorPicker.js
-
- Copyright (c) 2008 Lakshan Perera (www.laktek.com)
- Daniel Lacy (daniellacy.com)
-
- Permission is hereby granted, free of charge, to any person obtaining a copy
- of this software and associated documentation files (the "Software"), to
- deal in the Software without restriction, including without limitation the
- rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
- sell copies of the Software, and to permit persons to whom the Software is
- furnished to do so, subject to the following conditions:
-
- The above copyright notice and this permission notice shall be included in
- all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- IN THE SOFTWARE.
-
-For Tabby jQuery plugin, in file
-allura/lib/widgets/resources/js/jquery.textarea.js
-
- Copyright (c) 2009 Ted Devito
-
- Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following
- conditions are met:
-
- 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer
- in the documentation and/or other materials provided with the distribution.
- 3. The name of the author may not be used to endorse or promote products derived from this software without specific prior written
- permission.
-
- THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE
- LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-For jquery.tools, in file
-allura/lib/widgets/resources/js/jquery.tools.min.js
-
- Copyright (c) 2009 Tero Piirainen
-
- Permission is hereby granted, free of charge, to any person obtaining a copy
- of this software and associated documentation files (the "Software"), to
- deal in the Software without restriction, including without limitation the
- rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
- sell copies of the Software, and to permit persons to whom the Software is
- furnished to do so, subject to the following conditions:
-
- The above copyright notice and this permission notice shall be included in
- all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- IN THE SOFTWARE.
-
-For Blueprint CSS Framework, in directory
-allura/public/nf/css/blueprint/
-
- Copyright (c) 2007 - 2010 blueprintcss.org
-
- Permission is hereby granted, free of charge, to any person
- obtaining a copy of this software and associated documentation
- files (the "Software"), to deal in the Software without
- restriction, including without limitation the rights to use,
- copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following
- conditions:
-
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- OTHER DEALINGS IN THE SOFTWARE.
-
-For jQuery, in file
-allura/public/nf/js/jquery-base.js
-
- Copyright 2013 jQuery Foundation and other contributors
- http://jquery.com/
-
- Permission is hereby granted, free of charge, to any person obtaining
- a copy of this software and associated documentation files (the
- "Software"), to deal in the Software without restriction, including
- without limitation the rights to use, copy, modify, merge, publish,
- distribute, sublicense, and/or sell copies of the Software, and to
- permit persons to whom the Software is furnished to do so, subject to
- the following conditions:
-
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-For Cookie plugin, in file
-allura/public/nf/js/jquery-base.js
-
- Copyright (c) 2006 Klaus Hartl (stilbuero.de)
-
- Permission is hereby granted, free of charge, to any person obtaining
- a copy of this software and associated documentation files (the
- "Software"), to deal in the Software without restriction, including
- without limitation the rights to use, copy, modify, merge, publish,
- distribute, sublicense, and/or sell copies of the Software, and to
- permit persons to whom the Software is furnished to do so, subject to
- the following conditions:
-
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-For jQuery Tooltip plugin, in file
-allura/public/nf/js/jquery-base.js
-
- Copyright (c) 2006 - 2008 Jörn Zaefferer
-
- Permission is hereby granted, free of charge, to any person obtaining
- a copy of this software and associated documentation files (the
- "Software"), to deal in the Software without restriction, including
- without limitation the rights to use, copy, modify, merge, publish,
- distribute, sublicense, and/or sell copies of the Software, and to
- permit persons to whom the Software is furnished to do so, subject to
- the following conditions:
-
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-For jQuery-Plugin "daterangepicker.jQuery.js", in file
-allura/public/nf/js/jquery.daterangepicker.js
-
- The MIT License
-
- Copyright (c) 2008, Filament Group, Inc
-
- Permission is hereby granted, free of charge, to any person obtaining a copy
- of this software and associated documentation files (the "Software"), to deal
- in the Software without restriction, including without limitation the rights
- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the Software is
- furnished to do so, subject to the following conditions:
-
- The above copyright notice and this permission notice shall be included in
- all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- THE SOFTWARE.
-
- The end-user documentation included with the redistribution, if any, must
- include the following acknowledgment: "This product includes software
- developed by Filament Group, Inc (http://www.filamentgroup.com/) and its
- contributors", in the same place and form as other third-party acknowledgments.
- Alternately, this acknowledgment may appear in the software itself, in the same
- form and location as other such third-party acknowledgments.
-
-For Javascript plotting library for jQuery, in file
-allura/public/nf/js/jquery.flot.js
-
- Copyright (c) 2007-2009 IOLA and Ole Laursen
-
- Permission is hereby granted, free of charge, to any person
- obtaining a copy of this software and associated documentation
- files (the "Software"), to deal in the Software without
- restriction, including without limitation the rights to use,
- copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following
- conditions:
-
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- OTHER DEALINGS IN THE SOFTWARE.
-
-For Textarea Max Length for jQuery v1.1.0, in file
-allura/public/nf/js/jquery.maxlength.js
-
- Copyright 2012 jQuery Foundation and other contributors
- http://jquery.com/
-
- Permission is hereby granted, free of charge, to any person obtaining
- a copy of this software and associated documentation files (the
- "Software"), to deal in the Software without restriction, including
- without limitation the rights to use, copy, modify, merge, publish,
- distribute, sublicense, and/or sell copies of the Software, and to
- permit persons to whom the Software is furnished to do so, subject to
- the following conditions:
-
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-For spin.js, in file
-allura/public/nf/js/spin.min.js
-
- The MIT License
-
- Copyright (c) 2011 Felix Gnass [fgnass at neteye dot de]
-
- Permission is hereby granted, free of charge, to any person obtaining a copy
- of this software and associated documentation files (the "Software"), to deal
- in the Software without restriction, including without limitation the rights
- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the Software is
- furnished to do so, subject to the following conditions:
-
- The above copyright notice and this permission notice shall be included in
- all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- THE SOFTWARE.
-
-For Vector and Matrix mathematics modules for JavaScript, in file
-allura/public/nf/js/sylvester.js
-
- Copyright (c) 2007 James Coglan
-
- Permission is hereby granted, free of charge, to any person obtaining
- a copy of this software and associated documentation files (the "Software"),
- to deal in the Software without restriction, including without limitation
- the rights to use, copy, modify, merge, publish, distribute, sublicense,
- and/or sell copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following conditions:
-
- The above copyright notice and this permission notice shall be included
- in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- DEALINGS IN THE SOFTWARE.
+Blueprint, which is available under the MIT license.
+For details, see Allura/allura/public/nf/css/blueprint/
+
+Spin.js, which is available under the MIT license.
+For details, see Allura/allura/public/nf/js/spin.min.js
+
+Sylvester, which is available under the MIT license.
+For details, see Allura/allura/public/nf/js/sylvester.js
+
+jQuery, jQueryUI, and various related plugins, which are available
+under the MIT license. For details, see the individual files:
+ Allura/allura/public/nf/js/jquery-base.js
+ Allura/allura/public/nf/css/smoothness/jquery-ui-1.8.4.custom.css
+ Allura/allura/lib/widgets/resources/css/jquery.ui.datepicker.css
+ Allura/allura/lib/widgets/resources/css/autocomplete.css
+ Allura/allura/public/nf/css/forge/accordion.css
+ Allura/allura/lib/widgets/resources/js/jqfontselector.js
+ Allura/allura/lib/widgets/resources/js/jquery.autosize-min.js
+ Allura/allura/lib/widgets/resources/js/jquery.colorPicker.js
+ Allura/allura/lib/widgets/resources/js/jquery.textarea.js
+ Allura/allura/lib/widgets/resources/js/jquery.tools.min.js
+ Allura/allura/public/nf/js/jquery.daterangepicker.js
+ Allura/allura/public/nf/js/jquery.flot.js
+ Allura/allura/public/nf/js/jquery.maxlength.min.js
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/8574e372/Allura/allura/public/nf/js/spin.min.js
----------------------------------------------------------------------
diff --git a/Allura/allura/public/nf/js/spin.min.js b/Allura/allura/public/nf/js/spin.min.js
index c38b40e..21af822 100644
--- a/Allura/allura/public/nf/js/spin.min.js
+++ b/Allura/allura/public/nf/js/spin.min.js
@@ -1,2 +1,25 @@
+/*
+ * The MIT License
+ *
+ * Copyright (c) 2011 Felix Gnass [fgnass at neteye dot de]
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
//fgnass.github.com/spin.js#v1.2.5
-(function(a,b,c){function g(a,c){var d=b.createElement(a||"div"),e;for(e in c)d[e]=c[e];return d}function h(a){for(var b=1,c=arguments.length;b<c;b++)a.appendChild(arguments[b]);return a}function j(a,b,c,d){var g=["opacity",b,~~(a*100),c,d].join("-"),h=.01+c/d*100,j=Math.max(1-(1-a)/b*(100-h),a),k=f.substring(0,f.indexOf("Animation")).toLowerCase(),l=k&&"-"+k+"-"||"";return e[g]||(i.insertRule("@"+l+"keyframes "+g+"{"+"0%{opacity:"+j+"}"+h+"%{opacity:"+a+"}"+(h+.01)+"%{opacity:1}"+(h+b)%100+"%{opacity:"+a+"}"+"100%{opacity:"+j+"}"+"}",0),e[g]=1),g}function k(a,b){var e=a.style,f,g;if(e[b]!==c)return b;b=b.charAt(0).toUpperCase()+b.slice(1);for(g=0;g<d.length;g++){f=d[g]+b;if(e[f]!==c)return f}}function l(a,b){for(var c in b)a.style[k(a,c)||c]=b[c];return a}function m(a){for(var b=1;b<arguments.length;b++){var d=arguments[b];for(var e in d)a[e]===c&&(a[e]=d[e])}return a}function n(a){var b={x:a.offsetLeft,y:a.offsetTop};while(a=a.offsetParent)b.x+=a.offsetLeft,b.y+=a.offsetTop;return
b}var d=["webkit","Moz","ms","O"],e={},f,i=function(){var a=g("style");return h(b.getElementsByTagName("head")[0],a),a.sheet||a.styleSheet}(),o={lines:12,length:7,width:5,radius:10,rotate:0,color:"#000",speed:1,trail:100,opacity:.25,fps:20,zIndex:2e9,className:"spinner",top:"auto",left:"auto"},p=function q(a){if(!this.spin)return new q(a);this.opts=m(a||{},q.defaults,o)};p.defaults={},m(p.prototype,{spin:function(a){this.stop();var b=this,c=b.opts,d=b.el=l(g(0,{className:c.className}),{position:"relative",zIndex:c.zIndex}),e=c.radius+c.length+c.width,h,i;a&&(a.insertBefore(d,a.firstChild||null),i=n(a),h=n(d),l(d,{left:(c.left=="auto"?i.x-h.x+(a.offsetWidth>>1):c.left+e)+"px",top:(c.top=="auto"?i.y-h.y+(a.offsetHeight>>1):c.top+e)+"px"})),d.setAttribute("aria-role","progressbar"),b.lines(d,b.opts);if(!f){var j=0,k=c.fps,m=k/c.speed,o=(1-c.opacity)/(m*c.trail/100),p=m/c.lines;!function q(){j++;for(var a=c.lines;a;a--){var e=Math.max(1-(j+a*p)%m*o,c.opacity);b.opacity(d,c.lines-a,e,c)
}b.timeout=b.el&&setTimeout(q,~~(1e3/k))}()}return b},stop:function(){var a=this.el;return a&&(clearTimeout(this.timeout),a.parentNode&&a.parentNode.removeChild(a),this.el=c),this},lines:function(a,b){function e(a,d){return l(g(),{position:"absolute",width:b.length+b.width+"px",height:b.width+"px",background:a,boxShadow:d,transformOrigin:"left",transform:"rotate("+~~(360/b.lines*c+b.rotate)+"deg) translate("+b.radius+"px"+",0)",borderRadius:(b.width>>1)+"px"})}var c=0,d;for(;c<b.lines;c++)d=l(g(),{position:"absolute",top:1+~(b.width/2)+"px",transform:b.hwaccel?"translate3d(0,0,0)":"",opacity:b.opacity,animation:f&&j(b.opacity,b.trail,c,b.lines)+" "+1/b.speed+"s linear infinite"}),b.shadow&&h(d,l(e("#000","0 0 4px #000"),{top:"2px"})),h(a,h(d,e(b.color,"0 0 1px rgba(0,0,0,.1)")));return a},opacity:function(a,b,c){b<a.childNodes.length&&(a.childNodes[b].style.opacity=c)}}),!function(){function a(a,b){return g("<"+a+' xmlns="urn:schemas-microsoft.com:vml" class="spin-vml">',b)}var b=l(
g("group"),{behavior:"url(#default#VML)"});!k(b,"transform")&&b.adj?(i.addRule(".spin-vml","behavior:url(#default#VML)"),p.prototype.lines=function(b,c){function f(){return l(a("group",{coordsize:e+" "+e,coordorigin:-d+" "+ -d}),{width:e,height:e})}function k(b,e,g){h(i,h(l(f(),{rotation:360/c.lines*b+"deg",left:~~e}),h(l(a("roundrect",{arcsize:1}),{width:d,height:c.width,left:c.radius,top:-c.width>>1,filter:g}),a("fill",{color:c.color,opacity:c.opacity}),a("stroke",{opacity:0}))))}var d=c.length+c.width,e=2*d,g=-(c.width+c.length)*2+"px",i=l(f(),{position:"absolute",top:g,left:g}),j;if(c.shadow)for(j=1;j<=c.lines;j++)k(j,-2,"progid:DXImageTransform.Microsoft.Blur(pixelradius=2,makeshadow=1,shadowopacity=.3)");for(j=1;j<=c.lines;j++)k(j);return h(b,i)},p.prototype.opacity=function(a,b,c,d){var e=a.firstChild;d=d.shadow&&d.lines||0,e&&b+d<e.childNodes.length&&(e=e.childNodes[b+d],e=e&&e.firstChild,e=e&&e.firstChild,e&&(e.opacity=c))}):f=k(b,"animation")}(),a.Spinner=p})(window,docume
nt);
\ No newline at end of file
+(function(a,b,c){function g(a,c){var d=b.createElement(a||"div"),e;for(e in c)d[e]=c[e];return d}function h(a){for(var b=1,c=arguments.length;b<c;b++)a.appendChild(arguments[b]);return a}function j(a,b,c,d){var g=["opacity",b,~~(a*100),c,d].join("-"),h=.01+c/d*100,j=Math.max(1-(1-a)/b*(100-h),a),k=f.substring(0,f.indexOf("Animation")).toLowerCase(),l=k&&"-"+k+"-"||"";return e[g]||(i.insertRule("@"+l+"keyframes "+g+"{"+"0%{opacity:"+j+"}"+h+"%{opacity:"+a+"}"+(h+.01)+"%{opacity:1}"+(h+b)%100+"%{opacity:"+a+"}"+"100%{opacity:"+j+"}"+"}",0),e[g]=1),g}function k(a,b){var e=a.style,f,g;if(e[b]!==c)return b;b=b.charAt(0).toUpperCase()+b.slice(1);for(g=0;g<d.length;g++){f=d[g]+b;if(e[f]!==c)return f}}function l(a,b){for(var c in b)a.style[k(a,c)||c]=b[c];return a}function m(a){for(var b=1;b<arguments.length;b++){var d=arguments[b];for(var e in d)a[e]===c&&(a[e]=d[e])}return a}function n(a){var b={x:a.offsetLeft,y:a.offsetTop};while(a=a.offsetParent)b.x+=a.offsetLeft,b.y+=a.offsetTop;return
b}var d=["webkit","Moz","ms","O"],e={},f,i=function(){var a=g("style");return h(b.getElementsByTagName("head")[0],a),a.sheet||a.styleSheet}(),o={lines:12,length:7,width:5,radius:10,rotate:0,color:"#000",speed:1,trail:100,opacity:.25,fps:20,zIndex:2e9,className:"spinner",top:"auto",left:"auto"},p=function q(a){if(!this.spin)return new q(a);this.opts=m(a||{},q.defaults,o)};p.defaults={},m(p.prototype,{spin:function(a){this.stop();var b=this,c=b.opts,d=b.el=l(g(0,{className:c.className}),{position:"relative",zIndex:c.zIndex}),e=c.radius+c.length+c.width,h,i;a&&(a.insertBefore(d,a.firstChild||null),i=n(a),h=n(d),l(d,{left:(c.left=="auto"?i.x-h.x+(a.offsetWidth>>1):c.left+e)+"px",top:(c.top=="auto"?i.y-h.y+(a.offsetHeight>>1):c.top+e)+"px"})),d.setAttribute("aria-role","progressbar"),b.lines(d,b.opts);if(!f){var j=0,k=c.fps,m=k/c.speed,o=(1-c.opacity)/(m*c.trail/100),p=m/c.lines;!function q(){j++;for(var a=c.lines;a;a--){var e=Math.max(1-(j+a*p)%m*o,c.opacity);b.opacity(d,c.lines-a,e,c)
}b.timeout=b.el&&setTimeout(q,~~(1e3/k))}()}return b},stop:function(){var a=this.el;return a&&(clearTimeout(this.timeout),a.parentNode&&a.parentNode.removeChild(a),this.el=c),this},lines:function(a,b){function e(a,d){return l(g(),{position:"absolute",width:b.length+b.width+"px",height:b.width+"px",background:a,boxShadow:d,transformOrigin:"left",transform:"rotate("+~~(360/b.lines*c+b.rotate)+"deg) translate("+b.radius+"px"+",0)",borderRadius:(b.width>>1)+"px"})}var c=0,d;for(;c<b.lines;c++)d=l(g(),{position:"absolute",top:1+~(b.width/2)+"px",transform:b.hwaccel?"translate3d(0,0,0)":"",opacity:b.opacity,animation:f&&j(b.opacity,b.trail,c,b.lines)+" "+1/b.speed+"s linear infinite"}),b.shadow&&h(d,l(e("#000","0 0 4px #000"),{top:"2px"})),h(a,h(d,e(b.color,"0 0 1px rgba(0,0,0,.1)")));return a},opacity:function(a,b,c){b<a.childNodes.length&&(a.childNodes[b].style.opacity=c)}}),!function(){function a(a,b){return g("<"+a+' xmlns="urn:schemas-microsoft.com:vml" class="spin-vml">',b)}var b=l(
g("group"),{behavior:"url(#default#VML)"});!k(b,"transform")&&b.adj?(i.addRule(".spin-vml","behavior:url(#default#VML)"),p.prototype.lines=function(b,c){function f(){return l(a("group",{coordsize:e+" "+e,coordorigin:-d+" "+ -d}),{width:e,height:e})}function k(b,e,g){h(i,h(l(f(),{rotation:360/c.lines*b+"deg",left:~~e}),h(l(a("roundrect",{arcsize:1}),{width:d,height:c.width,left:c.radius,top:-c.width>>1,filter:g}),a("fill",{color:c.color,opacity:c.opacity}),a("stroke",{opacity:0}))))}var d=c.length+c.width,e=2*d,g=-(c.width+c.length)*2+"px",i=l(f(),{position:"absolute",top:g,left:g}),j;if(c.shadow)for(j=1;j<=c.lines;j++)k(j,-2,"progid:DXImageTransform.Microsoft.Blur(pixelradius=2,makeshadow=1,shadowopacity=.3)");for(j=1;j<=c.lines;j++)k(j);return h(b,i)},p.prototype.opacity=function(a,b,c,d){var e=a.firstChild;d=d.shadow&&d.lines||0,e&&b+d<e.childNodes.length&&(e=e.childNodes[b+d],e=e&&e.firstChild,e=e&&e.firstChild,e&&(e.opacity=c))}):f=k(b,"animation")}(),a.Spinner=p})(window,docume
nt);
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/8574e372/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index 5202aaa..b7967a4 100644
--- a/LICENSE
+++ b/LICENSE
@@ -209,6 +209,27 @@ notices and license terms. Your use of the source code for the these
subcomponents is subject to the terms and conditions of the following
licenses.
-
Blueprint, which is available under the MIT license.
-For details, see Allura/allura/public/nf/css/blueprint/.
+For details, see Allura/allura/public/nf/css/blueprint/
+
+Spin.js, which is available under the MIT license.
+For details, see Allura/allura/public/nf/js/spin.min.js
+
+Sylvester, which is available under the MIT license.
+For details, see Allura/allura/public/nf/js/sylvester.js
+
+jQuery, jQueryUI, and various related plugins, which are available
+under the MIT license. For details, see the individual files:
+ Allura/allura/public/nf/js/jquery-base.js
+ Allura/allura/public/nf/css/smoothness/jquery-ui-1.8.4.custom.css
+ Allura/allura/lib/widgets/resources/css/jquery.ui.datepicker.css
+ Allura/allura/lib/widgets/resources/css/autocomplete.css
+ Allura/allura/public/nf/css/forge/accordion.css
+ Allura/allura/lib/widgets/resources/js/jqfontselector.js
+ Allura/allura/lib/widgets/resources/js/jquery.autosize-min.js
+ Allura/allura/lib/widgets/resources/js/jquery.colorPicker.js
+ Allura/allura/lib/widgets/resources/js/jquery.textarea.js
+ Allura/allura/lib/widgets/resources/js/jquery.tools.min.js
+ Allura/allura/public/nf/js/jquery.daterangepicker.js
+ Allura/allura/public/nf/js/jquery.flot.js
+ Allura/allura/public/nf/js/jquery.maxlength.min.js
[24/50] git commit: [#6612] Preserve original ticket owner if
username lookup fails
Posted by jo...@apache.org.
[#6612] Preserve original ticket owner if username lookup fails
Signed-off-by: Tim Van Steenburgh <tv...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/a580f3ec
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/a580f3ec
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/a580f3ec
Branch: refs/heads/cj/6422
Commit: a580f3ecb7b3bf68833300fec9a301bf2a4b984f
Parents: 2b52897
Author: Tim Van Steenburgh <tv...@gmail.com>
Authored: Thu Sep 26 18:28:29 2013 +0000
Committer: Dave Brondsema <db...@slashdotmedia.com>
Committed: Fri Sep 27 15:20:52 2013 +0000
----------------------------------------------------------------------
ForgeTracker/forgetracker/import_support.py | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/a580f3ec/ForgeTracker/forgetracker/import_support.py
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/import_support.py b/ForgeTracker/forgetracker/import_support.py
index c6a33cb..ef649dc 100644
--- a/ForgeTracker/forgetracker/import_support.py
+++ b/ForgeTracker/forgetracker/import_support.py
@@ -205,10 +205,15 @@ class ImportSupport(object):
remapped[new_f] = conv(v)
description = h.really_unicode(self.link_processing(remapped['description']))
+ creator = owner = ''
if ticket_dict['submitter'] and not remapped['reported_by_id']:
- description = u'Originally created by: {0}\n\n{1}'.format(
- h.really_unicode(ticket_dict['submitter']), description)
- remapped['description'] = description
+ creator = u'*Originally created by:* {0}\n'.format(
+ h.really_unicode(ticket_dict['submitter']))
+ if ticket_dict['assigned_to'] and not remapped['assigned_to_id']:
+ owner = u'*Originally owned by:* {0}\n'.format(
+ h.really_unicode(ticket_dict['assigned_to']))
+ remapped['description'] = u'{0}{1}{2}{3}'.format(creator, owner,
+ '\n' if creator or owner else '', description)
ticket_num = ticket_dict['id']
existing_ticket = TM.Ticket.query.get(app_config_id=c.app.config._id,
[48/50] git commit: [#6422] Added missed 3rd-party lib to LICENSE and
changed verbiage
Posted by jo...@apache.org.
[#6422] Added missed 3rd-party lib to LICENSE and changed verbiage
Signed-off-by: Cory Johns <cj...@slashdotmedia.com>
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/bd3b07ff
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/bd3b07ff
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/bd3b07ff
Branch: refs/heads/cj/6422
Commit: bd3b07ff678ccc57c2787db3c7c20a1c1e96c953
Parents: 41fe4a6
Author: Cory Johns <cj...@slashdotmedia.com>
Authored: Wed Sep 18 19:30:24 2013 +0000
Committer: Cory Johns <cj...@slashdotmedia.com>
Committed: Wed Oct 2 19:01:26 2013 +0000
----------------------------------------------------------------------
Allura/LICENSE | 4 ++++
LICENSE | 14 +++++++++-----
2 files changed, 13 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/bd3b07ff/Allura/LICENSE
----------------------------------------------------------------------
diff --git a/Allura/LICENSE b/Allura/LICENSE
index 973fd44..ffb5ecb 100644
--- a/Allura/LICENSE
+++ b/Allura/LICENSE
@@ -208,6 +208,10 @@ separate copyright notices and license terms. Your use of the source code
for the these subcomponents is subject to the terms and conditions of the
following licenses.
+HTML5 Canvas for Internet Explorer, which is available under the
+Apache License, Version 2.0.
+For details, see Allura/allura/public/nf/js/excanvas.compiled.js
+
The file allura/etc/mime.types from the mime-support package,
which is in the public domain. For details, see
http://ftp-master.metadata.debian.org/changelogs//main/m/mime-support/mime-support_3.54_copyright
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/bd3b07ff/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index 8f47b97..e558325 100644
--- a/LICENSE
+++ b/LICENSE
@@ -202,12 +202,16 @@
limitations under the License.
-ALLURA SUBCOMPONENTS:
+THIRD-PARTY DEPENDENCIES:
-Apache Allura includes a number of subcomponents with separate copyright
-notices and license terms. Your use of the source code for the these
-subcomponents is subject to the terms and conditions of the following
-licenses.
+Apache Allura includes a number of third-party dependencies with
+separate copyright notices and license terms. Your use of the source code
+for the these dependencies is subject to the terms and conditions of the
+following licenses.
+
+HTML5 Canvas for Internet Explorer, which is available under the
+Apache License, Version 2.0.
+For details, see Allura/allura/public/nf/js/excanvas.compiled.js
The file Allura/allura/etc/mime.types from the mime-support package,
which is in the public domain. For details, see
[45/50] git commit: [#6422] Added LICENSE file for Blueprint and
pointer in base LICENSE
Posted by jo...@apache.org.
[#6422] Added LICENSE file for Blueprint and pointer in base LICENSE
License file obtained from:
https://raw.github.com/joshuaclayton/blueprint-css/master/LICENSE
Signed-off-by: Cory Johns <cj...@slashdotmedia.com>
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/32204be2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/32204be2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/32204be2
Branch: refs/heads/cj/6422
Commit: 32204be232b0922c533999f73407e4227ba58bf5
Parents: 73a767d
Author: Cory Johns <cj...@slashdotmedia.com>
Authored: Tue Sep 17 20:54:31 2013 +0000
Committer: Cory Johns <cj...@slashdotmedia.com>
Committed: Wed Oct 2 19:01:25 2013 +0000
----------------------------------------------------------------------
Allura/allura/public/nf/css/blueprint/LICENSE | 22 ++++++++++++++++++++++
LICENSE | 12 ++++++++++++
2 files changed, 34 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/32204be2/Allura/allura/public/nf/css/blueprint/LICENSE
----------------------------------------------------------------------
diff --git a/Allura/allura/public/nf/css/blueprint/LICENSE b/Allura/allura/public/nf/css/blueprint/LICENSE
new file mode 100644
index 0000000..13076fb
--- /dev/null
+++ b/Allura/allura/public/nf/css/blueprint/LICENSE
@@ -0,0 +1,22 @@
+Copyright (c) 2007 - 2010 blueprintcss.org
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the "Software"), to deal in the Software without
+restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/32204be2/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index d645695..5202aaa 100644
--- a/LICENSE
+++ b/LICENSE
@@ -200,3 +200,15 @@
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
+
+
+ALLURA SUBCOMPONENTS:
+
+Apache Allura includes a number of subcomponents with separate copyright
+notices and license terms. Your use of the source code for the these
+subcomponents is subject to the terms and conditions of the following
+licenses.
+
+
+Blueprint, which is available under the MIT license.
+For details, see Allura/allura/public/nf/css/blueprint/.
[33/50] git commit: [#6431] bump ming version to get aggregate()
method
Posted by jo...@apache.org.
[#6431] bump ming version to get aggregate() method
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/f76bf432
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/f76bf432
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/f76bf432
Branch: refs/heads/cj/6422
Commit: f76bf432df6034fe537a8b0bf1aa20abdafa8ecd
Parents: 128a4dd
Author: Dave Brondsema <db...@slashdotmedia.com>
Authored: Fri Sep 27 15:18:55 2013 +0000
Committer: Dave Brondsema <db...@slashdotmedia.com>
Committed: Tue Oct 1 20:40:42 2013 +0000
----------------------------------------------------------------------
requirements-common.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/f76bf432/requirements-common.txt
----------------------------------------------------------------------
diff --git a/requirements-common.txt b/requirements-common.txt
index 51c7636..e99b5e9 100644
--- a/requirements-common.txt
+++ b/requirements-common.txt
@@ -21,7 +21,7 @@ httplib2==0.7.4
iso8601==0.1.4
Jinja2==2.6
Markdown==2.2.0
-Ming==0.4.1
+Ming==0.4.2
oauth2==1.5.170
# tg2 dep PasteDeploy must specified before TurboGears2, to avoid a version/allow-hosts problem
Paste==1.7.5.1
[16/50] git commit: [#6392] ticket:444 added ajax to unblock user
Posted by jo...@apache.org.
[#6392] ticket:444 added ajax to unblock user
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/2a570132
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/2a570132
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/2a570132
Branch: refs/heads/cj/6422
Commit: 2a570132fac1dc851b036befbf89fc0846e3f3ef
Parents: 83903bb
Author: coldmind <so...@yandex.ru>
Authored: Thu Sep 19 14:18:29 2013 +0300
Committer: Tim Van Steenburgh <tv...@gmail.com>
Committed: Tue Sep 24 17:36:25 2013 +0000
----------------------------------------------------------------------
Allura/allura/app.py | 6 +++---
Allura/allura/templates/app_admin_permissions.html | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/2a570132/Allura/allura/app.py
----------------------------------------------------------------------
diff --git a/Allura/allura/app.py b/Allura/allura/app.py
index b88f23a..d172a65 100644
--- a/Allura/allura/app.py
+++ b/Allura/allura/app.py
@@ -600,7 +600,8 @@ class DefaultAdminController(BaseController):
@validate(dict(user_id=V.Set(),
perm=V.UnicodeString()))
- @expose()
+ @expose('json:')
+ @require_post()
def unblock_user(self, user_id=None, perm=None):
try:
user_id = map(ObjectId, user_id)
@@ -608,8 +609,7 @@ class DefaultAdminController(BaseController):
user_id = []
users = model.User.query.find({'_id': {'$in': user_id}}).all()
if not users:
- flash('Select user to unblock', 'error')
- redirect(request.referer)
+ return dict(error='Select user to unblock')
for user in users:
ace = model.ACE.deny(user.project_role()._id, perm)
ace = model.ACL.contains(ace, self.app.acl)
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/2a570132/Allura/allura/templates/app_admin_permissions.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/app_admin_permissions.html b/Allura/allura/templates/app_admin_permissions.html
index 96471d4..fb5aa61 100644
--- a/Allura/allura/templates/app_admin_permissions.html
+++ b/Allura/allura/templates/app_admin_permissions.html
@@ -78,7 +78,7 @@
$('input.block_user_role').val(role);
$('div.model-block-list').html(userlist.html());
});
- $('form[action="block_user"]').submit(function() {
+ $('form[action="block_user"], form[action="unblock_user"]').submit(function() {
var form = $(this);
if($(this).is(':visible')) {
$.ajax({
[34/50] git commit: [#6431] Fix places that were still expecting a
cursor
Posted by jo...@apache.org.
[#6431] Fix places that were still expecting a cursor
Signed-off-by: Tim Van Steenburgh <tv...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/128a4ddf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/128a4ddf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/128a4ddf
Branch: refs/heads/cj/6422
Commit: 128a4ddf57a697616bea150f38596d99f28ac29a
Parents: 44963d1
Author: Tim Van Steenburgh <tv...@gmail.com>
Authored: Thu Sep 26 16:46:20 2013 +0000
Committer: Dave Brondsema <db...@slashdotmedia.com>
Committed: Tue Oct 1 20:40:42 2013 +0000
----------------------------------------------------------------------
Allura/allura/controllers/auth.py | 2 +-
ForgeTracker/forgetracker/tests/unit/test_ticket_model.py | 8 ++++++--
2 files changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/128a4ddf/Allura/allura/controllers/auth.py
----------------------------------------------------------------------
diff --git a/Allura/allura/controllers/auth.py b/Allura/allura/controllers/auth.py
index 6562d6e..ae08146 100644
--- a/Allura/allura/controllers/auth.py
+++ b/Allura/allura/controllers/auth.py
@@ -266,7 +266,7 @@ class AuthController(BaseController):
repos = []
for p in user.my_projects():
- for p in [p] + p.direct_subprojects.all():
+ for p in [p] + p.direct_subprojects:
for app in p.app_configs:
if not issubclass(g.entry_points["tool"][app.tool_name], RepositoryApp):
continue
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/128a4ddf/ForgeTracker/forgetracker/tests/unit/test_ticket_model.py
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/tests/unit/test_ticket_model.py b/ForgeTracker/forgetracker/tests/unit/test_ticket_model.py
index 93450d1..90eba99 100644
--- a/ForgeTracker/forgetracker/tests/unit/test_ticket_model.py
+++ b/ForgeTracker/forgetracker/tests/unit/test_ticket_model.py
@@ -20,6 +20,7 @@ from datetime import datetime
import urllib2
from ming.orm.ormsession import ThreadLocalORMSession
+from ming.orm import session
from ming import schema
from nose.tools import raises, assert_raises, assert_equal, assert_in
@@ -275,8 +276,11 @@ class TestTicketModel(TrackerTestWithModel):
TicketAttachment.save_attachment('test_ticket_model.py', ResettableStream(f),
artifact_id=ticket._id)
ThreadLocalORMSession.flush_all()
- assert_equal(ticket.attachments.count(), 1)
- assert_equal(ticket.attachments.first().filename, 'test_ticket_model.py')
+ # need to refetch since attachments are cached
+ session(ticket).expunge(ticket)
+ ticket = Ticket.query.get(_id=ticket._id)
+ assert_equal(len(ticket.attachments), 1)
+ assert_equal(ticket.attachments[0].filename, 'test_ticket_model.py')
def test_json_parents(self):
ticket = Ticket.new()
[49/50] git commit: [#6422] Cleaned up LICENSE and NOTICE files and
fixed license issues
Posted by jo...@apache.org.
[#6422] Cleaned up LICENSE and NOTICE files and fixed license issues
Signed-off-by: Cory Johns <cj...@slashdotmedia.com>
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/41fe4a69
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/41fe4a69
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/41fe4a69
Branch: refs/heads/cj/6422
Commit: 41fe4a69eab98d7fb58339205fe04c0d7197ae6e
Parents: 8574e37
Author: Cory Johns <cj...@slashdotmedia.com>
Authored: Wed Sep 18 19:14:49 2013 +0000
Committer: Cory Johns <cj...@slashdotmedia.com>
Committed: Wed Oct 2 19:01:26 2013 +0000
----------------------------------------------------------------------
Allura/LICENSE | 47 ++++++++++++---------
Allura/NOTICE | 21 ++-------
Allura/allura/controllers/controller.template | 16 +++++++
Allura/allura/public/nf/images/beta_sf.psd | Bin 2027421 -> 0 bytes
AlluraTest/LICENSE | 26 +-----------
AlluraTest/jslint/LICENSE | 21 +++++++++
ForgeDiscussion/NOTICE | 8 ++--
ForgeGit/NOTICE | 8 ++--
ForgeLink/NOTICE | 8 ++--
ForgeSVN/NOTICE | 8 ++--
ForgeTracker/NOTICE | 8 ++--
ForgeWiki/NOTICE | 8 ++--
LICENSE | 28 ++++++++----
NoWarnings/NOTICE | 8 ++--
rat-excludes.txt | 21 ++++-----
15 files changed, 127 insertions(+), 109 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/41fe4a69/Allura/LICENSE
----------------------------------------------------------------------
diff --git a/Allura/LICENSE b/Allura/LICENSE
index de4eeac..973fd44 100644
--- a/Allura/LICENSE
+++ b/Allura/LICENSE
@@ -208,27 +208,36 @@ separate copyright notices and license terms. Your use of the source code
for the these subcomponents is subject to the terms and conditions of the
following licenses.
+The file allura/etc/mime.types from the mime-support package,
+which is in the public domain. For details, see
+http://ftp-master.metadata.debian.org/changelogs//main/m/mime-support/mime-support_3.54_copyright
+
+ASCII, Dammit, which is in the public domain.
+For details, see allura/lib/AsciiDammit.py
+
+jQuery, jQueryUI, and various related plugins, which are available
+under the MIT license. For details, see the individual files:
+ allura/public/nf/js/jquery-base.js
+ allura/public/nf/css/smoothness/jquery-ui-1.8.4.custom.css
+ allura/lib/widgets/resources/css/jquery.ui.datepicker.css
+ allura/public/nf/js/jquery.daterangepicker.js
+ allura/public/nf/css/forge/ui.daterangepicker.css
+ allura/lib/widgets/resources/css/autocomplete.css
+ allura/public/nf/css/forge/accordion.css
+ allura/lib/widgets/resources/js/jqfontselector.js
+ allura/lib/widgets/resources/js/jquery.autosize-min.js
+ allura/lib/widgets/resources/js/jquery.colorPicker.js
+ allura/lib/widgets/resources/js/jquery.tagsinput.js
+ allura/lib/widgets/resources/js/jquery.textarea.js
+ allura/lib/widgets/resources/js/jquery.tools.min.js
+ allura/public/nf/js/jquery.flot.js
+ allura/public/nf/js/jquery.maxlength.min.js
+
Blueprint, which is available under the MIT license.
-For details, see Allura/allura/public/nf/css/blueprint/
+For details, see allura/public/nf/css/blueprint/
Spin.js, which is available under the MIT license.
-For details, see Allura/allura/public/nf/js/spin.min.js
+For details, see allura/public/nf/js/spin.min.js
Sylvester, which is available under the MIT license.
-For details, see Allura/allura/public/nf/js/sylvester.js
-
-jQuery, jQueryUI, and various related plugins, which are available
-under the MIT license. For details, see the individual files:
- Allura/allura/public/nf/js/jquery-base.js
- Allura/allura/public/nf/css/smoothness/jquery-ui-1.8.4.custom.css
- Allura/allura/lib/widgets/resources/css/jquery.ui.datepicker.css
- Allura/allura/lib/widgets/resources/css/autocomplete.css
- Allura/allura/public/nf/css/forge/accordion.css
- Allura/allura/lib/widgets/resources/js/jqfontselector.js
- Allura/allura/lib/widgets/resources/js/jquery.autosize-min.js
- Allura/allura/lib/widgets/resources/js/jquery.colorPicker.js
- Allura/allura/lib/widgets/resources/js/jquery.textarea.js
- Allura/allura/lib/widgets/resources/js/jquery.tools.min.js
- Allura/allura/public/nf/js/jquery.daterangepicker.js
- Allura/allura/public/nf/js/jquery.flot.js
- Allura/allura/public/nf/js/jquery.maxlength.min.js
+For details, see allura/public/nf/js/sylvester.js
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/41fe4a69/Allura/NOTICE
----------------------------------------------------------------------
diff --git a/Allura/NOTICE b/Allura/NOTICE
index 8157ed8..40b6969 100644
--- a/Allura/NOTICE
+++ b/Allura/NOTICE
@@ -1,18 +1,5 @@
- Apache Allura (incubating)
- Copyright 2012-2013 The Apache Software Foundation
+Apache Allura (incubating)
+Copyright 2012-2013 The Apache Software Foundation
- This product includes software developed at
- The Apache Software Foundation (http://www.apache.org/).
-
- This software contains library for converting various
- characters to ASCII encoding, written by Leonard Richardson
- and placed into public domain.
-
- This software contains library for checking maximum length
- of text area's content, written by Keith Wood.
-
- This software contains lightbox plugin for jQuery, written by
- Buck Wilson.
-
- Canvas functionality in Internet Explorer(r) is provided
- by code developed at Google Inc.
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/41fe4a69/Allura/allura/controllers/controller.template
----------------------------------------------------------------------
diff --git a/Allura/allura/controllers/controller.template b/Allura/allura/controllers/controller.template
index d7fd65b..f565369 100644
--- a/Allura/allura/controllers/controller.template
+++ b/Allura/allura/controllers/controller.template
@@ -1,4 +1,20 @@
# -*- coding: utf-8 -*-
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
"""Sample controller module"""
# turbogears imports
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/41fe4a69/Allura/allura/public/nf/images/beta_sf.psd
----------------------------------------------------------------------
diff --git a/Allura/allura/public/nf/images/beta_sf.psd b/Allura/allura/public/nf/images/beta_sf.psd
deleted file mode 100644
index 9e74297..0000000
Binary files a/Allura/allura/public/nf/images/beta_sf.psd and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/41fe4a69/AlluraTest/LICENSE
----------------------------------------------------------------------
diff --git a/AlluraTest/LICENSE b/AlluraTest/LICENSE
index 15f71ee..8da34a3 100644
--- a/AlluraTest/LICENSE
+++ b/AlluraTest/LICENSE
@@ -208,27 +208,5 @@ separate copyright notices and license terms. Your use of the source code
for the these subcomponents is subject to the terms and conditions of the
following licenses.
-For jslint.js, in directory
-jslint/
-
- Copyright (c) 2002 Douglas Crockford (www.JSLint.com)
-
- Permission is hereby granted, free of charge, to any person obtaining a copy of
- this software and associated documentation files (the "Software"), to deal in
- the Software without restriction, including without limitation the rights to
- use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
- of the Software, and to permit persons to whom the Software is furnished to do
- so, subject to the following conditions:
-
- The above copyright notice and this permission notice shall be included in all
- copies or substantial portions of the Software.
-
- The Software shall be used for Good, not Evil.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- SOFTWARE.
+JSLint, which is available under the MIT license.
+For details, see jslint/
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/41fe4a69/AlluraTest/jslint/LICENSE
----------------------------------------------------------------------
diff --git a/AlluraTest/jslint/LICENSE b/AlluraTest/jslint/LICENSE
new file mode 100644
index 0000000..9532d4e
--- /dev/null
+++ b/AlluraTest/jslint/LICENSE
@@ -0,0 +1,21 @@
+Copyright (c) 2002 Douglas Crockford (www.JSLint.com)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+The Software shall be used for Good, not Evil.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/41fe4a69/ForgeDiscussion/NOTICE
----------------------------------------------------------------------
diff --git a/ForgeDiscussion/NOTICE b/ForgeDiscussion/NOTICE
index e8ad3bb..40b6969 100644
--- a/ForgeDiscussion/NOTICE
+++ b/ForgeDiscussion/NOTICE
@@ -1,5 +1,5 @@
- Apache Allura (incubating)
- Copyright 2012-2013 The Apache Software Foundation
+Apache Allura (incubating)
+Copyright 2012-2013 The Apache Software Foundation
- This product includes software developed at
- The Apache Software Foundation (http://www.apache.org/).
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/41fe4a69/ForgeGit/NOTICE
----------------------------------------------------------------------
diff --git a/ForgeGit/NOTICE b/ForgeGit/NOTICE
index e8ad3bb..40b6969 100644
--- a/ForgeGit/NOTICE
+++ b/ForgeGit/NOTICE
@@ -1,5 +1,5 @@
- Apache Allura (incubating)
- Copyright 2012-2013 The Apache Software Foundation
+Apache Allura (incubating)
+Copyright 2012-2013 The Apache Software Foundation
- This product includes software developed at
- The Apache Software Foundation (http://www.apache.org/).
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/41fe4a69/ForgeLink/NOTICE
----------------------------------------------------------------------
diff --git a/ForgeLink/NOTICE b/ForgeLink/NOTICE
index e8ad3bb..40b6969 100644
--- a/ForgeLink/NOTICE
+++ b/ForgeLink/NOTICE
@@ -1,5 +1,5 @@
- Apache Allura (incubating)
- Copyright 2012-2013 The Apache Software Foundation
+Apache Allura (incubating)
+Copyright 2012-2013 The Apache Software Foundation
- This product includes software developed at
- The Apache Software Foundation (http://www.apache.org/).
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/41fe4a69/ForgeSVN/NOTICE
----------------------------------------------------------------------
diff --git a/ForgeSVN/NOTICE b/ForgeSVN/NOTICE
index e8ad3bb..40b6969 100644
--- a/ForgeSVN/NOTICE
+++ b/ForgeSVN/NOTICE
@@ -1,5 +1,5 @@
- Apache Allura (incubating)
- Copyright 2012-2013 The Apache Software Foundation
+Apache Allura (incubating)
+Copyright 2012-2013 The Apache Software Foundation
- This product includes software developed at
- The Apache Software Foundation (http://www.apache.org/).
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/41fe4a69/ForgeTracker/NOTICE
----------------------------------------------------------------------
diff --git a/ForgeTracker/NOTICE b/ForgeTracker/NOTICE
index e8ad3bb..40b6969 100644
--- a/ForgeTracker/NOTICE
+++ b/ForgeTracker/NOTICE
@@ -1,5 +1,5 @@
- Apache Allura (incubating)
- Copyright 2012-2013 The Apache Software Foundation
+Apache Allura (incubating)
+Copyright 2012-2013 The Apache Software Foundation
- This product includes software developed at
- The Apache Software Foundation (http://www.apache.org/).
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/41fe4a69/ForgeWiki/NOTICE
----------------------------------------------------------------------
diff --git a/ForgeWiki/NOTICE b/ForgeWiki/NOTICE
index e8ad3bb..40b6969 100644
--- a/ForgeWiki/NOTICE
+++ b/ForgeWiki/NOTICE
@@ -1,5 +1,5 @@
- Apache Allura (incubating)
- Copyright 2012-2013 The Apache Software Foundation
+Apache Allura (incubating)
+Copyright 2012-2013 The Apache Software Foundation
- This product includes software developed at
- The Apache Software Foundation (http://www.apache.org/).
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/41fe4a69/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index b7967a4..8f47b97 100644
--- a/LICENSE
+++ b/LICENSE
@@ -209,27 +209,39 @@ notices and license terms. Your use of the source code for the these
subcomponents is subject to the terms and conditions of the following
licenses.
-Blueprint, which is available under the MIT license.
-For details, see Allura/allura/public/nf/css/blueprint/
-
-Spin.js, which is available under the MIT license.
-For details, see Allura/allura/public/nf/js/spin.min.js
+The file Allura/allura/etc/mime.types from the mime-support package,
+which is in the public domain. For details, see
+http://ftp-master.metadata.debian.org/changelogs//main/m/mime-support/mime-support_3.54_copyright
-Sylvester, which is available under the MIT license.
-For details, see Allura/allura/public/nf/js/sylvester.js
+ASCII, Dammit, which is in the public domain.
+For details, see Allura/allura/lib/AsciiDammit.py
jQuery, jQueryUI, and various related plugins, which are available
under the MIT license. For details, see the individual files:
Allura/allura/public/nf/js/jquery-base.js
Allura/allura/public/nf/css/smoothness/jquery-ui-1.8.4.custom.css
Allura/allura/lib/widgets/resources/css/jquery.ui.datepicker.css
+ Allura/allura/public/nf/js/jquery.daterangepicker.js
+ Allura/allura/public/nf/css/forge/ui.daterangepicker.css
Allura/allura/lib/widgets/resources/css/autocomplete.css
Allura/allura/public/nf/css/forge/accordion.css
Allura/allura/lib/widgets/resources/js/jqfontselector.js
Allura/allura/lib/widgets/resources/js/jquery.autosize-min.js
Allura/allura/lib/widgets/resources/js/jquery.colorPicker.js
+ Allura/allura/lib/widgets/resources/js/jquery.tagsinput.js
Allura/allura/lib/widgets/resources/js/jquery.textarea.js
Allura/allura/lib/widgets/resources/js/jquery.tools.min.js
- Allura/allura/public/nf/js/jquery.daterangepicker.js
Allura/allura/public/nf/js/jquery.flot.js
Allura/allura/public/nf/js/jquery.maxlength.min.js
+
+Blueprint, which is available under the MIT license.
+For details, see Allura/allura/public/nf/css/blueprint/
+
+Spin.js, which is available under the MIT license.
+For details, see Allura/allura/public/nf/js/spin.min.js
+
+Sylvester, which is available under the MIT license.
+For details, see Allura/allura/public/nf/js/sylvester.js
+
+JSLint, which is available under the MIT license.
+For details, see AlluraTest/jslint/
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/41fe4a69/NoWarnings/NOTICE
----------------------------------------------------------------------
diff --git a/NoWarnings/NOTICE b/NoWarnings/NOTICE
index e8ad3bb..40b6969 100644
--- a/NoWarnings/NOTICE
+++ b/NoWarnings/NOTICE
@@ -1,5 +1,5 @@
- Apache Allura (incubating)
- Copyright 2012-2013 The Apache Software Foundation
+Apache Allura (incubating)
+Copyright 2012-2013 The Apache Software Foundation
- This product includes software developed at
- The Apache Software Foundation (http://www.apache.org/).
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/41fe4a69/rat-excludes.txt
----------------------------------------------------------------------
diff --git a/rat-excludes.txt b/rat-excludes.txt
index 30ded2a..968c66f 100644
--- a/rat-excludes.txt
+++ b/rat-excludes.txt
@@ -8,38 +8,33 @@ requirements*
**/*.log
**/.coverage
**/nosetests.xml
-Allura/allura/controllers/controller.template
Allura/docs/_build/
Allura/allura/etc/mime.types
Allura/allura/lib/AsciiDammit.py
-Allura/allura/lib/widgets/resources/css/autocomplete.css
+Allura/allura/public/nf/js/jquery-base.js
+Allura/allura/public/nf/css/smoothness/jquery-ui-1.8.4.custom.css
Allura/allura/lib/widgets/resources/css/jquery.ui.datepicker.css
+Allura/allura/public/nf/js/jquery.daterangepicker.js
+Allura/allura/public/nf/css/forge/ui.daterangepicker.css
+Allura/allura/lib/widgets/resources/css/autocomplete.css
+Allura/allura/public/nf/css/forge/accordion.css
Allura/allura/lib/widgets/resources/js/jqfontselector.js
Allura/allura/lib/widgets/resources/js/jquery.autosize-min.js
Allura/allura/lib/widgets/resources/js/jquery.colorPicker.js
Allura/allura/lib/widgets/resources/js/jquery.tagsinput.js
Allura/allura/lib/widgets/resources/js/jquery.textarea.js
Allura/allura/lib/widgets/resources/js/jquery.tools.min.js
-Allura/allura/public/nf/css/blueprint/
-Allura/allura/public/nf/css/forge/accordion.css
-Allura/allura/public/nf/css/forge/ui.daterangepicker.css
-Allura/allura/public/nf/css/smoothness/jquery-ui-1.8.4.custom.css
-Allura/allura/public/nf/images/beta_sf.psd
-Allura/allura/public/nf/js/jquery-base.js
-Allura/allura/public/nf/js/jquery.daterangepicker.js
Allura/allura/public/nf/js/jquery.flot.js
Allura/allura/public/nf/js/jquery.maxlength.min.js
+Allura/allura/public/nf/css/blueprint/
Allura/allura/public/nf/js/spin.min.js
Allura/allura/public/nf/js/sylvester.js
Allura/allura/tests/data/genshi_hello_tmpl
Allura/allura/tests/data/test_mime/text_file.txt
-Allura/run/dummy.txt
AlluraTest/jslint/
CHANGES
+Allura/run/dummy.txt
ForgeGit/forgegit/data/post-receive_tmpl
ForgeSVN/forgesvn/tests/data/
ForgeImporters/forgeimporters/tests/data/google/empty-issue.html
ForgeImporters/forgeimporters/tests/data/google/test-issue.html
-solr_config/core0/conf/spellings.txt
-solr_config/core1/conf/spellings.txt
-solr_config/solr.xml
[11/50] git commit: [#6392] ticket:444 Fix tests
Posted by jo...@apache.org.
[#6392] ticket:444 Fix tests
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/4957e128
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/4957e128
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/4957e128
Branch: refs/heads/cj/6422
Commit: 4957e128b63cacacabbf6e06f3ee2a84bdc6d51f
Parents: 70e1a8d
Author: Igor Bondarenko <je...@gmail.com>
Authored: Tue Sep 24 14:31:49 2013 +0300
Committer: Tim Van Steenburgh <tv...@gmail.com>
Committed: Tue Sep 24 17:36:25 2013 +0000
----------------------------------------------------------------------
Allura/allura/tests/functional/test_admin.py | 29 +++++++++++++----------
1 file changed, 16 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/4957e128/Allura/allura/tests/functional/test_admin.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/functional/test_admin.py b/Allura/allura/tests/functional/test_admin.py
index 38a7272..66cffba 100644
--- a/Allura/allura/tests/functional/test_admin.py
+++ b/Allura/allura/tests/functional/test_admin.py
@@ -168,42 +168,46 @@ class TestProjectAdmin(TestController):
@td.with_wiki
def test_block_user_empty_data(self):
- # shouldn't fail
- self.app.post('/admin/wiki/block_user', params={'username': '', 'perm': '', 'reason': ''})
+ r = self.app.post('/admin/wiki/block_user', params={'username': '', 'perm': '', 'reason': ''})
+ assert_equals(r.json, dict(error='Enter username'))
@td.with_wiki
def test_unblock_user_empty_data(self):
- # shouldn't fail
- self.app.post('/admin/wiki/unblock_user', params={'user_id': '', 'perm': ''})
+ r = self.app.post('/admin/wiki/unblock_user', params={'user_id': '', 'perm': ''})
+ assert_equals(r.json, dict(error='Select user to unblock'))
@td.with_wiki
def test_block_user(self):
r = self.app.get('/admin/wiki/permissions')
- assert '<a href="#" class="block-user">' in r
- assert '<a href="#" class="block-list">' not in r
+ assert '<input type="checkbox" name="user_id"' not in r
- self.app.post('/admin/wiki/block_user', params={'username': 'test-admin', 'perm': 'read', 'reason': 'Comment'})
+ user = M.User.by_username('test-admin')
+ r = self.app.post('/admin/wiki/block_user', params={'username': 'test-admin', 'perm': 'read', 'reason': 'Comment'})
+ assert_equals(r.json, dict(user_id=str(user._id), username='test-admin', reason='Comment'))
user = M.User.by_username('test-admin')
admin_role = user.project_role()
app = M.Project.query.get(shortname='test').app_instance('wiki')
ace = M.ACL.contains(M.ACE.deny(admin_role._id, 'read'), app.acl)
assert_equals(ace.reason, 'Comment')
r = self.app.get('/admin/wiki/permissions')
- assert '<a href="#" class="block-list">' in r
assert '<input type="checkbox" name="user_id" value="%s">test-admin (Comment)' % user._id in r
@td.with_wiki
def test_unblock_user(self):
- self.app.post('/admin/wiki/block_user', params={'username': 'test-admin', 'perm': 'read'})
+ r = self.app.post('/admin/wiki/block_user', params={'username': 'test-admin', 'perm': 'read'})
user = M.User.by_username('test-admin')
admin_role = user.project_role()
app = M.Project.query.get(shortname='test').app_instance('wiki')
ace = M.ACE.deny(admin_role._id, 'read')
+ r = self.app.get('/admin/wiki/permissions')
+ assert '<input type="checkbox" name="user_id" value="%s">test-admin' % user._id in r
+ app = M.Project.query.get(shortname='test').app_instance('wiki')
assert M.ACL.contains(ace, app.acl) is not None
- self.app.post('/admin/wiki/unblock_user', params={'user_id': str(user._id), 'perm': 'read'})
+ r = self.app.post('/admin/wiki/unblock_user', params={'user_id': str(user._id), 'perm': 'read'})
+ assert_equals(r.json, dict(unblocked=[str(user._id)]))
assert M.ACL.contains(ace, app.acl) is None
r = self.app.get('/admin/wiki/permissions')
- assert '<a href="#" class="block-list">' not in r
+ assert '<input type="checkbox" name="user_id"' not in r
@td.with_wiki
def test_block_unblock_multiple_users(self):
@@ -219,7 +223,6 @@ class TestProjectAdmin(TestController):
assert M.ACL.contains(deny_admin, app.acl) is not None
assert M.ACL.contains(deny_user, app.acl) is not None
r = self.app.get('/admin/wiki/permissions')
- assert '<a href="#" class="block-list">' in r
assert '<input type="checkbox" name="user_id" value="%s">test-admin (Spammer)' % admin._id in r
assert '<input type="checkbox" name="user_id" value="%s">test-user' % user._id in r
@@ -229,7 +232,7 @@ class TestProjectAdmin(TestController):
assert M.ACL.contains(deny_admin, app.acl) is None
assert M.ACL.contains(deny_user, app.acl) is None
r = self.app.get('/admin/wiki/permissions')
- assert '<a href="#" class="block-list">' not in r
+ assert '<input type="checkbox" name="user_id"' not in r
@td.with_wiki
def test_blocked_users_remains_after_saving_all_permissions(self):
[05/50] git commit: [#6392] ticket:432 Move widgets from