e678612d75
gitignore intellij project files
2012-02-24 15:45:22 +01:00
cbcce70400
Fix requiring SCM classes in dev mode #828
...
Change require to require_dependency so SCM classes get loaded on each request in dev mode
2012-02-24 15:44:02 +01:00
fda1dfa96d
Merge pull request #153 from dfeyer/master
...
Fixes for Activity list column alignment
2012-02-22 13:53:13 -08:00
f561c54356
Fixes activity list column alignment
2012-02-12 23:08:37 +01:00
11e93ff36a
Merge branch 'release-v3.0.0' into stable
2012-02-07 00:09:59 +01:00
3ecace901b
Bump version to 3.0.0
2012-02-06 23:58:16 +01:00
2e7050ef79
Update Changelog for 3.0.0 release
2012-02-06 23:58:16 +01:00
e0eb21b48b
[ #826 ] Position the .button-large as any other title-bar element
2012-02-06 23:58:16 +01:00
1eefd4b40d
Merge branch 'master' into unstable
...
Conflicts:
app/models/journal_observer.rb
lib/chili_project/version.rb
test/unit/principal_drop_test.rb
2012-02-06 23:57:10 +01:00
ad996d7839
Merge branch 'release-v2.7.0' into stable
2012-02-06 23:40:10 +01:00
608fd61138
Bump version to 2.7.0
2012-02-06 23:36:58 +01:00
a059cb4892
Update changelog for 2.7.0 release
2012-02-06 23:36:29 +01:00
aa5be5132d
[ #593 ] Generate wiki content notifications in the JournalObserver - backported for 2.7
...
This will prevent the usage of the wrong wiki_content status.
The code is not overly pretty and deserves a thorough refactoring, but at
least it solves the problem at hand.
2012-02-06 22:54:53 +01:00
6fd9bc490f
[ #849 #789 ] Remove config.ru - Backport for 2.7
...
Rails 2.3 doesn't work well as a rack-only app
2012-02-06 22:50:38 +01:00
f417996ff0
[ #839 ] Remove ruby-debug dependency - Backport for 2.7
...
It completely breaks on Ruby 1.9.3-p0. This is a stopper for people installing all groups. For the rest it is rarely used at all. Developers and testers requiring it can include it into their Gemfile.local
2012-02-06 22:50:10 +01:00
0fd499afca
Merge branch 'master' into unstable
2012-02-06 22:47:35 +01:00
aa3ab990d0
[ #593 ] Generate wiki content notifications in the JournalObserver
...
This will prevent the usage of the wrong wiki_content status.
The code is not overly pretty and deserves a thorough refactoring, but at
least it solves the problem at hand.
2012-02-06 22:44:44 +01:00
43afcde38d
[ #875 ] Fix typo
2012-02-01 17:26:07 +01:00
58435c82e4
[ #775 ] Remove noisy journals on Attachments and Messages
2012-01-31 16:03:01 +01:00
01fefe8d3b
[ #775 ] Don't create a new journal on parent message on reply
2012-01-31 16:02:56 +01:00
fb595ec7f9
[ #775 ] Don't create a new journal on Attachment#increment_download
2012-01-31 16:02:49 +01:00
3f99ee63ff
Always display our custom 404 page
2012-01-30 21:28:57 +01:00
be4d679d54
[ #849 #789 ] Remove config.ru as Rails 2.3 doesn work well as a rack-only app
2012-01-29 21:47:05 +01:00
3f126bdeaf
[ #843 ] Add config/setup_load_paths.rb to .gitignore
2012-01-29 19:55:32 +01:00
8e85cbdc11
[ #839 ] Remove ruby-debug dependency.
...
It completely breaks on Ruby 1.9.3-p0. This is a stopper for people installing all groups. For the rest it is rarely used at all. Developers and testers requiring it can include it into their Gemfile.local
2012-01-29 19:55:32 +01:00
21f70fc86c
Bump version to 3.0.0beta2
2012-01-18 19:48:06 +01:00
f4c87b92e2
Update changelog for 3.0.0beta1
2012-01-18 19:31:11 +01:00
b692d4a671
Fix source encoding
2012-01-18 19:26:56 +01:00
185edcd283
Fix trailing whitespace
2012-01-18 19:26:03 +01:00
19f2ccd496
Update copyright for 2012
2012-01-18 19:25:13 +01:00
91f6e79f4d
Update locales with new strings
2012-01-18 19:23:56 +01:00
e85947c7d4
Merge branch 'master' into unstable
2012-01-18 19:18:27 +01:00
a0a2776f95
Make the strainer monkey patch more conservative and compatible
2012-01-18 10:19:04 +01:00
3c9e9764b0
[ #807 ] Re-add details class to maintain backwarts-compatible lasses
2012-01-17 23:43:28 +01:00
3f325243ce
Merge branch 'pulls/783/remove-new-issue-link-if-unauthorized' of https://github.com/finnlabs/chiliproject into unstable
2012-01-17 20:14:25 +01:00
c313ed2d25
Remove unloadable from the monkey patches for Liquid.
...
It turns out in this case or core patches, unloadable actually breaks in
development mode. Did I already mention that I hate the Rails reloader?
2012-01-17 19:38:28 +01:00
e1ecae83b3
[ #774 #815 #807 ] Fix styles used for gravatars in issues
...
Gravatars now generally have a border and are displayed equally.
The Issue history formatting is cleaned up with much of the positioning
magic removed in favor or a simple float.
2012-01-17 19:34:33 +01:00
323b5bebc8
[ #774 ] Move gravatar of issue author into the author tag
2012-01-17 19:31:02 +01:00
91c04f335d
[ #807 ] Move gravatar into the journal div
2012-01-17 19:25:53 +01:00
31620d0c0a
Override first and last filters to allow simple array slicing
2012-01-17 13:47:13 +01:00
9967b5cdf2
Patch Liquid to include filters in a predictable order
...
This brings us a reliable filter override until
https://github.com/Shopify/liquid/pull/87 is accepted and
released upstream.
2012-01-16 20:49:39 +01:00
e91a1e010f
[ #778 ] Properly cache Liquid markup
...
This commit moves the markup caching into Liquid rendering. As
Liquid allows to return different results depending on the environment
(variables, logged user, ...) we only cache the page if it contains
no active content.
Unfortunetely, active content currently also includes the TOC
in wiki pages.
2012-01-16 17:08:52 +01:00
637ca24aed
Completely disable the Rails cache for tests
...
Settings extension to handle cache behaviour by Gregor Schmidt.
2012-01-16 15:54:05 +01:00
a938d582b1
[ #780 ] Clarify deprecation of Setting.clear_cache
2012-01-16 14:53:51 +01:00
33a8baf347
Merge branch 'pulls/780/setting-cache' of https://github.com/finnlabs/chiliproject into unstable
2012-01-16 14:50:34 +01:00
d7ebffb7ad
[ #795 ] Generate error flash on Liquid syntax error
2012-01-16 14:10:45 +01:00
61a65d4624
[ #827 ] Add status group in time entries report.
...
Patch provided by Jérôme BATAILLE.
Test from Jean-Philippe Lang.
2012-01-16 13:48:06 +01:00
d9a0ac37eb
Move Redmine::Info to ChiliProject::Info
2012-01-16 13:28:43 +01:00
dbbc0b4919
[ #558 ] Reduce version info in help link
2012-01-16 13:08:25 +01:00
0407abbd56
Hide the More menu if there are no items to show
2012-01-12 15:00:23 -08:00
Michaël Rigart
Felix Schäfer
Dominique Feyer
Holger Just
Holger Just
Eric Davis