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
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
Felix Schäfer
531653596d
Touch journaled objects on journal creation only. #543
2011-07-29 15:12:06 +02:00
Felix Schäfer
894911f5dc
Correct deflation of gzipped wiki text. #523
2011-07-29 10:19:43 +02:00
Gregor Schmidt
bf14f35223
[ #537 ] version of new WikiContents should be 0
2011-07-25 19:07:05 +02:00
Eric Davis
bbb4f63ae4
Brute force fix for Change#path #from_path on Ruby 1.9.2
...
Some database adapters are returning strings unencoded correctly (sqlite3-ruby)
2011-07-22 10:41:34 -07:00
Eric Davis
d2724ef89c
Brute force fix for Changeset#committer encoding on 1.9.2
2011-07-22 10:10:23 -07:00
Eric Davis
4a3e32b0f4
[ #514 ] Fix forum notifications, only one email per created Message
2011-07-08 14:49:39 -07:00
Felix Schäfer
1bfe6715c6
Put empty start_dates in the future too. #499
2011-07-08 23:20:17 +02:00
Felix Schäfer
7222345ba8
Put issues with an empty due date in the future. #499
2011-07-08 23:09:11 +02:00
Eric Davis
1fae552c8f
[ #467 ] Fix Journal#journaled to prevent uninitialized constant Journal::Journaled
2011-07-08 12:43:03 -07:00
Felix Schäfer
7c4abeb8d3
Correct filters for int,float custom fields. #498
2011-07-08 21:39:36 +02:00
Eric Davis
32f92a5058
[ #501 ] Ugly patch to stop creating journals when only line endings change
2011-07-01 12:25:07 -07:00
Eric Davis
8698b40974
Merge branch 'ticket/release-v2.0.0/350-remove-freeze-from-settings' into release-v2.0.0
2011-06-17 14:42:26 -07:00
Eric Davis
1cf08ee300
[ #474 ] Changesets should use the author method for events
...
This will let them pick up the committer string if user is nil
2011-06-17 12:29:04 -07:00
Eric Davis
3d164f1da0
[ #480 ] Fix replying to IssueJournals through email
2011-06-17 12:10:23 -07:00
Felix Schäfer
85c3d38d24
Fix the wiki links in the activity view. #469
...
Contributed by Artem Naluzhnyy.
2011-06-16 20:56:48 +02:00