Project

General

Profile

Patch #25495 ยป 0001-spelling-fixes.patch

patch containing spelling fixes. - ka seven, 2017-04-01 19:08

View differences:

app/controllers/account_controller.rb
42 42
      authenticate_user
43 43
    end
44 44
  rescue AuthSourceException => e
45
    logger.error "An error occured when authenticating #{params[:username]}: #{e.message}"
45
    logger.error "An error occurred when authenticating #{params[:username]}: #{e.message}"
46 46
    render_error :message => e.message
47 47
  end
48 48

  
app/controllers/application_controller.rb
646 646
    render_error "An error occurred while executing the query and has been logged. Please report this error to your Redmine administrator."
647 647
  end
648 648

  
649
  # Renders a 200 response for successfull updates or deletions via the API
649
  # Renders a 200 response for successful updates or deletions via the API
650 650
  def render_api_ok
651 651
    render_api_head :ok
652 652
  end
app/controllers/comments_controller.rb
43 43
  private
44 44

  
45 45
  # ApplicationController's find_model_object sets it based on the controller
46
  # name so it needs to be overriden and set to @news instead
46
  # name so it needs to be overridden and set to @news instead
47 47
  def find_model_object
48 48
    super
49 49
    @news = @object
app/models/enumeration.rb
136 136
  end
137 137

  
138 138
  # Overrides Redmine::Acts::Positioned#set_default_position so that enumeration overrides
139
  # get the same position as the overriden enumeration
139
  # get the same position as the overridden enumeration
140 140
  def set_default_position
141 141
    if position.nil? && parent
142 142
      self.position = parent.position
......
145 145
  end
146 146

  
147 147
  # Overrides Redmine::Acts::Positioned#update_position so that overrides get the same
148
  # position as the overriden enumeration
148
  # position as the overridden enumeration
149 149
  def update_position
150 150
    super
151 151
    if position_changed?
......
159 159
  end
160 160

  
161 161
  # Overrides Redmine::Acts::Positioned#remove_position so that enumeration overrides
162
  # get the same position as the overriden enumeration
162
  # get the same position as the overridden enumeration
163 163
  def remove_position
164 164
    if parent_id.blank?
165 165
      super
app/models/member.rb
194 194
    members
195 195
  end
196 196

  
197
  # Finds or initilizes a Member for the given project and principal
197
  # Finds or initializes a Member for the given project and principal
198 198
  def self.find_or_new(project, principal)
199 199
    project_id = project.is_a?(Project) ? project.id : project
200 200
    principal_id = principal.is_a?(Principal) ? principal.id : principal
app/models/repository/cvs.rb
151 151
          # create a new changeset....
152 152
          unless cs
153 153
            # we use a temporary revision number here (just for inserting)
154
            # later on, we calculate a continous positive number
154
            # later on, we calculate a continuous positive number
155 155
            tmp_time2 = tmp_time.clone.gmtime
156 156
            branch    = revision.paths[0][:branch]
157 157
            scmid     = branch + "-" + tmp_time2.strftime("%Y%m%d-%H%M%S")
......
163 163
                                  :comments     => revision.message)
164 164
            tmp_rev_num += 1
165 165
          end
166
          # convert CVS-File-States to internal Action-abbrevations
166
          # convert CVS-File-States to internal Action-abbreviations
167 167
          # default action is (M)odified
168 168
          action = "M"
169 169
          if revision.paths[0][:action] == "Exp" && revision.paths[0][:revision] == "1.1"
config/application.rb
47 47
    # Do not include all helpers
48 48
    config.action_controller.include_all_helpers = false
49 49

  
50
    # Do not supress errors in after_rollback and after_commit callbacks
50
    # Do not suppress errors in after_rollback and after_commit callbacks
51 51
    config.active_record.raise_in_transactional_callbacks = true
52 52

  
53 53
    # XML parameter parser removed from core in Rails 4.0
