38d0d530b0
[ #808 ] Show issue description diffs in the lightbox popup
2011-12-29 08:35:51 -08:00
08454ab7fa
[ #808 ] Truncate and show a link to the full journal diff in the issue history
2011-12-29 08:35:51 -08:00
65e7995682
[ #802 ] Change WatchersController to allow groups
2011-12-27 17:38:25 -08:00
e6e6a06fff
[ #802 ] Allow Groups to be added as a Watcher
2011-12-27 17:38:20 -08:00
94f7bef2c6
Merge branch 'ticket/master/298-separate-plugin-path'
2011-12-09 13:43:21 -08:00
ba0ded88c3
Merge pull request #125 from finnlabs/pulls/708/journal_class_name_in_attribute
...
Bug #708 : AAJ does not create journals, when models are created using sub classes
2011-12-09 13:36:40 -08:00
166d65b26d
[ #258 ] Unvendor net-ldap
2011-11-25 20:54:23 +01:00
e2938d26f3
[ #708 ] Using instance var to store journal class name
...
this way journal classes are only created for classes with
calls to acts_as_journalized. You may now subclass journaled models to extend them with helper methods in plugins w/o interfering with aaj.
2011-11-17 11:16:48 +01:00
667c4d157f
[ #591 ] Merge branch 'issues/master/591-ruby-19-compatibility' from 'meineerde'
2011-10-29 21:22:35 +02:00
6fcb1de63a
Graciously handle deleted custom fields on issue history view.
2011-10-29 18:29:18 +02:00
91070236db
Set source encoding to UTF-8
2011-10-29 14:48:03 +02:00
13250b7223
[ #298 ] Add vendor/chiliproject_plugins to the load path
...
Contributed by Holger Just
2011-10-14 14:29:52 -07:00
a24a24eb19
Add deferred loading for plugins which's requirements aren't all met yet #256
2011-08-25 18:46:53 +02:00
5d7bc5c94c
[ #577 ] Avoid validating users when creating watcher relation
...
Taken from Redmine r5880
Committed by Jean Philippe Lang
2011-08-15 16:05:37 +02:00
bf13b0f409
Check for journal_user, then updated_by, and finally User.current when creating Journals
2011-07-30 21:51:26 -07:00
68526f6f2d
Clear @extra_journal_attributes also after saving a Journal
2011-07-30 21:50:47 -07:00
e2d16e1397
[ #540 ] compatibility layer to reenable API from Chili 1.x
2011-07-27 15:52:28 +02:00
c0d26da34e
Refactor: move method to recreate the initial journals out of migration
2011-07-22 11:42:40 -07:00
dd6d9d1c68
[ #513 ] Fix links to attachments in the issue history
2011-07-11 18:33:32 -07:00
df0c75c050
Fix a problem loading ARCondition in development on second request.
2011-07-11 18:02:01 -07:00
3b9980b449
Fix aaj to allow setting the journal user, note, and attributes directly.
...
This will allow the Journaled object to reliability set the fields on the Journal
without calling init_journal (which is a before_save hook and shouldn't be called
directly).
2011-07-11 16:55:28 -07:00
2f3657502f
[ #474 ] aaj should use the Model's activity options for timestamp and author_key
...
Some models (Changeset) require custom options passed to
acts_as_activity_provider but acts_as_journalized wasn't accepting these
for :timestamp or :author_key
2011-06-17 12:39:07 -07:00
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
ee9b129382
Merge branch 'ticket/release-v2.0.0/441-journal-touch' into release-v2.0.0
...
Conflicts:
test/unit/journal_test.rb
2011-06-10 11:41:52 -07:00
bfba5e2151
[ #441 ] Journals should touch their journaled to update updated_on/at fields
2011-06-05 11:49:40 -07:00
33e3a71341
[ #445 ] Track initial object attributes on the initial journal
...
So the initial journal would have the changes from an Object#new
to the created version of the Object. Also includes a change to the
database migration in order to create these initial journals for
all journaled Objects.
2011-06-03 13:01:56 -07:00
aa07982daa
Fix an edge-edge case bug in journal_attributes_for_user with different users
...
In one case in a plugin (not able to reproduce in core) journal_attributes_for_user
would set the :user to something different than what's in updated_by thus assigning
the Journal to the wrong user.
2011-06-01 22:00:02 -07:00
79ed4920cf
Merge branch 'unstable' of github.com:chiliproject/chiliproject into unstable
2011-05-21 02:03:10 +02:00
6f809b826e
Replace a call to changes with its code from AR::Dirty. #422
...
acts_as_journalized called changes as per ActiveRecord::Dirty
(see http://ar.rubyonrails.org/classes/ActiveRecord/Dirty.html#M000291 ),
the journalized model Changeset :has_many changes though, which
made the call return a list of associated objects instead of the
intended list of changed attributes. Replaced changes with the code
from AR::Dirty to work around that.
2011-05-21 02:02:52 +02:00
66561031eb
[ #400 ] Fix the event types (icons on activity and search views).
2011-05-20 13:51:51 -07:00
09fd71232e
[ #412 ] fixes to make tests run on 1.9.2
2011-05-13 23:52:24 +02:00
193b2c7a38
[ #404 ] Move vendor/plugins/acts_as_journalized/app/ to the core app/
2011-05-13 12:34:24 -07:00
adf57a64f1
[ #123 ] Move aaj migrations to core
2011-05-13 11:11:41 -07:00
23ef9fedef
[ #123 ] Port the send_notification feature to aaj
2011-05-13 10:56:22 -07:00
216619d376
Merge branch 'unstable' into ticket/unstable/123-journalized
...
Conflicts:
test/unit/journal_test.rb
vendor/plugins/acts_as_journalized/lib/redmine/acts/journalized/permissions.rb
2011-05-13 10:35:23 -07:00
0ca73a7f69
[ #123 ] Fix the down migration for Journal#journalized_type
2011-05-13 10:20:34 -07:00
b1845fcfeb
[ #123 ] Added latest edavis10:acts_as_journalized
2011-05-13 09:55:55 -07:00
62c9fd2185
[ #123 ] Removed the acts_as_journalized submodule
2011-05-13 09:49:56 -07:00
2ec21614fd
[ #290 ] Removing all vendored gems
2011-05-10 08:40:58 +02:00
b1ed5e4c7d
Merge acts_as_journalized to unstable. #123
2011-04-23 21:25:52 +02:00
9ca203beae
Update to latest version of acts_as_journalized.
2011-04-21 11:44:16 +02:00
73c5191196
PDF: fix width calculation of multi byte character in Simplified and Traditional Chinese ( #61 ).
...
Contributed by Jun NAITOH.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5295 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:13:19 -07:00
6485f15bb9
PDF: fix the problem that TCPDF built-in font breaks in the Windows ( #61 ).
...
This problem occurs because the EOF character string is included in the built-in font.
Contributed by Jun NAITOH.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5290 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:13:19 -07:00
e6659501de
Limits nested set overhead when destroying an issue without children.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5286 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:13:19 -07:00
cfbe69ab59
Fixed: deleting a parent issue may lead to a stale object error ( #7920 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5285 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:13:18 -07:00
8ca3a46db0
PDF: back out r5253 ( #7794 , #61 ).
...
r5256 fixed #7794 completely.
r5253 effects the width of the ASCII character of Japanese PDF.
Contributed by Jun NAITOH.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5281 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:13:18 -07:00
d8fbdca760
Adds User and Version custom field format that can be used to reference a project member or version in custom fields ( #2096 ).
...
These new field formats are available for project, issue, version and time entry custom fields.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5272 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:53 -07:00
4d6475cdcf
PDF: fix syntax errors at vendor/plugins/rfpdf/lib/tcpdf.rb on Ruby 1.9 ( #61 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5267 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:52 -07:00
610c4efbe9
PDF: comment out Mime pdf in vendor/plugins/rfpdf/init.rb ( #61 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5257 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:51 -07:00
79abd95f73
PDF: import CJK patches ( #61 ).
...
Contributed by Jun NAITOH.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5256 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:51 -07:00
Eric Davis
Felix Schäfer
Gregor Schmidt
Holger Just
Felix Schäfer
Jean-Philippe Lang
Gregor Schmidt
Toshi MARUYAMA