Eric Davis
bf13b0f409
Check for journal_user, then updated_by, and finally User.current when creating Journals
2011-07-30 21:51:26 -07:00
Eric Davis
68526f6f2d
Clear @extra_journal_attributes also after saving a Journal
2011-07-30 21:50:47 -07:00
Gregor Schmidt
e2d16e1397
[ #540 ] compatibility layer to reenable API from Chili 1.x
2011-07-27 15:52:28 +02:00
Eric Davis
c0d26da34e
Refactor: move method to recreate the initial journals out of migration
2011-07-22 11:42:40 -07:00
Eric Davis
dd6d9d1c68
[ #513 ] Fix links to attachments in the issue history
2011-07-11 18:33:32 -07:00
Eric Davis
df0c75c050
Fix a problem loading ARCondition in development on second request.
2011-07-11 18:02:01 -07:00
Eric Davis
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
Eric Davis
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
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
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
Eric Davis
bfba5e2151
[ #441 ] Journals should touch their journaled to update updated_on/at fields
2011-06-05 11:49:40 -07:00
Eric Davis
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
Eric Davis
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
Felix Schäfer
79ed4920cf
Merge branch 'unstable' of github.com:chiliproject/chiliproject into unstable
2011-05-21 02:03:10 +02:00
Felix Schäfer
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
Felix Schäfer
66561031eb
[ #400 ] Fix the event types (icons on activity and search views).
2011-05-20 13:51:51 -07:00
Gregor Schmidt
09fd71232e
[ #412 ] fixes to make tests run on 1.9.2
2011-05-13 23:52:24 +02:00
Eric Davis
193b2c7a38
[ #404 ] Move vendor/plugins/acts_as_journalized/app/ to the core app/
2011-05-13 12:34:24 -07:00
Eric Davis
adf57a64f1
[ #123 ] Move aaj migrations to core
2011-05-13 11:11:41 -07:00
Eric Davis
23ef9fedef
[ #123 ] Port the send_notification feature to aaj
2011-05-13 10:56:22 -07:00
Eric Davis
0ca73a7f69
[ #123 ] Fix the down migration for Journal#journalized_type
2011-05-13 10:20:34 -07:00
Eric Davis
b1845fcfeb
[ #123 ] Added latest edavis10:acts_as_journalized
2011-05-13 09:55:55 -07:00
Eric Davis
62c9fd2185
[ #123 ] Removed the acts_as_journalized submodule
2011-05-13 09:49:56 -07:00
Felix Schäfer
b1ed5e4c7d
Merge acts_as_journalized to unstable. #123
2011-04-23 21:25:52 +02:00
Felix Schäfer
9ca203beae
Update to latest version of acts_as_journalized.
2011-04-21 11:44:16 +02:00
Toshi MARUYAMA
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
Toshi MARUYAMA
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
Jean-Philippe Lang
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
Jean-Philippe Lang
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
Toshi MARUYAMA
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
Jean-Philippe Lang
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
Toshi MARUYAMA
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
Toshi MARUYAMA
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
Toshi MARUYAMA
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
Toshi MARUYAMA
a184b21a99
PDF: comment out memoizes ( #61 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5255 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:51 -07:00
Toshi MARUYAMA
dc82df16a8
PDF: transplant r4602 ( #61 ).
...
Ruby1.9 compatibility.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5254 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:51 -07:00
Toshi MARUYAMA
3d7a35b7bb
PDF: transplant r5183 ( #61 ).
...
Fix an internal server error on formatting an issue as a PDF in Japanese (#7794 ).
Contributed by Yuki Sonoda.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5253 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:51 -07:00
Toshi MARUYAMA
60e084163c
PDF: transplant r1497 ( #61 ).
...
Fixes Chinese pdf export when the issue description is too long (#1170 ).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5252 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:51 -07:00
Toshi MARUYAMA
64bf51004a
PDF: transplant r3389 ( #61 ).
...
Korean support for PDF export (#4639 ).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5251 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:50 -07:00
Toshi MARUYAMA
3eb1d6b169
PDF: transplant r393 ( #61 ).
...
Added chinese simplified translation (Andy Wu)
Fixed rfpdf chinese.rb
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5250 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:50 -07:00
Toshi MARUYAMA
7deb78ca4e
PDF: transplant r287 ( #61 ).
...
Fix for #9 .
Export feature(to csv/pdf) doesn't work in Japanese
csv and pdf encoding are know defined for each language
(general_csv_encoding and general_pdf_encoding keys in lang files)
added SJIS font for japanese pdf exports.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5249 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:50 -07:00
Toshi MARUYAMA
3a58444199
PDF: update rfpdf ( #61 ).
...
https://github.com/edwinmoss/rfpdf
revision a04724b4af95c15a99675b34e353c15534d20411
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5247 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:50 -07:00
Jean-Philippe Lang
c9e663132b
Moved plugin tasks directories to lib/tasks (Rails deprecation).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5216 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:46 -07:00
Toshi MARUYAMA
d1e5e1f504
Fix an internal server error on formatting an issue as a PDF in Japanese ( #7794 ).
...
Contributed by Yuki Sonoda.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5183 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:42 -07:00
Jean-Philippe Lang
dac912b379
Fixed: Email notifications are sent to watchers even if 'No events' setting is chosen ( #7763 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5004 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 15:26:39 -07:00
Jean-Philippe Lang
b615e60fd8
Do not keep illegitimate custom_values when setting custom_field_values ( #7604 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4891 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 14:43:45 -07:00
Felix Schäfer
70e10ab4bd
Merge the master-journalized branch from https://github.com/finnlabs/redmine/
2011-04-14 16:28:10 +02:00
Jean-Philippe Lang
b80b789cc6
Coderay upgraded to 0.9.7 ( #5344 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4739 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-02-09 16:41:32 -08:00
Jean-Philippe Lang
4525b7f6e2
Fixed: subtasks are deleted (not destroyed) when destroying parent issue ( #7385 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4735 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-02-09 16:41:32 -08:00
Jean-Philippe Lang
2c830770cb
ruby1.9 compatibility
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4602 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-01-01 11:45:12 +00:00