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
4ce3b88473
Add a menu to view all projects since the main click event is blocked
2012-01-12 14:58:15 -08:00
11b441f745
Load Gemfiles from vendor/chiliproject_plugins
2012-01-11 12:02:25 +01:00
cd0ea44ff8
[ #822 ] Provide a default log_encoding even if the db column is not present yet
2012-01-10 18:32:38 +01:00
4c0b195380
[ #819 ] set RAILS_ENV if only RACK_ENV is provided
2012-01-06 00:56:57 +01:00
b080ad14ef
[ #790 ] Test the lazy variables
2012-01-05 23:36:30 +01:00
f1324e6af4
[ #790 ] Replace TagList and VariableList tags with variables
2012-01-05 23:36:30 +01:00
446f943968
[ #790 ] Add filter to output an array into an unordered list
2012-01-05 23:36:30 +01:00
3c3eb2f7e7
[ #790 ] Register variables with an API
2012-01-05 23:36:29 +01:00
dc5fd8bc10
Actually focus username in login dropdown
2012-01-04 18:31:05 +01:00
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
ec9352dffe
Merge branch 'release-v2.6.0' into stable
2012-01-03 20:48:31 +01:00
939fd0b9fa
Bump version to 2.6.0
2012-01-03 20:46:58 +01:00
4d4b5b6642
Update changelog for 2.6.0 release
2012-01-03 20:45:16 +01:00
7ef1c41aa0
Force source encoding to UTF-8
2012-01-03 20:43:42 +01:00
4577e54f04
Fix trailing whitespace
2012-01-03 20:43:08 +01:00
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
f90d0fd775
Update locales
2012-01-03 20:29:25 +01:00
0f0e42448a
Overwrite compact on child class of Array to not return an instance of Array
...
This is necessary because in Ruby 1.9.3, the behavior of an internal dup of
the array (rb_ary_dup) was changed to always return an array instance, not
an instance of the actual class which it was working on.
Why can't people just stick to what works but instead try to have special
snowflakes everywhere? </rant>
2012-01-03 19:45:38 +01:00
49cd6f87aa
[ #789 ] Add config.ru for Rack-only servers
2012-01-03 16:31:22 +01:00
1bd8ea6ce7
[ #812 ] Change all references of Redmine to ChiliProject in translations
2012-01-03 15:58:06 +01:00
b8a7f2923a
Remove arbitrary limit on the Time Entry Report columns
...
Appears it was put in place to prevent wide reports but was actually
limiting the data, especially when putting a day in each column.
2011-12-29 15:24:03 -08:00
e4554a6d7b
[ #792 ] Fix tests from merge
2011-12-29 11:50:48 -08:00
00df832126
Merge branch 'ticket/unstable/792-confirmation-emails' into unstable
2011-12-29 10:28:47 -08:00
66fe8287ce
[ #809 ] Fixed a nil object error in params.
2011-12-29 10:08:03 -08:00
a3b1127ef8
Merge branch 'ticket/unstable/809-add-multiple-projects' into unstable
2011-12-29 09:58:34 -08:00
c51d339512
[ #809 ] Multiple projects can now be assigned to a group or user.
...
* Added a Javascript autocomplete for searching Projects
* Updated the Users and Groups controllers' #edit_membership method to
create/update multiple Member records
2011-12-29 09:30:32 -08:00
af00598e5e
[ #809 ] Refactored a duplicate form to a partial.
2011-12-29 09:30:32 -08:00
f835420383
Merge branch 'ticket/unstable/808-issue-description-diff' into unstable
2011-12-29 08:36:46 -08:00
38d0d530b0
[ #808 ] Show issue description diffs in the lightbox popup
2011-12-29 08:35:51 -08:00
4acee9e989
Add a reusable dialog-window for lightbox style popups
2011-12-29 08:35:51 -08:00
Holger Just
Holger Just
Eric Davis