Holger Just
0fd499afca
Merge branch 'master' into unstable
2012-02-06 22:47:35 +01:00
Holger Just
01fefe8d3b
[ #775 ] Don't create a new journal on parent message on reply
2012-01-31 16:02:56 +01:00
Holger Just
fb595ec7f9
[ #775 ] Don't create a new journal on Attachment#increment_download
2012-01-31 16:02:49 +01:00
Holger Just
3f99ee63ff
Always display our custom 404 page
2012-01-30 21:28:57 +01:00
Holger Just
b692d4a671
Fix source encoding
2012-01-18 19:26:56 +01:00
Holger Just
185edcd283
Fix trailing whitespace
2012-01-18 19:26:03 +01:00
Holger Just
19f2ccd496
Update copyright for 2012
2012-01-18 19:25:13 +01:00
Holger Just
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
Holger Just
33a8baf347
Merge branch 'pulls/780/setting-cache' of https://github.com/finnlabs/chiliproject into unstable
2012-01-16 14:50:34 +01:00
Holger Just
d7ebffb7ad
[ #795 ] Generate error flash on Liquid syntax error
2012-01-16 14:10:45 +01:00
Holger Just
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
Holger Just
b080ad14ef
[ #790 ] Test the lazy variables
2012-01-05 23:36:30 +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
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
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
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
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
15428fc092
[ #806 ] Add Board and Message watcher management
2011-12-28 11:03:24 -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
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
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
8b3207a893
Fix test that doesn't run alone due to missing fixtures
2011-12-27 17:16:16 -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
Eric Davis
5deae7ebe3
[ #800 #801 ] Refactor AutoCompletesController#users to not be coupled to Groups
2011-12-27 17:09:19 -08:00
Eric Davis
a110f1041d
[ #800 #801 ] Refactor the user auto complete method to the AutoCompletesController
2011-12-27 17:09:18 -08:00
Eric Davis
111c7f47f7
[ #800 #801 ] Test that non-member watchers aren't removed if they still have access
2011-12-27 17:08:48 -08:00
Eric Davis
3af5544dbc
[LSS#4190] Add watching to documents
2011-12-27 13:16:52 -08:00
Eric Davis
72eadcc6ea
[ #796 ] Adds date range filter.
...
Based on r6226 from Redmine by Jean-Philippe Lang
2011-12-27 13:02:46 -08:00
Eric Davis
dc541597ec
[ #792 ] Send email from mail_handler for emails which are missing required information
2011-12-26 17:39:29 -08:00
Eric Davis
1dd07471ca
[ #792 ] Send email from mail_handler for emails missing a project
2011-12-26 17:38:26 -08:00
Eric Davis
4ff670f5fa
[ #792 ] Send email from mail_handler for unauthorized actions
2011-12-26 17:38:25 -08:00
Eric Davis
9f4683d71b
[ #792 ] Send email when mail_handler gets an email from an unknown user
2011-12-26 17:38:25 -08:00
Eric Davis
331ecb4c4f
[ #792 ] Add confirmation emails for successful forum replies
2011-12-26 17:38:25 -08:00
Eric Davis
7c7aca4f0c
[ #792 ] Add confirmation emails for successful issue replies
2011-12-26 17:38:25 -08:00
Eric Davis
d53c4e9aae
[ #792 ] Add confirmation emails for successful issue creation
2011-12-26 17:38:24 -08:00
Eric Davis
260e8b84f8
[ #674 ] Convert outbound mail to be sent per-recipient
...
Instead of a single email that is sent out with all the recipients as CC/BCC,
each recipient will be delivered their own email. This will let emails to be
customized per user based on their permissions, without exposing private data.
2011-12-26 16:58:43 -08:00
Gregor Schmidt
10e16e9a56
[ #780 ] Clearing (Settings) cache to make the tests pass again
2011-12-19 17:30:19 +01:00
Gregor Schmidt
6273891ae7
[ #780 ] Remove non-functional call to Setting.check_cache
2011-12-19 17:30:13 +01:00
Holger Just
745f889e92
Enforce UTF-8 source encoding
2011-12-18 21:40:14 +01:00
Holger Just
e1ac469cfb
Fix trailing whitespace
2011-12-18 21:40:01 +01:00
Holger Just
d24e8186b4
Merge remote-tracking branch 'chiliproject/master' into unstable
2011-12-18 21:33:05 +01:00