44cf67032f
Merge pull request #142 from elm/custom-ldap-filter
...
[#388 ] Custom LDAP filter
2011-12-18 11:13:55 -08:00
b135162c5b
Login should redirect to welcome/home page if already logged in.
2011-12-18 19:49:35 +01:00
bde0f6a862
Fix line endings from \r\n to \n
2011-12-18 19:30:46 +01:00
6c690814c9
[ #463 ] Pass through Basic Auth in an FCGI setup
2011-12-18 19:30:37 +01:00
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
611889f3f7
[ #748 ] Use SCM commands to detect the revision
2011-12-15 22:08:18 +01:00
48737b0c6f
Add OpenLDAP config ldif for redmine database
2011-12-13 20:56:43 +01:00
bf7bcec1da
Remove internal LDAP entries to make the ldif importable.
2011-12-13 20:56:43 +01:00
532c9cc55b
Use consistent naming to fix translation in error message
2011-12-13 20:56:43 +01:00
0f8a040d28
[ #3619 ] Validate the AuthSourceLdap#custom_filter
...
Conflicts:
app/models/auth_source_ldap.rb
test/unit/auth_source_ldap_test.rb
2011-12-13 20:56:31 +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
b2998c3972
Merge pull request #132 from mbreit/feature/733-issue-due-today
...
[#733 ] Add Issue#due_today? and add due-today css class
2011-12-10 13:29:27 -08:00
05092b2737
Merge pull request #139 from esmarkowski/patch-1
...
[#761 ] Fix quotation of since date in git adapter
2011-12-10 02:31:05 -08:00
94f7bef2c6
Merge branch 'ticket/master/298-separate-plugin-path'
2011-12-09 13:43:21 -08:00
ba0ded88c3
Merge pull request #125 from finnlabs/pulls/708/journal_class_name_in_attribute
...
Bug #708 : AAJ does not create journals, when models are created using sub classes
2011-12-09 13:36:40 -08:00
b264a8ee3f
Encloses since date in single quotes. This was causing git to respond with fatal: Unknown Object and preventing revisions from being updated.
2011-12-08 23:51:15 -05:00
d943efd0eb
[ #748 ] Make ChiliProject::Version.revision more resilient
...
* Won't output errors when the ChiliProject git repo isn't there anymore,
* Works even if not invoked from the ChiliProject root directory,
* Moved the formatting logic to the git call.
2011-12-03 17:39:52 +01:00
6a616a5f13
[ #740 ] Fix faulty assignment
2011-12-03 16:32:29 +01:00
579061c794
Move shebang of rdm-mailhandler.rb back to the top.
2011-12-01 20:58:14 +01:00
6df18f0a7b
Merge branch 'release-v2.5.0'
2011-11-30 20:45:19 +01:00
7104a24593
Bump version to 2.5.0
2011-11-30 20:43:08 +01:00
6e46c5e945
Update changelog for 2.5.0 release
2011-11-30 20:42:04 +01:00
c2edd624a6
Fix trailing whitespace
2011-11-30 20:29:59 +01:00
5e171001bc
[ #709 ] Fix cache poisoning vector if credential caching is enabled.
...
The cache did not distinguish between cached credentials for read and write
access. As it does not check permissions again if there is a cache hit, users
with authorization for either reading or writing could poison the cache and
subsequently authorize themselves for both access types.
Original fix is by Jean-Philippe Lang, http://www.redmine.org/issues/9567
2011-11-30 20:29:58 +01:00
24538a4af2
[ #735 ] Log time form on issue update should only be displayed with log_time permission
...
Based on a patch by Jean-Philippe Lang.
2011-11-30 20:28:20 +01:00
59dc103492
[ #735 ] Don't allow time entry creation with only edit permission
...
Based on a patch by Jean-Philippe Lang.
2011-11-30 20:27:59 +01:00
c5b83b8709
[ #735 ] Don't allow time entry edits with only log_time permission
...
Based on a patch by Jean-Philippe Lang.
2011-11-30 20:27:59 +01:00
42363c32f7
Better checks for previous commit.
2011-11-30 18:08:36 +01:00
f333f43a57
[ #736 ] force recipients/cc to arrays in the Mailer
...
String#delete might break on 1.9 with dashes in the author's email address. Furthermore, String#delete doesn't do what the original author thought it does.
2011-11-30 18:04:09 +01:00
add0bf4d0a
Don't double-escape project names in base layout.
2011-11-27 17:01:46 +01:00
8c26dea72d
Add catch-all compatibility check, defaults to false
2011-11-26 22:21:48 +01:00
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
261aca658c
Merge pull request #133 from schmidt/pulls/725/master
...
[#725 ] Compatibility check for jQuery availability (master)
2011-11-25 12:50:08 -08:00
ed0e92b1f6
[ #733 ] Add Issue#due_today? and add due-today css class
2011-11-25 21:06:29 +01:00
166d65b26d
[ #258 ] Unvendor net-ldap
2011-11-25 20:54:23 +01:00
1322fbbad0
Merge pull request #129 from jwalkerbg/master
...
Added Bulgarian translation of several strings
2011-11-25 11:28:45 -08:00
be44bbe597
[ #725 ] Add compatibility check for jQuery availability
...
In the current master a.k.a. ChiliProject 2.x, there is
no jQuery loaded by core.
2011-11-25 20:18:10 +01:00
574419bbb1
Merge pull request #126 from mbreit/bugfix/711-tabular_form_builder_ruby19
...
[#711 ] Fix TabularFormBuilder on Ruby 1.9
This is actually a bug in rails 2.3.14 on ruby 1.9 -- Felix
2011-11-25 11:04:35 -08:00
d8daeffa7b
Added Bulgarian translation of several strings.
2011-11-25 20:32:27 +02:00
8b7ee93f90
Merge pull request #124 from mbreit/bugfix/707-wiki-diff-encoding-error-ruby19
...
[#707 ] Fix encoding error on wiki diffs on Ruby 1.9
2011-11-25 09:48:52 -08:00
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
a80f822481
Merge pull request #123 from mbreit/bugfix/698-issue-query-ruby19
...
[#698 ] Fix single-value query atoms in issue queries on Ruby 1.9
2011-11-25 09:45:49 -08:00
a0d95a87e9
[ #706 ] Add plugin hooks to projects/index
...
Contributed by David O
2011-11-25 02:21:11 -08:00
d15c851bb3
[ #711 ] Fix TabularFormBuilder on Ruby 1.9.2
2011-11-17 11:32:13 +01:00
fb7f109ac6
[ #708 ] Adding tests exposing the erroneous behavior
2011-11-17 11:17:11 +01:00
e2938d26f3
[ #708 ] Using instance var to store journal class name
...
this way journal classes are only created for classes with
calls to acts_as_journalized. You may now subclass journaled models to extend them with helper methods in plugins w/o interfering with aaj.
2011-11-17 11:16:48 +01:00
60db868470
[ #707 ] Fix encoding error on wiki diffs on Ruby 1.9
...
WikiDiff#to_html returns a string with ASCII encoding if
the WikiJournal content has been Zlib compressed because
Zlib::Inflate.inflate returns strings with ASCII encoding.
Forcing the encoding to be UTF8 fixes this bug.
2011-11-16 17:39:26 +01:00
c3df17585d
[ #698 ] Fix issue queries on Ruby 1.9
2011-11-16 14:22:43 +01:00
0462fa973b
[ #688 ] Truncate garbage from the end of the changelog.
2011-11-08 11:40:27 +01:00
af50984023
Better decide if journal implements the method itself. #554
2011-11-06 13:25:31 +01:00
Felix Schäfer
Tom Rochette
Holger Just
Jean-Philippe Lang
elm
Eric Davis
Spencer Markowski
Moritz Breit
Gregor Schmidt
jwalkerbg
Gregor Schmidt