484ed29fa2
Port main layout
2011-07-29 14:29:23 -07:00
1f57eb01b1
Merge HTML head section
2011-07-29 14:25:35 -07:00
74cfd7b5ca
Merge branch 'stable' into unstable
2011-07-29 13:54:27 -07:00
30285ce67f
Merge branch 'release-v2.1.0' into stable
2011-07-29 10:47:59 -07:00
2d67c2f2b3
Bump version to 2.1.0
2011-07-29 10:29:52 -07:00
1af4c30a6c
Update changelog for 2.1.0 release
2011-07-29 10:29:00 -07:00
70c3e1c8f9
[ #544 ] html_escape issue fields
2011-07-29 09:25:13 -07:00
4bc5bc9fa6
Avoid touching journaled objects on backdated journal creation.
2011-07-29 18:21:04 +02:00
5015ca4878
Merge branch 'master' of github.com:chiliproject/chiliproject
2011-07-29 18:19:46 +02:00
25b7b42c55
Fix for encoding errors on 1.9.2 with the mysql gem
2011-07-29 09:09:02 -07:00
ff6d75ca74
Only build initial journals for core classes. #542
2011-07-29 18:00:19 +02:00
d7a9adf880
move protect_from_forgery to the beginning of the before_filter chain as per the recommended rails practices
2011-07-29 17:23:13 +02:00
531653596d
Touch journaled objects on journal creation only. #543
2011-07-29 15:12:06 +02:00
55f9ecbe23
Remove double initial WikiContentJournals. #542
2011-07-29 15:00:31 +02:00
894911f5dc
Correct deflation of gzipped wiki text. #523
2011-07-29 10:19:43 +02:00
76490fcda5
Merge remote-tracking branch 'finnlabs/pulls/539/cleanup-issue_helper-show_detail'
2011-07-27 16:03:14 +02:00
e2d16e1397
[ #540 ] compatibility layer to reenable API from Chili 1.x
2011-07-27 15:52:28 +02:00
06076e5ac1
Remove db:migrate_plugins task.
...
Use the equivalent db:migrate:plugins instead that is provided by the
engines plugin directly.
2011-07-27 15:23:26 +02:00
008a29dcbc
[ #539 ] removing helper method from tests, adding TODO
2011-07-26 23:00:51 +02:00
8c9034f41e
[ #539 ] removing dead code - this went into JournalFormatter
2011-07-26 23:00:47 +02:00
c63954a4c7
Add ruby-debug as test dependency to debug failing tests
2011-07-25 21:22:57 +02:00
f0d271bee3
Fix failing tests because of missing journal fixtures and indeterministic behaviour of .find(:first)
2011-07-25 21:22:13 +02:00
a1748cd221
[ #526 ] Update Bulgarian translation
...
Contributed by Ivan Cenov.
2011-07-25 19:22:06 +02:00
d62a4f1d28
Consider user's timezone for default issue start date
...
Contributed by Jan Schulz-Hofen
2011-07-25 19:16:15 +02:00
bf14f35223
[ #537 ] version of new WikiContents should be 0
2011-07-25 19:07:05 +02:00
a35d61bfb7
[ #506 ] Read Gemfile.local for local gem inclusions.
...
Contributed by Holger Just
2011-07-22 14:48:04 -07:00
9c47208efa
[ #511 ] Fix string encodings coming from sqlite3 in MRI 1.9.x
2011-07-22 14:35:02 -07:00
4b3bd797b0
Fix errors when trying to check for binary SCM strings in 1.9.2
...
1.9.2 removed String#is_binary_data?
2011-07-22 14:35:01 -07:00
2d98a486d6
Fix failing test due to invalid HTML and missing initial journal
2011-07-22 11:52:55 -07:00
c0d26da34e
Refactor: move method to recreate the initial journals out of migration
2011-07-22 11:42:40 -07:00
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
d2724ef89c
Brute force fix for Changeset#committer encoding on 1.9.2
2011-07-22 10:10:23 -07:00
477a5f3702
Refactor: replace comment with extracted utility method
2011-07-19 12:14:16 -07:00
c62e16b6cc
Refactor: replace comment with utility method
2011-07-19 12:14:08 -07:00
a2eeb4ae20
Refactor: extract setup to before_filter
2011-07-19 12:14:02 -07:00
9771e20462
Refactor: use the new utility method to load ivars for settings
2011-07-19 12:13:53 -07:00
1d3d7ff10c
Refactor: extract method to prepare to reuse
2011-07-19 12:13:46 -07:00
db7bc2bb82
Refactor: extract method with before_filter
2011-07-19 12:13:39 -07:00
075f4e49df
Refactor: remove unused instance variable
2011-07-19 12:13:33 -07:00
e04928c5b1
Refactor: change large :except before_filter to :only
2011-07-19 12:13:15 -07:00
2918437f34
Refactor: audit and remove unknown actions
2011-07-19 12:13:08 -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
067ab21309
Update Journal exemplar for aaj
2011-07-11 16:51:22 -07:00
8ca03f3a2a
Add ChiliProject::Compatibility to help upgrade third party code
2011-07-11 09:51:08 -07:00
a76ef2a43e
Updated yardoc static files
2011-07-11 09:51:01 -07:00
79152e4a24
Typo in method comment
2011-07-11 09:50:53 -07:00
b646a731fb
Merge branch 'ticket/master/191-next-prev-search-results'
2011-07-08 15:23:48 -07:00
38b7ec5726
[ #191 ] Add pagination links above the search results
2011-07-08 15:11:53 -07:00
Eric Davis
Felix Schäfer
Holger Just
Gregor Schmidt