Eric Davis
ee48a8da4f
Merge branch 'ticket/unstable/692-final-design' into unstable
2011-12-10 10:40:09 -08:00
Romano Licker
e371bcad24
[ #692 ] fixes admin-menu
...
new design on ticket view
filter / options / attachments fieldset redesign
2011-12-09 18:06:12 -08:00
Felix Schäfer
1d21cab2e4
Merge branch 'master' into unstable
...
Conflicts:
app/views/projects/index.rhtml
lib/chili_project/compatibility.rb
2011-12-01 17:46:05 +01:00
Felix Schäfer
03d956c360
Merge pull request #90 from meineerde/issues/master/124-delete-registered-users
...
[124] delete registered users
2011-11-25 09:47:12 -08:00
Felix Schäfer
b1671e46f0
Merge pull request #111 from edavis10/ticket/unstable/672-query-subprojects
...
#672 Allow queries to include subproject issues
2011-11-13 12:11:52 -08:00
Holger Just
21a45b4e52
[ #676 ] Enforce UTF-8 encodings on the params hash
...
Contributed by Toshi MARUYAMA
2011-10-30 11:25:56 +01:00
Holger Just
667c4d157f
[ #591 ] Merge branch 'issues/master/591-ruby-19-compatibility' from 'meineerde'
2011-10-29 21:22:35 +02:00
Felix Schäfer
92dd2934ae
Merge pull request #106 from finnlabs/pulls/652/fixes_redirect_containing_umlaute
...
[#652 ] fixes wrong redirect after login
2011-10-29 08:47:02 -07:00
Holger Just
91070236db
Set source encoding to UTF-8
2011-10-29 14:48:03 +02:00
Eric Davis
2b7a221dee
[ #672 ] Allow each Query to control if subprojects are included or not
2011-10-25 18:13:32 -07:00
Eric Davis
a8e997dbf6
Fully qualify column names
2011-10-14 17:09:46 -07:00
Romano Licker
34dc06a85f
[ #652 ] fixes wrong redirect after login
...
when url contains umlaute
2011-10-11 18:16:43 +02:00
Felix Schäfer
aac42afdaa
Add setting to set today as the start date for new issues. #355
...
Patch contributed by Bruno Medeiros on http://www.redmine.org/issues/2277
2011-10-02 22:02:29 +02:00
Holger Just
c57c598204
Fix trailing whitespace
2011-08-27 18:26:12 +02:00
Felix Schäfer
a24a24eb19
Add deferred loading for plugins which's requirements aren't all met yet #256
2011-08-25 18:46:53 +02:00
Holger Just
54b4fdf1aa
[ #124 ] Allow to delete users with STATE_REGISTERED
2011-08-02 02:27:37 +02:00
Holger Just
d7a9adf880
move protect_from_forgery to the beginning of the before_filter chain as per the recommended rails practices
2011-07-29 17:23:13 +02:00
Holger Just
d62a4f1d28
Consider user's timezone for default issue start date
...
Contributed by Jan Schulz-Hofen
2011-07-25 19:16:15 +02:00
Eric Davis
4b3bd797b0
Fix errors when trying to check for binary SCM strings in 1.9.2
...
1.9.2 removed String#is_binary_data?
2011-07-22 14:35:01 -07:00
Eric Davis
477a5f3702
Refactor: replace comment with extracted utility method
2011-07-19 12:14:16 -07:00
Eric Davis
c62e16b6cc
Refactor: replace comment with utility method
2011-07-19 12:14:08 -07:00
Eric Davis
a2eeb4ae20
Refactor: extract setup to before_filter
2011-07-19 12:14:02 -07:00
Eric Davis
9771e20462
Refactor: use the new utility method to load ivars for settings
2011-07-19 12:13:53 -07:00
Eric Davis
1d3d7ff10c
Refactor: extract method to prepare to reuse
2011-07-19 12:13:46 -07:00
Eric Davis
db7bc2bb82
Refactor: extract method with before_filter
2011-07-19 12:13:39 -07:00
Eric Davis
075f4e49df
Refactor: remove unused instance variable
2011-07-19 12:13:33 -07:00
Eric Davis
e04928c5b1
Refactor: change large :except before_filter to :only
2011-07-19 12:13:15 -07:00
Eric Davis
2918437f34
Refactor: audit and remove unknown actions
2011-07-19 12:13:08 -07:00
Eric Davis
c034d5e548
[ #398 ] Remove helpers from IssuesController
2011-06-17 14:46:09 -07:00
Holger Just
07185fb169
[ #436 ] Remove trailing whitespace
2011-05-30 20:52:25 +02:00
Eric Davis
99507a0391
[ #197 ] Upgrade the copyright in the code files
2011-05-29 13:11:52 -07:00
Eric Davis
e131c3b531
[ #197 ] Remove old copyrights
2011-05-29 12:50:08 -07:00
Eric Davis
cd64d11e17
Merge branch 'master' into unstable
...
Conflicts:
app/controllers/watchers_controller.rb
app/views/issues/_action_menu.rhtml
config/locales/pt-BR.yml
doc/CHANGELOG.rdoc
lib/redmine/export/pdf.rb
lib/redmine/wiki_formatting/textile/helper.rb
2011-05-27 12:20:04 -07:00
Eric Davis
46f66add1f
Merge remote-tracking branch 'schmidt/f/416-redo-watcher-links-unstable' into unstable
2011-05-27 10:42:53 -07:00
Tom Kersten
ce8bb652c6
[ #423 ] Removed explicit render in WikiController#show
...
* Allows for format extensions in plugins w/o giving a double-render
error
* Updated Wiki#show template to specify 'wiki/sidebar' explicitly
(vs. just 'sidebar')
2011-05-27 10:20:45 -07:00
Eric Davis
8994a0b58d
[ #406 ] Added missing and removed unused code for Journals
...
acts_as_journalized changed the interfaces and didn't include all of
the recent changes to the Journals system.
* removed Journal diffs, acts_as_journalized handles them differently
* fixed the Journal atom feed
* added the journal preview back in
* added missing tests
2011-05-20 15:37:53 -07:00
Gregor Schmidt
a5b439544a
[ #416 ] introducing separate rjs view to reduce controller code
2011-05-17 20:03:03 +02:00
Gregor Schmidt
4635a8c2a4
[ #416 ] using a simpler approach to replace node with partial
2011-05-17 20:03:02 +02:00
Gregor Schmidt
508b23cf41
[ #416 ] Watcher links work using of css selectors instead of ids
2011-05-17 20:03:02 +02:00
Felix Schäfer
9cb4feefce
Update the watcher list on click on "watch". #311
...
Based on a patch contributed by Price M.
2011-05-17 20:03:01 +02:00
Felix Schäfer
20d804825d
Update the watcher list on click on "watch". #311
...
Based on a patch contributed by Price M.
2011-05-14 17:54:11 +02:00
Eric Davis
193b2c7a38
[ #404 ] Move vendor/plugins/acts_as_journalized/app/ to the core app/
2011-05-13 12:34:24 -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
Gregor Schmidt
dbd6dfc69b
[ #373 ] Refactoring auto_completes#issues action
...
hoping to make it more intention revealing
2011-05-04 19:12:56 +02:00
Gregor Schmidt
8509212991
[ #373 ] Adding test and fix for duplicates in issue autocompleter
2011-05-04 19:01:15 +02:00
Gregor Schmidt
aced650a10
Introducing help layout
2011-05-02 14:32:50 +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
d2973a641e
[ #347 ] Fix potential Execution After Redirect bugs
...
Execution After Redirect (EAR) happens when redirect in a controller is
triggered but there still is code that is executed in the action.
Contributed by Adam Doupé
2011-04-28 14:39:19 -07:00