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
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
84cc8ab215
Guard against nil author or author emails in the Mailer.
2011-12-28 11:31:05 -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
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
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
Eric Davis
2f0d13149d
Copyright header update
2011-12-17 15:50:52 -08:00
Eric Davis
3a16f3f5b1
Merge remote-tracking branch 'upstream/master' into unstable
2011-12-17 15:20:58 -08:00
Eric Davis
0f8a040d28
[ #3619 ] Validate the AuthSourceLdap#custom_filter
...
Conflicts:
app/models/auth_source_ldap.rb
test/unit/auth_source_ldap_test.rb
2011-12-13 20:56:31 +01:00
Eric Davis
1318ac204e
[ #3619 ] Allow defining a custom ldap filter for AuthSourceLdap.
...
Conflicts:
app/models/auth_source_ldap.rb
config/locales/en.yml
test/unit/auth_source_ldap_test.rb
2011-12-12 13:43:21 +01:00
Eric Davis
b2998c3972
Merge pull request #132 from mbreit/feature/733-issue-due-today
...
[#733 ] Add Issue#due_today? and add due-today css class
2011-12-10 13:29:27 -08:00
Felix Schäfer
6a616a5f13
[ #740 ] Fix faulty assignment
2011-12-03 16:32:29 +01:00
Felix Schäfer
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
Felix Schäfer
42363c32f7
Better checks for previous commit.
2011-11-30 18:08:36 +01:00
Felix Schäfer
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
Moritz Breit
ed0e92b1f6
[ #733 ] Add Issue#due_today? and add due-today css class
2011-11-25 21:06:29 +01:00
Felix Schäfer
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
Felix Schäfer
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
Eric Davis
e6fe1fc776
Merge remote-tracking branch 'meineerde/issues/unstable/604-liquid-rebased' into unstable
2011-11-25 01:44:19 -08:00
Eric Davis
7906afe6b9
[ #604 ] Add an IssueDrop with custom field support
2011-11-20 02:49:12 +01:00
Eric Davis
6f8d8c4105
[ #604 ] Add basic WikiPageDrop
2011-11-19 23:34:52 +01:00
Eric Davis
91914cb877
[ #604 ] Add simple Liquid drops for Projects and Principals
2011-11-19 23:33:36 +01:00
Moritz Breit
60db868470
[ #707 ] Fix encoding error on wiki diffs on Ruby 1.9
...
WikiDiff#to_html returns a string with ASCII encoding if
the WikiJournal content has been Zlib compressed because
Zlib::Inflate.inflate returns strings with ASCII encoding.
Forcing the encoding to be UTF8 fixes this bug.
2011-11-16 17:39:26 +01:00
Eric Davis
1e41ec912b
Guard against a LocalJumpError in Project#project_tree
2011-11-14 19:23:49 -08:00
Felix Schäfer
b1671e46f0
Merge pull request #111 from edavis10/ticket/unstable/672-query-subprojects
...
#672 Allow queries to include subproject issues
2011-11-13 12:11:52 -08:00
Felix Schäfer
af50984023
Better decide if journal implements the method itself. #554
2011-11-06 13:25:31 +01:00
Holger Just
9c8380667c
Merge branch 'master' into unstable
2011-10-31 18:18:44 +01:00
Holger Just
91070236db
Set source encoding to UTF-8
2011-10-29 14:48:03 +02:00
Eric Davis
2b7a221dee
[ #672 ] Allow each Query to control if subprojects are included or not
2011-10-25 18:13:32 -07:00
Gregor Schmidt
c1ecadbff7
Moving query related models into separate files
...
This should enable easier overwriting/reloading in plugins, since now the autoloader is able to find the models.
2011-10-12 11:35:26 +02:00
Felix Schäfer
b47a90b424
Allow to filter watchers by more than just "me". #566
2011-10-03 09:52:00 +02:00
Holger Just
c57c598204
Fix trailing whitespace
2011-08-27 18:26:12 +02:00
Gregor Schmidt
962b35e11a
[ #573 ] Being more explicit about search fields to make sure, that AR joins all tables properly
2011-08-11 10:05:34 +02:00
Holger Just
54b4fdf1aa
[ #124 ] Allow to delete users with STATE_REGISTERED
2011-08-02 02:27:37 +02:00
Holger Just
fc84783de1
[ #124 ] Validate user status changes
2011-08-02 02:26:55 +02:00