Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2025-11-09 06:46:01 +01:00
Code Issues Packages Projects Releases Activity
12,660 Commits 35 Branches 222 Tags
b37e19e4158ead9990cb15d26ffb38984bd4a2ce
Commit Graph

26 Commits

Author SHA1 Message Date
Toshi MARUYAMA
515315028d Merged r15600 from trunk to 3.3-stable. 
TimeEntryTest#test_spent_on_with_time fails at Japanese daytime.

git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@17111 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-12-11 15:09:24 +00:00
Jean-Philippe Lang
cda9c63d9c Updates copyright for 2016. 
git-svn-id: http://svn.redmine.org/redmine/trunk@15238 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-03-13 10:30:10 +00:00
Jean-Philippe Lang
62bed8b93f Validates that activity belongs to project activities (#19656). 
git-svn-id: http://svn.redmine.org/redmine/trunk@14288 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-05-30 08:46:41 +00:00
Jean-Philippe Lang
6659aad3ef Adds a role setting that viewing all or own time entries (#8929). 
git-svn-id: http://svn.redmine.org/redmine/trunk@14275 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-05-30 07:40:57 +00:00
Jean-Philippe Lang
000124f44f Copyright update. 
git-svn-id: http://svn.redmine.org/redmine/trunk@13872 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-01-11 09:09:50 +00:00
Toshi MARUYAMA
35cc911192 update copyright year (#15977) 
Contributed by Daniel Felix.

git-svn-id: http://svn.redmine.org/redmine/trunk@12736 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-01-29 22:45:39 +00:00
Jean-Philippe Lang
458800c1d5 Time entry with 2 digits year should not validate (#3107). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11472 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-02-24 12:28:44 +00:00
Jean-Philippe Lang
4fa7f62182 Removed unused fixtures. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11321 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-02-03 14:27:19 +00:00
Jean-Philippe Lang
e396a0eebe Copyright for 2013 (#12788). 
Patch by Daniel Felix.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11169 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-01-12 09:29:31 +00:00
Jean-Philippe Lang
ba5a052c8c Copyright update. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9636 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-05-05 12:56:53 +00:00
Jean-Philippe Lang
de0689d4f4 Makes time syntax case insensitive (#10635). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9387 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-04-11 17:37:13 +00:00
Jean-Philippe Lang
a9161a3fde Don't use auth_sources fixtures when not needed. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8915 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-02-19 21:51:03 +00:00
Jean-Philippe Lang
1050993348 Removed unnecessary calculations in time entries index. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8085 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-12-04 23:01:42 +00:00
Toshi MARUYAMA
5778c26434 add unit test to set project if project is nil at unit time entry test 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7452 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-09-22 13:38:21 +00:00
Toshi MARUYAMA
34f2d382b7 add unit test to validate time entry 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7447 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-09-22 12:05:49 +00:00
Toshi MARUYAMA
ab0ef83310 add missing fixtures at unit time entry test in running on empty database 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7446 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-09-22 12:05:10 +00:00
Toshi MARUYAMA
cf733e7db7 remove trailing white-spaces from test/unit/time_entry_test.rb. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6752 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-08-29 21:51:46 +00:00
Jean-Philippe Lang
a81953ef84 Adds a test for TimeEntry#spent_on= with invalid string. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4709 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-01-14 18:45:28 +00:00
Jean-Philippe Lang
88d847a1d5 Fixes TimeEntry#spent_on= so that datetimes don't get stored in SQLite3 (#7258). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4708 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-01-14 18:04:16 +00:00
Jean-Baptiste Barth
17f86d964f Use absolute paths in test/**/* requires for Ruby 1.9.2 compatibility. #4050 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4509 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-12-12 23:24:34 +00:00
Eric Davis
cdfc57d544 Change the TimelogController's to/from dates based on the project time entries 
Instead of looking for the earliest and latest time entry system wide for the
dates in the form, now TimelogController will only look at the time entries
for the current project (and parent/sub projects).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4087 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-09-14 19:02:25 +00:00
Eric Davis
8900797ada Refactor: move method to Model. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4086 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-09-14 19:02:20 +00:00
Jean-Philippe Lang
d63784569f Force TimeEntry#hours default to nil (#3075, #4449). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3232 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2009-12-23 20:05:46 +00:00
Eric Davis
7b0cb6aba8 Upgraded to Rails 2.3.4 (#3597) 
* Ran the Rails upgrade
* Upgraded to Rails Engines 2.3.2
* Added a plugin to let Engines override application views.
* Converted tests to use the new classes:
** ActionController::TestCase for functional
** ActiveSupport::TestCase for units
* Converted ActiveRecord::Error message to a string.
* ActiveRecord grouping returns an ordered hash which doesn't have #sort!
* Updated the I18n storage_units format.
* Added some default initializers from a fresh rails app
* Changed the order of check_box_tags and hidden_field_tags.  The hidden tag
  needs to appear first in Rails 2.3, otherwise it will override any value in
  the check_box_tag.
* Removed the custom handler for when the cookie store is tampered with.
  Rails 2.3 removed the TamperedWithCookie exception and instead Rails will not
  load the data from it when it's been tampered with (e.g. no user login).
* Fixed mail layouts, 2.3 has problems with implicit multipart emails that
  use layouts.  Also removed some custom Redmine mailer code.
* Fixed a bug that occurred in tests where the "required" span tag would be
  added to the :field_status translation.  This resulted in an email string of:

    <li>Status<span class="required"> *</span><span class="required"> *</span>

  Instead of:

    <li>Status: New</li>

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2887 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2009-09-13 17:14:35 +00:00
Jean-Philippe Lang
6768bec456 Fixed: no error is raised when entering invalid hours on the issue update form (#2465). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2251 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2009-01-09 17:32:46 +00:00
Jean-Philippe Lang
4cbe6b626e Accept the following formats for the timelog "hours" field: 1h, 1 h, 1 hour, 2 hours, 30m, 30min, 1h30, 1h30m, 1:30. 
Also accept 1,5 for 1.5 hour (closes #975). Note that 1.5 is still equal to 1h30 and not 1h50 (#947).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1320 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2008-04-02 19:52:12 +00:00