7d1c0374e4
Merge branch 'ticket/unstable/747-capybara' into unstable
2011-12-09 13:28:33 -08:00
fbde6859d1
Merge branch 'rubychan-coderay-1.0' into unstable
2011-12-09 16:58:24 +01:00
1c84fc0f4d
Text corrections.
2011-12-09 16:57:48 +01:00
8671006b70
[ #649 ] Prevent the extra wiki styles from interfering with code highlighting.
2011-12-09 16:57:16 +01:00
aa88fe8e39
Merge branch 'coderay-1.0' of https://github.com/rubychan/chiliproject into rubychan-coderay-1.0
2011-12-09 16:50:20 +01: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
b32fc97314
[ #747 ] Add some capybara helper methods
2011-12-01 18:13:27 -08:00
a2feb14c83
[ #747 ] Include capybara for integration tests
2011-12-01 16:46:50 -08:00
4b5d4307d2
Merge branch 'ticket/unstable/720-tagging' into unstable
2011-12-01 15:58:29 -08:00
f179fea7bf
[ #720 ] Use = to show the explicit dependency
2011-12-01 15:58:05 -08:00
579061c794
Move shebang of rdm-mailhandler.rb back to the top.
2011-12-01 20:58:14 +01:00
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
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
5bf27de92a
[604] Add compatibility check for Liquid
2011-11-26 22:24:51 +01:00
8c26dea72d
Add catch-all compatibility check, defaults to false
2011-11-26 22:21:48 +01:00
0b952a1edd
[ #263 ] Fix test error on Ruby 1.9
...
TreeNode#to_s (from the rubytree gem) is broken. It is implicitly called by
Shoulda on 1.9 only. As we don't actually need it, we just remove the method.
The bug is reported at http://rubyforge.org/tracker/index.php?func=detail&aid=29435&group_id=1215&atid=4793
2011-11-26 20:36:56 +01:00
9f4d12ffdf
[ #734 ] Don't modify text inline.
...
This is not only a wee bit faster (yay!) but also allows use to deal with
frozen strings and doesn't change content which might inadvertently be saved
later on. And it fixes some broken tests on Ruby 1.9 :)
2011-11-26 16:10:24 +01:00
28ce07b1dd
[ #734 ] Force instance_variables to string for Ruby 1.9 compatibility
2011-11-26 16:09:08 +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
01e43f2e6b
Merge pull request #134 from schmidt/pulls/725/unstable
...
[#725 ] Compatibility check for jQuery availability (unstable)
2011-11-25 12:50:25 -08: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
3577550cfa
[ #725 ] Chili-core now loads jQuery by default
...
This was added to unstable with ab2856b53
2011-11-25 20:24:06 +01:00
8fc2b72740
[ #720 ] Add acts-as-taggable-on gem and migration for tag support
...
As per the gem docs, 2.1.0 is the last Rails 2.x compatable version
2011-11-25 11:23:34 -08:00
13da5e0445
[ #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:19:58 +01: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
e6fe1fc776
Merge remote-tracking branch 'meineerde/issues/unstable/604-liquid-rebased' into unstable
2011-11-25 01:44:19 -08:00
b1d9667335
Fix test so it runs in isolation
2011-11-20 02:49:22 +01:00
a31a4a8852
[ #604 ] Adapt fixtures for new liquid syntax
2011-11-20 02:49:22 +01:00
dedf696666
[ #604 ] Add missing test for Liquid
2011-11-20 02:49:22 +01:00
Eric Davis
Felix Schäfer
Spencer Markowski
Holger Just
Moritz Breit
Gregor Schmidt
jwalkerbg