kolan
/
obsolete.ChilliProject
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
4,908 Commits 5 Branches 46 Tags 17 MiB
Commit Graph

4908 Commits

Author SHA1 Message Date
Eric Davis a7ab39dd31 [#557] Fix link_to_month to not escape the HTML arrow characters 2011-08-05 08:49:22 -07:00
Eric Davis 4d48a6b675 Merge remote-tracking branch 'tomzx/b552_hardcoded_english_string' 
Conflicts:
	app/helpers/repositories_helper.rb
 2011-08-05 08:30:21 -07:00
Eric Davis 30e81bed5c Merge remote-tracking branch 'tomzx/b551_hardcoded_french_string' 
Conflicts:
	app/views/wiki/annotate.rhtml
	app/views/wiki/diff.rhtml
	app/views/wiki/show.rhtml
 2011-08-05 08:27:49 -07:00
Eric Davis eded447079 Merge branch 'stable' 2011-08-01 16:56:59 -07:00
Eric Davis 3dc373eea4 Merge branch 'release-v2.1.1' into stable 2011-08-01 16:53:13 -07:00
Eric Davis da9c4a16a9 Bump version to 2.1.1 2011-08-01 16:52:33 -07:00
Eric Davis 46ba84ead2 Update Changelog for 2.1.1 2011-08-01 16:13:52 -07:00
Eric Davis 8b99047123 Merge branch 'stable' 2011-08-01 16:12:23 -07:00
Eric Davis 2c46411678 [#547] Security audit 2011-08-01 16:00:23 -07:00
Tom Rochette 552cd8dc57 Replace hardcoded string "diff" in Wiki#show and Repositories_Helper. 2011-07-31 09:27:13 -04:00
Tom Rochette aa6bf25b39 Replaced french word "anonyme" with label_user_anonymous. 2011-07-31 08:57:58 -04:00
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
Eric Davis 30285ce67f Merge branch 'release-v2.1.0' into stable 2011-07-29 10:47:59 -07:00
Eric Davis 2d67c2f2b3 Bump version to 2.1.0 2011-07-29 10:29:52 -07:00
Eric Davis 1af4c30a6c Update changelog for 2.1.0 release 2011-07-29 10:29:00 -07:00
Eric Davis 70c3e1c8f9 [#544] html_escape issue fields 2011-07-29 09:25:13 -07:00
Felix Schäfer 4bc5bc9fa6 Avoid touching journaled objects on backdated journal creation. 2011-07-29 18:21:04 +02:00
Felix Schäfer 5015ca4878 Merge branch 'master' of github.com:chiliproject/chiliproject 2011-07-29 18:19:46 +02:00
Eric Davis 25b7b42c55 Fix for encoding errors on 1.9.2 with the mysql gem 2011-07-29 09:09:02 -07:00
Felix Schäfer ff6d75ca74 Only build initial journals for core classes. #542 2011-07-29 18:00:19 +02:00
Holger Just 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
Felix Schäfer 531653596d Touch journaled objects on journal creation only. #543 2011-07-29 15:12:06 +02:00
Felix Schäfer 55f9ecbe23 Remove double initial WikiContentJournals. #542 2011-07-29 15:00:31 +02:00
Felix Schäfer 894911f5dc Correct deflation of gzipped wiki text. #523 2011-07-29 10:19:43 +02:00
Holger Just 76490fcda5 Merge remote-tracking branch 'finnlabs/pulls/539/cleanup-issue_helper-show_detail' 2011-07-27 16:03:14 +02:00
Gregor Schmidt e2d16e1397 [#540] compatibility layer to reenable API from Chili 1.x 2011-07-27 15:52:28 +02:00
Holger Just 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
Gregor Schmidt 008a29dcbc [#539] removing helper method from tests, adding TODO 2011-07-26 23:00:51 +02:00
Gregor Schmidt 8c9034f41e [#539] removing dead code - this went into JournalFormatter 2011-07-26 23:00:47 +02:00
Holger Just c63954a4c7 Add ruby-debug as test dependency to debug failing tests 2011-07-25 21:22:57 +02:00
Holger Just f0d271bee3 Fix failing tests because of missing journal fixtures and indeterministic behaviour of .find(:first) 2011-07-25 21:22:13 +02:00
Holger Just a1748cd221 [#526] Update Bulgarian translation 
Contributed by Ivan Cenov.
 2011-07-25 19:22:06 +02:00
Holger Just d62a4f1d28 Consider user's timezone for default issue start date 
Contributed by Jan Schulz-Hofen
 2011-07-25 19:16:15 +02:00
Gregor Schmidt bf14f35223 [#537] version of new WikiContents should be 0 2011-07-25 19:07:05 +02:00
Eric Davis a35d61bfb7 [#506] Read Gemfile.local for local gem inclusions. 
Contributed by Holger Just
 2011-07-22 14:48:04 -07:00
Eric Davis 9c47208efa [#511] Fix string encodings coming from sqlite3 in MRI 1.9.x 2011-07-22 14:35:02 -07:00
Eric Davis 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
Eric Davis 2d98a486d6 Fix failing test due to invalid HTML and missing initial journal 2011-07-22 11:52:55 -07: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 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 477a5f3702 Refactor: replace comment with extracted utility method 2011-07-19 12:14:16 -07:00
Eric Davis c62e16b6cc Refactor: replace comment with utility method 2011-07-19 12:14:08 -07:00
Eric Davis a2eeb4ae20 Refactor: extract setup to before_filter 2011-07-19 12:14:02 -07:00
Eric Davis 9771e20462 Refactor: use the new utility method to load ivars for settings 2011-07-19 12:13:53 -07:00
Eric Davis 1d3d7ff10c Refactor: extract method to prepare to reuse 2011-07-19 12:13:46 -07:00
Eric Davis db7bc2bb82 Refactor: extract method with before_filter 2011-07-19 12:13:39 -07:00
Eric Davis 075f4e49df Refactor: remove unused instance variable 2011-07-19 12:13:33 -07:00
Eric Davis e04928c5b1 Refactor: change large :except before_filter to :only 2011-07-19 12:13:15 -07:00