1061 Commits

Author SHA1 Message Date
Holger Just
0c87f611e9 Merge branch 'master' into unstable
Conflicts:
	config/locales/bg.yml
	config/locales/bs.yml
	config/locales/ca.yml
	config/locales/cs.yml
	config/locales/da.yml
	config/locales/de.yml
	config/locales/el.yml
	config/locales/en-GB.yml
	config/locales/es.yml
	config/locales/eu.yml
	config/locales/fa.yml
	config/locales/fi.yml
	config/locales/fr.yml
	config/locales/gl.yml
	config/locales/he.yml
	config/locales/hr.yml
	config/locales/hu.yml
	config/locales/id.yml
	config/locales/it.yml
	config/locales/ja.yml
	config/locales/ko.yml
	config/locales/lt.yml
	config/locales/lv.yml
	config/locales/mk.yml
	config/locales/mn.yml
	config/locales/nl.yml
	config/locales/no.yml
	config/locales/pl.yml
	config/locales/pt-BR.yml
	config/locales/pt.yml
	config/locales/ro.yml
	config/locales/ru.yml
	config/locales/sk.yml
	config/locales/sl.yml
	config/locales/sr-YU.yml
	config/locales/sr.yml
	config/locales/sv.yml
	config/locales/th.yml
	config/locales/tr.yml
	config/locales/uk.yml
	config/locales/vi.yml
	config/locales/zh-TW.yml
	config/locales/zh.yml
	db/migrate/20100217010520_add_custom_filter_to_auth_sources.rb
	lib/chili_project/version.rb
2012-01-04 16:41:10 +01:00
Holger Just
e95b4992e4 Update copyright for 2012
We programmers have a nice new years tradition: We revisit all of our
projects and add 1 to a small number near a "(c)".

-- Volker Dusch
https://twitter.com/__edorian/status/153801913442373633
2012-01-03 20:36:40 +01:00
Eric Davis
b8a7f2923a Remove arbitrary limit on the Time Entry Report columns
Appears it was put in place to prevent wide reports but was actually
limiting the data, especially when putting a day in each column.
2011-12-29 15:24:03 -08:00
Eric Davis
66fe8287ce [#809] Fixed a nil object error in params. 2011-12-29 10:08:03 -08:00
Eric Davis
c51d339512 [#809] Multiple projects can now be assigned to a group or user.
* Added a Javascript autocomplete for searching Projects
* Updated the Users and Groups controllers' #edit_membership method to
  create/update multiple Member records
2011-12-29 09:30:32 -08:00
Eric Davis
38d0d530b0 [#808] Show issue description diffs in the lightbox popup 2011-12-29 08:35:51 -08:00
Eric Davis
5ad97a4ea3 [#808] Add JournalsController#diff to diff a single field 2011-12-29 08:35:45 -08:00
Eric Davis
ce0c32ea02 Refactor: create the permission name dynamically to support other classes 2011-12-28 10:22:06 -08:00
Eric Davis
97fe88f8d9 [#805] Add the Watchers sidebar to Wiki Pages 2011-12-28 10:22:06 -08:00
Eric Davis
8e3d4da376 [#802] Show groups in the watchers partial and users autocomplete 2011-12-27 17:38:30 -08:00
Eric Davis
65e7995682 [#802] Change WatchersController to allow groups 2011-12-27 17:38:25 -08:00
Eric Davis
c3555b1728 [#800 #801] Exclude users already watching the issue 2011-12-27 17:09:29 -08:00
Eric Davis
8160cd02bd [#800 #801] Add Javascript search to bulk add watchers to issues. 2011-12-27 17:09:24 -08:00
Eric Davis
5deae7ebe3 [#800 #801] Refactor AutoCompletesController#users to not be coupled to Groups 2011-12-27 17:09:19 -08:00
Eric Davis
a110f1041d [#800 #801] Refactor the user auto complete method to the AutoCompletesController 2011-12-27 17:09:18 -08:00
Eric Davis
3af5544dbc [LSS#4190] Add watching to documents 2011-12-27 13:16:52 -08:00
Eric Davis
260e8b84f8 [#674] Convert outbound mail to be sent per-recipient
Instead of a single email that is sent out with all the recipients as CC/BCC,
each recipient will be delivered their own email. This will let emails to be
customized per user based on their permissions, without exposing private data.
2011-12-26 16:58:43 -08:00
Holger Just
d24e8186b4 Merge remote-tracking branch 'chiliproject/master' into unstable 2011-12-18 21:33:05 +01:00
Felix Schäfer
1ebec832af [#486] More menu items on the wiki annotate view. 2011-12-18 21:21:21 +01:00
Tom Rochette
b135162c5b Login should redirect to welcome/home page if already logged in. 2011-12-18 19:49:35 +01:00
Holger Just
81f6635878 Remove debug code. Sorry for that... 2011-12-18 15:58:42 +01:00
Holger Just
0049f82182 Redirect back to where I came from when loggin in via the menu form 2011-12-18 12:28:32 +01:00
Holger Just
58a7182e2d Use the correct subject id for quoting 2011-12-18 12:04:13 +01:00
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