doc/CHANGELOG
60 60
* Patch #23764: closed_on field of copied issue is always set to source issue's value
61 61
* Patch #23269: Fix for Error: Unable to autoload constant Redmine::Version when accessing the time report in first request
62 62
* Patch #23278: When creating issues by receiving an email, watchers created via CC in the mail don't get an email notification
63
* Patch #23389: Print Styles get overriden by responsive media query
63
* Patch #23389: Print Styles get overridden by responsive media query
64 64
* Patch #23708: Too long words in subtasks break layout
65 65
* Patch #23883: iOS 10 ignore disabled Zoom
66 66
* Patch #23134: Updated Korean locale
......
82 82
* Defect #12893: Copying an issue does not copy parent task id
83 83
* Defect #13654: Can't set parent issue when issue relations among child issues are present
84 84
* Defect #15777: Watched issues count on "My page" is shown for all issues instead of only open ones
85
* Defect #17580: After copying a task, setting the parent as the orignal task's parent triggers an error
85
* Defect #17580: After copying a task, setting the parent as the original task's parent triggers an error
86 86
* Defect #19924: Adding subtask takes very long
87 87
* Defect #20882: % done: progress bar blocked at 80 in the issue list
88 88
* Defect #21037: Issue show : bullet points not aligned if sub-task is in a different project
......
238 238
* Defect #21775: Field "Done" from issue subtasks table overlaps the layout in responsive mode, width 400
239 239
* Defect #22108: Issues filter for CSV Export are not applied
240 240
* Defect #22178: Grouping issues by key/value custom field raises error 500
241
* Feature #21447: Option to show email adresses by default
242
* Patch #21650: Simplified Chinese translation of wiki formating for 2.6-stable
241
* Feature #21447: Option to show email addresses by default
242
* Patch #21650: Simplified Chinese translation of wiki formatting for 2.6-stable
243 243
* Patch #21881: Russian wiki translation for 2.6-stable
244 244
* Patch #21898: Catalan wiki translation for 2.6-stable
245
* Patch #21456: Simplified Chinese translation of wiki formating for 3.1-stable
245
* Patch #21456: Simplified Chinese translation of wiki formatting for 3.1-stable
246 246
* Patch #21686: Russian translation for 3.1-stable
247 247
* Patch #21687: German translations for 3.1-stable
248 248
* Patch #21689: Turkish translation for 3.1-stable
......
385 385
* Patch #20785: Polish translation update for 3.1-stable
386 386
* Patch #20837: Bulgarian translation
387 387
* Patch #20892: Spanish translation for r14637
388
* Patch #20906: Fix mulitple tab navigation highlighting and content hiding
388
* Patch #20906: Fix multiple tab navigation highlighting and content hiding
389 389
* Patch #21019: Traditional Chinese translation (to r14689)
390 390
* Patch #21076: Move inline CSS to application.css for private checkbox
391 391
* Patch #21085: Optimize issue edit description link
......
511 511
* Defect #19405: Setting config.logger.level in additional_environment.rb has no effect
512 512
* Defect #19464: Possible to log time on project without time tracking
513 513
* Defect #19482: Custom field (long text format) displayed even if empty
514
* Defect #19537: Broken HTML sanitizer refence breaks email receiving
514
* Defect #19537: Broken HTML sanitizer reference breaks email receiving
515 515
* Defect #19544: Malformed SQL query with SQLServer when grouping issues
516 516
* Defect #19553: When create by copying the issue, status can not be changed to default
517 517
* Defect #19558: Mail handler should not ignore emails with x-auto-response-suppress header
......
545 545
== 2015-02-19 v3.0.0
546 546

  
547 547
* Defect #2573: Latest projects list: no space after lists in project description
548
* Defect #6579: Tree hierachy being currupted on multiple submissions of an issue
549
* Defect #14151: Grammer problem with German x_days
548
* Defect #6579: Tree hierarchy being currupted on multiple submissions of an issue
549
* Defect #14151: Grammar problem with German x_days
550 550
* Defect #15789: Users can see all groups when adding a filter "Assignee's Group"
551 551
* Defect #15988: Unexpected behaviour on issue fields for users that have multiple roles
552 552
* Defect #18237: From a rake task context, impossible to create an IssueRelation normally
......
850 850
* Defect #13544: Commit reference: autogenerated issue note has wrong commit link syntax in multi-repo or cross-project context
851 851
* Defect #15664: Unable to upload attachments without add_issues, edit_issues or add_issue_notes permission
852 852
* Defect #15756: 500 on admin info/settings page on development environment
853
* Defect #15781: Customfields have a noticable impact on search performance due to slow database COUNT
853
* Defect #15781: Customfields have a noticeable impact on search performance due to slow database COUNT
854 854
* Defect #15849: Redmine:Fetch_Changesets Single-inheritance issue in subclass "Repository:Git"
855 855
* Defect #15870: Parent task completion is 104% after update of subtasks
856 856
* Defect #16032: Repository.fetch_changesets > app/models/repository/git.rb:137:in `[]=': string not matched (IndexError)
......
1282 1282
* Feature #12299: Redmine version requirement improvements (in plugins)
1283 1283
* Feature #12393: Upgrade to Rails 3.2.9
1284 1284
* Feature #12475: Lazy loading of translation files for faster startup
1285
* Patch #11846: Fill username when authentification failed
1285
* Patch #11846: Fill username when authentication failed
1286 1286
* Patch #11862: Add "last 2 weeks" preset to time entries reporting
1287 1287
* Patch #11992: Japanese translation about issue relations improved
1288 1288
* Patch #12027: Incorrect Spanish "September" month name
......
1378 1378
* Defect #11503: Accessing /projects/:project/wiki/something.png fails with error 500
1379 1379
* Defect #11506: Versions that are not shared should not be assignable when selecting another project
1380 1380
* Defect #11508: Projects not ordered alphabetically after renaming project
1381
* Defect #11540: Roadmap anchor links can be ambigous
1381
* Defect #11540: Roadmap anchor links can be ambiguous
1382 1382
* Defect #11545: Overwriting existing method Issue.open
1383 1383
* Defect #11552: MailHandler does not match assignee name with spaces
1384 1384
* Defect #11571: Custom fields of type version not proper handled in receiving e-mails
......
1616 1616
* Feature #10350: Bulk copy should allow for changing the target version
1617 1617
* Feature #10607: Ignore out-of-office incoming emails
1618 1618
* Feature #10635: Adding time like "123 Min" is invalid
1619
* Patch #9998: Make attachement "Optional Description" less wide
1619
* Patch #9998: Make attachment "Optional Description" less wide
1620 1620
* Patch #10066: i18n not working with russian gem
1621 1621
* Patch #10128: Disable IE 8 compatibility mode to fix wrong div.autoscroll scroll bar behaviour 
1622 1622
* Patch #10155: Russian translation changed
......
1676 1676

  
1677 1677
* Defect #2109: Context menu is being submitted twice per right click
1678 1678
* Defect #7717: MailHandler user creation for unknown_user impossible due to diverging length-limits of login and email fields
1679
* Defect #7917: Creating users via email fails if user real name containes special chars
1679
* Defect #7917: Creating users via email fails if user real name contains special chars
1680 1680
* Defect #7966: MailHandler does not include JournalDetail for attached files
1681 1681
* Defect #8368: Bad decimal separator in time entry CSV
1682 1682
* Defect #8371: MySQL error when filtering a custom field using the REST api
......
2070 2070
== 2010-12-23 v1.0.5
2071 2071

  
2072 2072
* #6656: Mercurial adapter loses seconds of commit times
2073
* #6996: Migration trac(sqlite3) -> redmine(postgresql) doesnt escape ' char
2073
* #6996: Migration trac(sqlite3) -> redmine(postgresql) doesn't escape ' char
2074 2074
* #7013: v-1.0.4 trunk - see {{count}} in page display rather than value
2075 2075
* #7016: redundant 'field_start_date' in ja.yml
2076 2076
* #7018: 'undefined method `reschedule_after' for nil:NilClass' on new issues
......
2232 2232
* #6153: Move view_calendar and view_gantt to own modules
2233 2233
* #6169: Add issue status to issue tooltip
2234 2234
* Fixed #3834: Add a warning when not choosing a member role
2235
* Fixed #3922: Bad english arround "Assigned to" text in journal entries
2235
* Fixed #3922: Bad english around "Assigned to" text in journal entries
2236 2236
* Fixed #5158: Simplified Chinese language file zh.yml updated to r3608
2237 2237
* Fixed #5162: translation missing: zh-TW, field_time_entrie
2238 2238
* Fixed #5297: openid not validated correctly
......
2240 2240
* Fixed #5760: Assigned_to and author filters in "Projects>View all issues" should be based on user's project visibility
2241 2241
* Fixed #5771: Problem when importing git repository
2242 2242
* Fixed #5775: ldap authentication in admin menu should have an icon
2243
* Fixed #5811: deleting statuses doesnt delete workflow entries
2243
* Fixed #5811: deleting statuses doesn't delete workflow entries
2244 2244
* Fixed #5834: Emails with trailing spaces incorrectly detected as invalid
2245 2245
* Fixed #5846: ChangeChangesPathLengthLimit does not remove default for MySQL
2246 2246
* Fixed #5861: Vertical scrollbar always visible in Wiki "code" blocks in Chrome.
......
2331 2331
* Fixed #5696: Redmine + PostgreSQL 8.4.4 fails on _dir_list_content.rhtml
2332 2332
* Fixed #5698: redmine:email:receive_imap fails silently for mails with subject longer than 255 characters
2333 2333
* Fixed #5700: TimelogController#destroy assumes success
2334
* Fixed #5751: developer role is mispelled
2334
* Fixed #5751: developer role is misspelled
2335 2335
* Fixed #5769: Popup Calendar doesn't Advance in Chrome
2336 2336
* Fixed #5771: Problem when importing git repository
2337 2337
* Fixed #5823: Error in comments in plugin.rb
......
2844 2844
* Fixed: Git Adapter date parsing ignores timezone
2845 2845
* Fixed: Printing long roadmap doesn't split across pages
2846 2846
* Fixes custom fields display order at several places
2847
* Fixed: urls containing @ are parsed as email adress by the wiki formatter
2847
* Fixed: urls containing @ are parsed as email address by the wiki formatter
2848 2848
* Fixed date filters accuracy with SQLite
2849 2849
* Fixed: tokens not escaped in highlight_tokens regexp
2850 2850
* Fixed Bazaar shared repository browsing
......
2883 2883
* Remove edit step from Status context menu
2884 2884
* Fixed: No way to do textile horizontal rule
2885 2885
* Fixed: Repository: View differences doesn't work
2886
* Fixed: attachement's name maybe invalid.
2886
* Fixed: attachment's name maybe invalid.
2887 2887
* Fixed: Error when creating a new issue
2888 2888
* Fixed: NoMethodError on @available_filters.has_key?
2889 2889
* Fixed: Check All / Uncheck All in Email Settings
......
3069 3069
* Fixed: Textile image with style attribute cause internal server error
3070 3070
* Fixed: wiki TOC not rendered properly when used in an issue or document description
3071 3071
* Fixed: 'has already been taken' error message on username and email fields if left empty
3072
* Fixed: non-ascii attachement filename with IE
3072
* Fixed: non-ascii attachment filename with IE
3073 3073
* Fixed: wrong url for wiki syntax pop-up when Redmine urls are prefixed
3074 3074
* Fixed: search for all words doesn't work
3075 3075
* Fixed: Do not show sticky and locked checkboxes when replying to a message
......
3371 3371
* settings are now stored in the database and editable through the application in: Admin -> Settings (config_custom.rb is no longer used)
3372 3372
* added project roadmap view
3373 3373
* mail notifications added when a document, a file or an attachment is added
3374
* tooltips added on Gantt chart and calender to view the details of the issues
3374
* tooltips added on Gantt chart and calendar to view the details of the issues
3375 3375
* ability to set the sort order for roles, trackers, issue statuses
3376 3376
* added missing fields to csv export: priority, start date, due date, done ratio
3377 3377
* added total number of issues per tracker on project overview
......
3403 3403
* simple SVN browser added (just needs svn binaries in PATH)
3404 3404
* comments can now be added on news
3405 3405
* "my page" is now customizable 
3406
* more powerfull and savable filters for issues lists
3406
* more powerful and saveable filters for issues lists
3407 3407
* improved issues change history
3408 3408
* new functionality: move an issue to another project or tracker
3409 3409
* new functionality: add a note to an issue
......
3415 3415
* issues reports improvements
3416 3416
* multiple file upload for issues, documents and files
3417 3417
* option to set maximum size of uploaded files
3418
* textile formating of issue and news descritions (RedCloth required)
3418
* textile formatting of issue and news descritions (RedCloth required)
3419 3419
* integration of DotClear jstoolbar for textile formatting
3420 3420
* calendar date picker for date fields (LGPL DHTML Calendar http://sourceforge.net/projects/jscalendar)
3421 3421
* new filter in issues list: Author
extra/mail_handler/rdm-mailhandler.rb
117 117

  
118 118
Examples:
119 119
  No project specified, emails MUST contain the 'Project' keyword, otherwise
120
  they will be dropped (not recommanded):
120
  they will be dropped (not recommended):
121 121

  
122 122
    rdm-mailhandler.rb --url http://redmine.domain.foo --key secret
123 123

  
......
165 165
    begin
166 166
      response = Net::HTTPS.post_form(URI.parse(uri), data, headers, :no_check_certificate => no_check_certificate, :certificate_bundle => certificate_bundle)
167 167
    rescue SystemCallError, IOError => e # connection refused, etc.
168
      warn "An error occured while contacting your Redmine server: #{e.message}"
168
      warn "An error occurred while contacting your Redmine server: #{e.message}"
169 169
      return 75 # temporary failure
170 170
    end
171 171
    debug "Response received: #{response.code}"
extra/svn/Redmine.pm
58 58
     RedmineDbUser "redmine"
59 59
     RedmineDbPass "password"
60 60
     ## Optional where clause (fulltext search would be slow and
61
     ## database dependant).
61
     ## database dependent).
62 62
     # RedmineDbWhereClause "and members.role_id IN (1,2)"
63 63
     ## Optional credentials cache size
64 64
     # RedmineCacheCredsMax 50
lib/SVG/Graph/Graph.rb
234 234
      #   scales to fix the space.
235 235
      attr_accessor :width
236 236
      #   Set the path to an external stylesheet, set to '' if
237
      #   you want to revert back to using the defaut internal version.
237
      #   you want to revert back to using the default internal version.
238 238
      #
239 239
      #   To create an external stylesheet create a graph using the
240 240
      #   default internal version and copy the stylesheet section to
lib/SVG/Graph/Schedule.rb
51 51
    # 
52 52
    # = Notes
53 53
    # 
54
    # The default stylesheet handles upto 10 data sets, if you
54
    # The default stylesheet handles up to 10 data sets, if you
55 55
    # use more you must create your own stylesheet and add the
56 56
    # additional settings for the extra data sets. You will know
57 57
    # if you go over 10 data sets as they will have no style and
......
138 138
      # Note that the data must be in time,value pairs, and that the date format
139 139
      # may be any date that is parseable by ParseDate.
140 140
      # Also note that, in this example, we're mixing scales; the data from d1
141
      # will probably not be discernable if both data sets are plotted on the same
141
      # will probably not be discernible if both data sets are plotted on the same
142 142
      # graph, since d1 is too granular.
143 143
      def add_data data
144 144
        @data = [] unless @data
lib/plugins/acts_as_activity_provider/lib/acts_as_activity_provider.rb
48 48
        end
49 49

  
50 50
        module ClassMethods
51
          # Returns events of type event_type visible by user that occured between from and to
51
          # Returns events of type event_type visible by user that occurred between from and to
52 52
          def find_events(event_type, user, from, to, options)
53 53
            provider_options = activity_provider_options[event_type]
54 54
            raise "#{self.name} can not provide #{event_type} events." if provider_options.nil?
lib/plugins/acts_as_versioned/CHANGELOG
21 21

  
22 22
*0.3.1*
23 23

  
24
* (7 Jan 2006) explicitly set :foreign_key option for the versioned model's belongs_to assocation for STI [Caged]
24
* (7 Jan 2006) explicitly set :foreign_key option for the versioned model's belongs_to association for STI [Caged]
25 25
* (7 Jan 2006) added tests to prove has_many :through joins work
26 26

  
27 27
*0.3*
lib/redmine/sudo_mode.rb
183 183
    #
184 184
    # Calling this method also turns was_used? to true, therefore
185 185
    # it is important to only call this when sudo is actually needed, as the last
186
    # condition to determine wether a change can be done or not.
186
    # condition to determine whether a change can be done or not.
187 187
    #
188 188
    # If you do it wrong, timeout of the sudo mode will happen too late or not at
189 189
    # all.
lib/tasks/locales.rake
111 111
    files.each do |path|
112 112
      # Skip certain locales
113 113
      (puts "Skipping #{path}"; next) if File.basename(path, ".yml") =~ skips
114
      # TODO: Check for dupliate/existing keys
114
      # TODO: Check for duplicate/existing keys
115 115
      puts "Adding #{key_list} to #{path}"
116 116
      File.open(path, 'a') do |file|
117 117
        adds.each do |kv|
test/unit/lib/redmine/helpers/gantt_test.rb
59 59
    assert_equal 2, @gantt.number_of_rows
60 60
  end
61 61

  
62
  test "#number_of_rows with no project should return the total number of rows for all the projects, resursively" do
62
  test "#number_of_rows with no project should return the total number of rows for all the projects, recursively" do
63 63
    p1, p2 = Project.generate!, Project.generate!
64 64
    create_gantt(nil)
65 65
    # fix the return value of #number_of_rows_on_project() to an arbitrary value
test/unit/user_test.rb
1099 1099
  test "#allowed_to? for normal users" do
1100 1100
    project = Project.find(1)
1101 1101
    assert_equal true, @jsmith.allowed_to?(:delete_messages, project)    #Manager
1102
    assert_equal false, @dlopper.allowed_to?(:delete_messages, project) #Developper
1102
    assert_equal false, @dlopper.allowed_to?(:delete_messages, project) #Developer
1103 1103
  end
1104 1104

  
1105 1105
  test "#allowed_to? with empty array should return false" do
......
1114 1114
  end
1115 1115

  
1116 1116
  test "#allowed_to? with with options[:global] should return true if user has one role with the permission" do
1117
    @dlopper2 = User.find(5) #only Developper on a project, not Manager anywhere
1117
    @dlopper2 = User.find(5) #only Developer on a project, not Manager anywhere
1118 1118
    @anonymous = User.find(6)
1119 1119
    assert_equal true, @jsmith.allowed_to?(:delete_issue_watchers, nil, :global => true)
1120 1120
    assert_equal false, @dlopper2.allowed_to?(:delete_issue_watchers, nil, :global => true)
......
1125 1125

  
1126 1126
  # this is just a proxy method, the test only calls it to ensure it doesn't break trivially
1127 1127
  test "#allowed_to_globally?" do
1128
    @dlopper2 = User.find(5) #only Developper on a project, not Manager anywhere
1128
    @dlopper2 = User.find(5) #only Developer on a project, not Manager anywhere
1129 1129
    @anonymous = User.find(6)
1130 1130
    assert_equal true, @jsmith.allowed_to_globally?(:delete_issue_watchers)
1131 1131
    assert_equal false, @dlopper2.allowed_to_globally?(:delete_issue_watchers)
    (1-1/1)