Holger Just
4c0b195380
[ #819 ] set RAILS_ENV if only RACK_ENV is provided
2012-01-06 00:56:57 +01:00
Holger Just
b080ad14ef
[ #790 ] Test the lazy variables
2012-01-05 23:36:30 +01:00
Holger Just
f1324e6af4
[ #790 ] Replace TagList and VariableList tags with variables
2012-01-05 23:36:30 +01:00
Holger Just
446f943968
[ #790 ] Add filter to output an array into an unordered list
2012-01-05 23:36:30 +01:00
Holger Just
3c3eb2f7e7
[ #790 ] Register variables with an API
2012-01-05 23:36:29 +01:00
Holger Just
dc5fd8bc10
Actually focus username in login dropdown
2012-01-04 18:31:05 +01:00
Holger Just
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
Holger Just
ec9352dffe
Merge branch 'release-v2.6.0' into stable
2012-01-03 20:48:31 +01:00
Holger Just
939fd0b9fa
Bump version to 2.6.0
2012-01-03 20:46:58 +01:00
Holger Just
4d4b5b6642
Update changelog for 2.6.0 release
2012-01-03 20:45:16 +01:00
Holger Just
7ef1c41aa0
Force source encoding to UTF-8
2012-01-03 20:43:42 +01:00
Holger Just
4577e54f04
Fix trailing whitespace
2012-01-03 20:43:08 +01:00
Holger Just
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
Holger Just
f90d0fd775
Update locales
2012-01-03 20:29:25 +01:00
Holger Just
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
Holger Just
49cd6f87aa
[ #789 ] Add config.ru for Rack-only servers
2012-01-03 16:31:22 +01:00
Holger Just
1bd8ea6ce7
[ #812 ] Change all references of Redmine to ChiliProject in translations
2012-01-03 15:58:06 +01:00
Eric Davis
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
Eric Davis
e4554a6d7b
[ #792 ] Fix tests from merge
2011-12-29 11:50:48 -08:00
Eric Davis
00df832126
Merge branch 'ticket/unstable/792-confirmation-emails' into unstable
2011-12-29 10:28:47 -08:00
Eric Davis
66fe8287ce
[ #809 ] Fixed a nil object error in params.
2011-12-29 10:08:03 -08:00
Eric Davis
a3b1127ef8
Merge branch 'ticket/unstable/809-add-multiple-projects' into unstable
2011-12-29 09:58:34 -08:00
Eric Davis
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
Eric Davis
af00598e5e
[ #809 ] Refactored a duplicate form to a partial.
2011-12-29 09:30:32 -08:00
Eric Davis
f835420383
Merge branch 'ticket/unstable/808-issue-description-diff' into unstable
2011-12-29 08:36:46 -08:00
Eric Davis
38d0d530b0
[ #808 ] Show issue description diffs in the lightbox popup
2011-12-29 08:35:51 -08:00
Eric Davis
4acee9e989
Add a reusable dialog-window for lightbox style popups
2011-12-29 08:35:51 -08:00
Eric Davis
aafec2c50f
Add some nice defaults for jQuery ajax
2011-12-29 08:35:51 -08:00
Eric Davis
08454ab7fa
[ #808 ] Truncate and show a link to the full journal diff in the issue history
2011-12-29 08:35:51 -08:00
Eric Davis
5ad97a4ea3
[ #808 ] Add JournalsController#diff to diff a single field
2011-12-29 08:35:45 -08:00
Eric Davis
e045306a5c
[ #808 ] Add routing for journal diffs
2011-12-29 08:35:37 -08:00
Eric Davis
8100ce0ce5
Optimize: Remove per-language assertions for Mailer tests
...
I can't find any real reason they are needed at all and were taking
a lot of time to run. Results for the test class
Before: 56 seconds
After: 23 seconds
2011-12-28 12:20:45 -08:00
Eric Davis
84cc8ab215
Guard against nil author or author emails in the Mailer.
2011-12-28 11:31:05 -08:00
Eric Davis
ef00061568
[ #798 ] Fixed the sidebar design by moving #sidebar out of #main-menu
...
The #main-menu was used as the entire left column but was having styles
applied to it for the menu which were leaking onto the #sidebar. By
wrapping the column in a unique div the menu styles were isolated from
the sidebar styles.
2011-12-28 11:14:38 -08:00
Eric Davis
15428fc092
[ #806 ] Add Board and Message watcher management
2011-12-28 11:03:24 -08:00
Eric Davis
a8d28e4593
Merge branch 'ticket/unstable/805-wiki-watching' into unstable
2011-12-28 10:23:26 -08:00
Eric Davis
ce0c32ea02
Refactor: create the permission name dynamically to support other classes
2011-12-28 10:22:06 -08:00
Eric Davis
97fe88f8d9
[ #805 ] Add the Watchers sidebar to Wiki Pages
2011-12-28 10:22:06 -08:00
Eric Davis
3df729e47d
Replace puts and !!! messages with pending tests when the test SCMs are missing
2011-12-27 18:23:14 -08:00
Eric Davis
7bce7f7b07
Merge branch 'ticket/unstable/802-group-watchers' into unstable
2011-12-27 18:09:25 -08:00
Eric Davis
04db42f537
Fix another broken test that can't run by itself due to missing fixtures
2011-12-27 17:38:38 -08:00
Eric Davis
16943d04f7
[ #802 ] Use the group.png icon as a Group avatar
2011-12-27 17:38:34 -08:00
Eric Davis
8e3d4da376
[ #802 ] Show groups in the watchers partial and users autocomplete
2011-12-27 17:38:30 -08:00
Eric Davis
65e7995682
[ #802 ] Change WatchersController to allow groups
2011-12-27 17:38:25 -08:00
Eric Davis
e6e6a06fff
[ #802 ] Allow Groups to be added as a Watcher
2011-12-27 17:38:20 -08:00
Eric Davis
10054cfd8f
[ #802 ] Move methods from User so other Principals can use them
2011-12-27 17:38:14 -08:00
Eric Davis
8b3207a893
Fix test that doesn't run alone due to missing fixtures
2011-12-27 17:16:16 -08:00
Eric Davis
037d915d7b
Merge branch 'ticket/unstable/800-non-member-watch' into unstable
2011-12-27 17:14:57 -08:00
Eric Davis
c3555b1728
[ #800 #801 ] Exclude users already watching the issue
2011-12-27 17:09:29 -08:00
Eric Davis
8160cd02bd
[ #800 #801 ] Add Javascript search to bulk add watchers to issues.
2011-12-27 17:09:24 -08:00