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
1bd8ea6ce7
[ #812 ] Change all references of Redmine to ChiliProject in translations
2012-01-03 15:58:06 +01:00
00df832126
Merge branch 'ticket/unstable/792-confirmation-emails' into unstable
2011-12-29 10:28:47 -08:00
3af5544dbc
[LSS#4190] Add watching to documents
2011-12-27 13:16:52 -08:00
72eadcc6ea
[ #796 ] Adds date range filter.
...
Based on r6226 from Redmine by Jean-Philippe Lang
2011-12-27 13:02:46 -08:00
1dd07471ca
[ #792 ] Send email from mail_handler for emails missing a project
2011-12-26 17:38:26 -08:00
9f4683d71b
[ #792 ] Send email when mail_handler gets an email from an unknown user
2011-12-26 17:38:25 -08:00
7c7aca4f0c
[ #792 ] Add confirmation emails for successful issue replies
2011-12-26 17:38:25 -08:00
d53c4e9aae
[ #792 ] Add confirmation emails for successful issue creation
2011-12-26 17:38:24 -08:00
9d8fc86b8e
[ #792 ] Add settings for confirmation emails are sent for incoming mail
2011-12-26 17:38:19 -08:00
d24e8186b4
Merge remote-tracking branch 'chiliproject/master' into unstable
2011-12-18 21:33:05 +01:00
34fef9d8fc
Fix display of floatable TOCs in wikis
2011-12-17 22:14:19 +01:00
532c9cc55b
Use consistent naming to fix translation in error message
2011-12-13 20:56:43 +01:00
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
ee48a8da4f
Merge branch 'ticket/unstable/692-final-design' into unstable
2011-12-10 10:40:09 -08:00
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
977f74e11a
[ #692 ] Main design changes for new theme
2011-11-12 16:22:25 -08:00
734da91b4b
[ #692 ] login slidedown implemented with tabindex and focus fix
2011-11-12 16:22:24 -08:00
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
6fcb1de63a
Graciously handle deleted custom fields on issue history view.
2011-10-29 18:29:18 +02:00
fd3d67937c
Fix typo
2011-10-29 14:23:22 +02:00
e8a42c9337
[667] corrected spelling error for mail notification
2011-10-28 17:05:33 +02:00
73484677a4
[667] corrected labels for projects
2011-10-28 17:05:24 +02:00
f31999061d
[667] corrected labels and translations for reassign forms
2011-10-28 17:05:09 +02:00
6f5fda2248
[ #667 ] set ids, created invisible labels and linked them
2011-10-28 17:03:38 +02:00
71271e6ff6
[ #667 ] added invisible label
2011-10-28 17:03:37 +02:00
297294362b
[ #667 ] added invisible label
2011-10-28 17:03:37 +02:00
3c04b30834
[ #667 ] added invisible label for mail notification,
...
linked label where possible
2011-10-28 17:03:37 +02:00
2c0fcd3bca
[ #667 ] added invisible labels for reassign select-tag on destroy views
2011-10-28 17:03:37 +02:00
207af21553
[ #667 ] set id for message_subject and linked it to label,
...
added invisible label
2011-10-28 17:03:36 +02:00
bf23c06d93
[ #667 ] added invisible labels for queries
2011-10-28 17:03:35 +02:00
cd7b30dac6
[ #667 ] added invisible search label
2011-10-28 17:03:35 +02:00
5ab9ed889c
[ #667 ] added invisible project scope label
2011-10-28 17:03:35 +02:00
2b7a221dee
[ #672 ] Allow each Query to control if subprojects are included or not
2011-10-25 18:13:32 -07:00
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
552cd8dc57
Replace hardcoded string "diff" in Wiki#show and Repositories_Helper.
2011-07-31 09:27:13 -04:00
0d81314664
Solves #503 : parsing translations with psych in ruby 1.9
2011-07-01 16:01:59 -07:00
07185fb169
[ #436 ] Remove trailing whitespace
2011-05-30 20:52:25 +02:00
bfacd827a8
Removig english strings from RepositoriesHelper
2011-05-05 22:05:41 +02:00
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
50faef3712
[ #346 ] also fixing errornous string starting with %
2011-04-21 12:04:04 +02:00
3b7ea67a99
[ #346 ] changing i18n files to use valid yaml syntax that may be parsed by psych
2011-04-21 11:47:32 +02:00
33c28af67a
Removed hard coded french strings ( #8020 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5264 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:52 -07:00
10ff56eab1
Translations updates by joergleis ( #7855 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5261 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:52 -07:00
9b9c7ae91d
Adds links on the issue list to collapse/expang all groups ( #7236 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5174 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:41 -07:00
6f5707c2b5
Adds email notifications support for news comments ( #2074 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5003 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 15:26:39 -07:00
c9497f39b8
Keep track of issue description changes ( #746 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4954 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 15:16:03 -07:00
886c3e295b
Splits private/public issue queries in the sidebar ( #1067 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4908 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 14:57:31 -07:00
bbb57ea4d2
Warning on leaving a page with unsaved content in textarea ( #2910 ).
...
The warning can be turned off in the user's preference.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4900 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 14:46:57 -07:00
6e0717261c
Merge branch 'ticket/unstable/279-version-start-date' of git://github.com/edavis10/chiliproject.git into unstable
2011-04-07 23:46:54 +02:00
Holger Just
Eric Davis
elm
Felix Schäfer
Romano Licker
Tom Rochette
Gary Verhaegen
Simon COURTOIS
Gregor Schmidt
Jean-Philippe Lang