kolan
/
obsolete.ChilliProject
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
5,275 Commits 5 Branches 46 Tags 17 MiB
Commit Graph

644 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 4577e54f04 Fix trailing whitespace 2012-01-03 20:43:08 +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
Holger Just f90d0fd775 Update locales 2012-01-03 20:29:25 +01:00
Holger Just 1bd8ea6ce7 [#812] Change all references of Redmine to ChiliProject in translations 2012-01-03 15:58:06 +01:00
Eric Davis 00df832126 Merge branch 'ticket/unstable/792-confirmation-emails' into unstable 2011-12-29 10:28:47 -08:00
Eric Davis e045306a5c [#808] Add routing for journal diffs 2011-12-29 08:35:37 -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 72eadcc6ea [#796] Adds date range filter. 
Based on r6226 from Redmine by Jean-Philippe Lang
 2011-12-27 13:02:46 -08:00
Eric Davis 1dd07471ca [#792] Send email from mail_handler for emails missing a project 2011-12-26 17:38:26 -08:00
Eric Davis 9f4683d71b [#792] Send email when mail_handler gets an email from an unknown user 2011-12-26 17:38:25 -08:00
Eric Davis 7c7aca4f0c [#792] Add confirmation emails for successful issue replies 2011-12-26 17:38:25 -08:00
Eric Davis d53c4e9aae [#792] Add confirmation emails for successful issue creation 2011-12-26 17:38:24 -08:00
Eric Davis 9d8fc86b8e [#792] Add settings for confirmation emails are sent for incoming mail 2011-12-26 17:38:19 -08:00
Enderson Maia 896fa80784 [#785] pt-BR translation updates 2011-12-26 17:06:49 +01:00
Holger Just ceac1bb419 Update missing keys in i18n locales 2011-12-18 21:40:14 +01:00
Holger Just e1ac469cfb Fix trailing whitespace 2011-12-18 21:40:01 +01:00
Holger Just d24e8186b4 Merge remote-tracking branch 'chiliproject/master' into unstable 2011-12-18 21:33:05 +01:00
Felix Schäfer 44cf67032f Merge pull request #142 from elm/custom-ldap-filter 
[#388] Custom LDAP filter
 2011-12-18 11:13:55 -08:00
Eric Davis d583c94b5f Update locales 2011-12-17 15:49:28 -08:00
Eric Davis 3a16f3f5b1 Merge remote-tracking branch 'upstream/master' into unstable 2011-12-17 15:20:58 -08:00
Holger Just 34fef9d8fc Fix display of floatable TOCs in wikis 2011-12-17 22:14:19 +01:00
Jean-Philippe Lang 0d69fa6bb1 Patch for ruby1.9.3 compatibility. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8234 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-12-16 14:34:22 +01:00
elm 532c9cc55b Use consistent naming to fix translation in error message 2011-12-13 20:56:43 +01:00
Eric Davis 1318ac204e [#3619] Allow defining a custom ldap filter for AuthSourceLdap. 
Conflicts:

	app/models/auth_source_ldap.rb
	config/locales/en.yml
	test/unit/auth_source_ldap_test.rb
 2011-12-12 13:43:21 +01:00
Eric Davis ee48a8da4f Merge branch 'ticket/unstable/692-final-design' into unstable 2011-12-10 10:40:09 -08:00
Eric Davis 94f7bef2c6 Merge branch 'ticket/master/298-separate-plugin-path' 2011-12-09 13:43:21 -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
Holger Just ce5ffed6a3 Require bundler 1.0.6. 
Only that version introduced the mingw platforms we use in our Gemfile.
 2011-11-26 12:26:11 +01:00
jwalkerbg d8daeffa7b Added Bulgarian translation of several strings. 2011-11-25 20:32:27 +02: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
Eric Davis e6fe1fc776 Merge remote-tracking branch 'meineerde/issues/unstable/604-liquid-rebased' into unstable 2011-11-25 01:44:19 -08:00
Holger Just 7261622196 [#604] Add base drop 2011-11-19 23:31:58 +01: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
Romano Licker 977f74e11a [#692] Main design changes for new theme 2011-11-12 16:22:25 -08:00
Romano Licker 734da91b4b [#692] login slidedown implemented with tabindex and focus fix 2011-11-12 16:22:24 -08:00
Holger Just 09b1545c37 Update i18n labels 2011-10-31 17:25:19 +01:00
Holger Just 2f4afeeb38 [#615] Generate project identifier automatically with JavaScript 
Also let the user know that the identifier must start with a lower case letter.

Contributed by Jan Schulz-Hofen.
 2011-10-30 10:33:20 +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 6fcb1de63a Graciously handle deleted custom fields on issue history view. 2011-10-29 18:29:18 +02:00
Holger Just 91070236db Set source encoding to UTF-8 2011-10-29 14:48:03 +02:00
Holger Just 0ed5cb3f05 Set internal and external encoding to UTF-8 2011-10-29 14:47:56 +02:00
Holger Just 3cc95353cd Merge commit '873b2b69064d7724c6fc804813fb9e65c14558dc' 
Conflicts:
	config/locales/nl.yml
 2011-10-29 14:40:16 +02:00
Holger Just 917c36c27f Update missing i18n strings 2011-10-29 14:35:29 +02:00
Holger Just fd3d67937c Fix typo 2011-10-29 14:23:22 +02:00
Romano Licker e8a42c9337 [667] corrected spelling error for mail notification 2011-10-28 17:05:33 +02:00
Romano Licker fed98990dd [667] corrected german translation for 'notes' 2011-10-28 17:05:29 +02:00
Romano Licker 73484677a4 [667] corrected labels for projects 2011-10-28 17:05:24 +02:00
Romano Licker f31999061d [667] corrected labels and translations for reassign forms 2011-10-28 17:05:09 +02:00