Commit Graph

1457 Commits

Author SHA1 Message Date
Holger Just c04ff93f8f [#112] Properly stub SQLite3 for version tests 2011-05-20 23:34:18 +02:00
Eric Davis 078df72345 [#400] Refactor old assert_tag to assert_select 2011-05-20 14:23:54 -07:00
Eric Davis a4f7629f1f [#400] Fix some tests broken by 6656103 2011-05-20 14:22:55 -07:00
Eric Davis c778cc9208 [#415] Fix functional tests that used the older interface 2011-05-20 13:51:21 -07:00
Felix Schäfer 6015913f34 Change test to use the new journalized interface. #415 2011-05-20 22:16:26 +02:00
Gregor Schmidt 08cad02541 Removing commments from wiki_contents fixtures, since the db column was removed as well 2011-05-20 21:33:50 +02:00
Felix Schäfer d7b963e6a6 Load the SQLite3 lib for the test to work. #112 2011-05-20 16:10:01 +02:00
Gregor Schmidt ae76abd140 [#416] updating watcher controller tests to new functionality
unfortunately assert_select_rjs is not too clever - therefor we need to fall back to string matching for the more complex cases
2011-05-17 20:03:03 +02:00
Gregor Schmidt 2c2ed95866 [#416] Re-Adding watcher_tag for backwards compatibility
adding deprecation warning
2011-05-17 20:03:02 +02:00
Holger Just 7b3a2047fd Whitespace fixes 2011-05-16 00:03:51 +02:00
Holger Just 705c0db000 [#112] Fix failing raw version for postgres 2011-05-16 00:01:09 +02:00
Holger Just 8279144073 [#112] Add ChiliProject::Database
This module can be used to gather information about the currently used
database.
2011-05-15 23:14:02 +02:00
Gregor Schmidt 300bc07b5a [#413] using Hash#to_a.first since Hash#first is not present in 1.8.6 2011-05-14 00:09:56 +02:00
Eric Davis 0ed2af49e9 [#408] Removed old JournalDetail test 2011-05-13 12:51:44 -07:00
Eric Davis f79e209d4c [#123] Fix hardcoded test value with a dynamic one 2011-05-13 11:53:25 -07:00
Eric Davis 0ba4134ecc [#123] Fix Journal notification test 2011-05-13 11:33:51 -07:00
Eric Davis aa2b0a8709 [#123 #407] Deferred Journal#visible tests 2011-05-13 11:26:06 -07:00
Eric Davis 216619d376 Merge branch 'unstable' into ticket/unstable/123-journalized
Conflicts:
	test/unit/journal_test.rb
	vendor/plugins/acts_as_journalized/lib/redmine/acts/journalized/permissions.rb
2011-05-13 10:35:23 -07:00
Eric Davis 68925684fe Remove generic Rails performance test 2011-05-13 09:16:46 -07:00
Eric Davis 13de4cc4b0 [#383] Fixed failing tests due to a helper method name conflict (to_utf8)
Introduced in 1eee7312f6
2011-05-06 16:38:13 -07:00
Eric Davis d29315341d [#196 #216 #216] Complete the upgrade to Rails 2.3.11 2011-05-06 15:44:38 -07:00
Eric Davis cd73bd714f [#123] Fix test error due to un-reloaded object daddy objects 2011-05-06 14:48:11 -07:00
Eric Davis cc0c2165b5 [#123] Fix test on postgres, .first isn't based on ORDER 2011-05-06 14:48:11 -07:00
Eric Davis 65953cdc04 [#123] Fix AttachmentsController test from 1f88288 2011-05-06 14:48:11 -07:00
Gregor Schmidt 8509212991 [#373] Adding test and fix for duplicates in issue autocompleter 2011-05-04 19:01:15 +02:00
Gregor Schmidt 0b7b564a34 adding basic test, to make sure, nothing breaks 2011-05-02 15:24:11 +02:00
Gregor Schmidt 8fb5e8b211 Introducing help controller, moving wiki syntax documentation to help controller 2011-05-02 12:45:19 +02:00
Eric Davis bdc7325a82 Merge branch 'master' into unstable
Conflicts:
	doc/CHANGELOG.rdoc
2011-05-01 13:58:02 -07:00
Eric Davis 614bad89a5 Merge branch 'ticket/unstable/310-skip-issue-mail-notifications' into unstable
Conflicts:
	config/locales/en.yml
	test/unit/journal_test.rb
2011-04-29 08:46:13 -07:00
Eric Davis 72cd7f2049 [#347] Add missing fixture when running a focused test 2011-04-28 14:22:29 -07:00
Felix Schäfer b1ed5e4c7d Merge acts_as_journalized to unstable. #123 2011-04-23 21:25:52 +02:00
Felix Schäfer 61f0e67c0d Upgrade tests to new journals type. 2011-04-21 11:46:00 +02:00
Felix Schäfer ef8141a2c1 Remove deprecated journals tests and controller. 2011-04-21 11:45:31 +02:00
Eric Davis ed252f7246 [#309] Set the back_url after sending a lost password so HTTP_REFERER isn't used
Contributed by Robert Chady
2011-04-20 16:24:54 -07:00
Felix Schäfer 43ee27715a JournalDetails don't exist anymore. 2011-04-21 00:01:26 +02:00
Felix Schäfer ff431e8ed4 Force changeset journal creation. 2011-04-20 23:49:21 +02:00
Jean-Philippe Lang 42653cef32 Shorten query[column_names] param name.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5304 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:15:54 -07:00
Jean-Philippe Lang 789ccec246 Changed timelogs filters to use non-AJAX requests (#1965).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5297 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:13:20 -07:00
Jean-Philippe Lang cfbe69ab59 Fixed: deleting a parent issue may lead to a stale object error (#7920).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5285 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:13:18 -07:00
Jean-Philippe Lang 61d4a623a8 Fixed: list of users for adding to a group may be empty if 100 first users have been added (#8029).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5284 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:13:18 -07:00
Jean-Philippe Lang bb4a10fc85 Fixed: bulk destroying parent and child issues raises a stale object error (#7920).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5283 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:13:18 -07:00
Jean-Philippe Lang 62a4170531 Shortens filter param names.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5279 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:53 -07:00
Jean-Philippe Lang 8fae4e2ee5 Fixes #possible_values_options when given an object with nil project.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5273 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:53 -07:00
Jean-Philippe Lang d8fbdca760 Adds User and Version custom field format that can be used to reference a project member or version in custom fields (#2096).
These new field formats are available for project, issue, version and time entry custom fields.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5272 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:53 -07:00
Toshi MARUYAMA 0bf7a60480 Fix test/integration/api_test/users_test.rb fails due to changing en.yml (#8035, #7855).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5270 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:53 -07:00
Toshi MARUYAMA 52be4a13b0 Fix annotate functional roles_controller_test.rb due fails to changing en.yml (#8035, #7855).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5269 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:53 -07:00
Toshi MARUYAMA 6ac1b6d4ef scm: git: fix annotate test due to changing en.yml (#8035, #7855).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5268 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:52 -07:00
Jean-Philippe Lang 5f3d184880 Modules selection lost on project form after validation failure (#8012).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5265 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:52 -07:00
Jean-Philippe Lang e06b581595 Adds support for preview when editing an issue note (#5520).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5246 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:50 -07:00
Jean-Philippe Lang d16db34454 Moves jstoolbar script include tags to head.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5238 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:48 -07:00
Jean-Philippe Lang b944276e30 Fixes progress calculation on gantt (#7838).
Contributed by Etienne Massip.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5236 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:48 -07:00
Jean-Philippe Lang 7d59698021 Fixes wrong test.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5231 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:48 -07:00
Jean-Philippe Lang dafbb8b283 Fixed links in new file notification broken by r4051 (#6590).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5230 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:47 -07:00
Jean-Philippe Lang 4bcba6a094 Adds support for saturday as the first week day (#7097).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5228 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:47 -07:00
Jean-Philippe Lang f3ffbec7ae Restore settings even if a test failure occurs.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5227 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:47 -07:00
Jean-Philippe Lang c0d55c936b Moved calendar tests to unit/lib/redmine/helpers.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5226 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:47 -07:00
Jean-Philippe Lang e7a3085eba Allow bulk editing of parent issue (#5831).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5224 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:47 -07:00
Jean-Philippe Lang ff5203d2c6 Fixed: unknown custom field format causes error when editing/bulk editing (#7985).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5214 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:45 -07:00
Toshi MARUYAMA 87c1d4780b scm: filesystem: increase non ascii contents ratio of test repository (#6256).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5211 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:45 -07:00
Toshi MARUYAMA be2046b189 scm: set mime type in downloading file.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5210 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:45 -07:00
Toshi MARUYAMA 3ee44b363c scm: filesystem: add test for no extension file mime type in functional test.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5209 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:45 -07:00
Toshi MARUYAMA fd400df10e scm: filesystem: fix todo comment of MIME_TYPES of big-file.txt in functional test.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5208 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:45 -07:00
Toshi MARUYAMA 05825c38a2 scm: filesystem: add test for displaying file over max size limit (#6256).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5207 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:45 -07:00
Toshi MARUYAMA 314bb3fb6e scm: filesystem: add test for UTF-16 file displaying (#6256).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5206 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:45 -07:00
Toshi MARUYAMA af85236fe7 scm: filesystem: add test for non ascii text file displaying (#6256).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5205 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:45 -07:00
Toshi MARUYAMA 80b7a1e432 scm: filesystem: update test repository for non ascii text files displaying (#6256).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5203 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:44 -07:00
Toshi MARUYAMA 071fc2c89a scm: mercurial: add test of binary file should be force download in functional test (#6256).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5202 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:44 -07:00
Toshi MARUYAMA 9250fa0515 scm: mercurial: use constant for project id in functional test.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5201 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:44 -07:00
Toshi MARUYAMA 317aca7c4c scm: mercurial: remove duplicate test from functional test.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5200 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:44 -07:00
Toshi MARUYAMA cae18fa551 scm: darcs: remove duplicate test from functional test.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5199 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:44 -07:00
Toshi MARUYAMA 5a10fb4f31 scm: filesystem: add test of no extension file whose content is only ASCII can be showing (#6256).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5198 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:44 -07:00
Toshi MARUYAMA 2b3251db53 scm: git: remove duplicate test from functional test.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5197 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:44 -07:00
Toshi MARUYAMA 71ea12fcfc scm: filesystem: add functional test.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5196 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:44 -07:00
Toshi MARUYAMA 622ddd5c99 scm: code clean up test/functional/repositories_controller_test.rb.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5194 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:43 -07:00
Toshi MARUYAMA 862e4e716d scm: filesystem: change project id of unit model test from 1 to 3.
Project id 1 has Subversion fixtures.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5193 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:43 -07:00
Toshi MARUYAMA 476106ac0f scm: filesystem: code clean up unit model test.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5192 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:43 -07:00
Toshi MARUYAMA b06f24e932 scm: filesystem: code clean up unit adapter test.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5191 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:43 -07:00
Toshi MARUYAMA b181e65e3d scm: cvs: check assign changesets in root directory showing of functional test.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5189 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:43 -07:00
Toshi MARUYAMA f035de5018 scm: cvs: remove duplicate test in functional test.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5188 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:43 -07:00
Jean-Philippe Lang affedafa1f Fixed: atom links on wiki index broken by r4266.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5186 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:42 -07:00
Jean-Philippe Lang e0f37601f3 Fixed: Simultaneous wiki updates cause internal error (#7939).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5185 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:42 -07:00
Toshi MARUYAMA e7f94c201e Fix typo in test/test_helper.rb.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5182 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:42 -07:00
Jean-Philippe Lang 544b4bddbb Adds an option to view issues count by status on the version page (#7921).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5179 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:42 -07:00
Jean-Philippe Lang 1d93b0e9f6 Fixed: news comments not deleted when deleting a project (#7904).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5176 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:41 -07:00
Jean-Philippe Lang 07e2c652d5 Fixes subversion tests not running on win32.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5175 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:41 -07:00
Jean-Philippe Lang 94d3595e31 Fixed: children projects are deleted instead of being destroyed when destroying parent project (#7904).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5171 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 15:44:44 -07:00
Toshi MARUYAMA 348b990b92 scm: add unit test of invalid utf8 sequences should be stripped in repository_helper to_utf8().
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5166 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 15:44:07 -07:00
Toshi MARUYAMA 9888b93fdd scm: to_utf8() in repositories_helper always returns UTF-8 in Ruby 1.9.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5165 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 15:44:07 -07:00
Toshi MARUYAMA 2de5ef5aa2 scm: git: strict Ruby 1.9 string test in unit adapter test.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5164 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 15:43:07 -07:00
Toshi MARUYAMA 515dcdc5a5 scm: git: strict Ruby 1.9 string test in unit model test.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5163 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 15:43:07 -07:00
Toshi MARUYAMA c840a19659 scm: subversion: code clean up unit model test.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5162 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 15:43:07 -07:00
Toshi MARUYAMA a955663b8d scm: code clean up unit model changeset test.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5161 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 15:43:07 -07:00
Toshi MARUYAMA b1c37ba368 scm: strict Ruby 1.9 string test in unit model test.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5160 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 15:43:07 -07:00
Toshi MARUYAMA 3a5f89cb43 scm: subversion: simplify Ruby 1.9 string test in unit model test.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5159 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 15:43:07 -07:00
Toshi MARUYAMA 24db8296b8 scm: fix repository helper unit test fails in Ruby 1.9 and non UTF-8 locale.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5158 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 15:43:07 -07:00
Jean-Philippe Lang d71f4f2ef5 Do not actually try to fetch changesets from the subversion repository.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5156 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 15:41:32 -07:00
Jean-Philippe Lang f2021227e7 Adds a test for AuthSourcesController#destroy with users.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5155 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 15:41:32 -07:00
Jean-Philippe Lang 57734bdf6c Removes a space before argument parentheses.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5152 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 15:41:32 -07:00
Jean-Philippe Lang 4f8e8df6e0 Adds a Group filter on the admin users list (#7893).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5150 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 15:41:32 -07:00
Toshi MARUYAMA 65333f1a6c scm: bazaar: add changesets order test in unit model test.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5148 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 15:38:58 -07:00