dabe5caa1a
Merge branch 'ticket/unstable/123-journalized' into unstable
2011-05-13 11:55:56 -07:00
f79e209d4c
[ #123 ] Fix hardcoded test value with a dynamic one
2011-05-13 11:53:25 -07:00
0ba4134ecc
[ #123 ] Fix Journal notification test
2011-05-13 11:33:51 -07:00
aa2b0a8709
[ #123 #407 ] Deferred Journal#visible tests
2011-05-13 11:26:06 -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
bf90848ae8
Merge remote-tracking branch 'schmidt/b/390-mysql2-incompat-in-wiki-page' into unstable
2011-05-13 09:29:48 -07:00
cff4e83044
[ #290 ] Only print the plugin Gemfile messages when $DEBUG is set
2011-05-13 09:19:41 -07:00
68925684fe
Remove generic Rails performance test
2011-05-13 09:16:46 -07:00
6c9c7dc5aa
Merge remote-tracking branch 'schmidt/f/290-bundler' into unstable
2011-05-13 08:55:08 -07:00
f273b7b18c
Create the ChiliProject namespace
2011-05-11 15:48:36 -07:00
90df645cae
Use link_to_user instead of a manual link
2011-05-11 15:40:55 -07:00
315ec5f65c
HTML escape some user values
2011-05-11 15:39:07 -07:00
e9c542d7da
Merge remote-tracking branch 'asoltys/feature/link_to_user_profile_from_account_page' into unstable
2011-05-11 15:29:49 -07:00
f27614b576
make username a link to their profile page
2011-05-11 16:18:04 -06:00
c2d058a53b
[ #390 ] check to handle mysql2's early type casting
2011-05-11 00:19:11 +02:00
ddcd4f2888
Pinning mysql2 gem to 0.2 branch, since 0.3 and the following are Rails 3 only
2011-05-10 08:42:37 +02:00
a0eb66fc98
[ #290 ] using ~> instead of < for i18n dependency
...
it is more accurate in this case
2011-05-10 08:40:58 +02:00
cbc26ea982
[ #290 ] Remove test gems from dev enviroment.
...
running single test without RAILS_ENV=test prefix seams to work without it.
2011-05-10 08:40:58 +02:00
326dffbc29
[ #290 ] Adding rmagick, making it opt-out
...
using version < 2.0 since later versions do not work w/o backports on Debian Lenny
2011-05-10 08:40:58 +02:00
ddcec2f4a0
[ #290 ] making openid opt-out by adding it to a group
2011-05-10 08:40:58 +02:00
8304c6847a
[ #290 ] loading mocha after shoulda to make sure, that mocha's patches can be properly applied
2011-05-10 08:40:58 +02:00
2ec21614fd
[ #290 ] Removing all vendored gems
2011-05-10 08:40:58 +02:00
ec569be507
[ #290 ] ignoring .rvmrc files
2011-05-10 08:40:58 +02:00
87d8634b04
[ #290 ] using bundler
...
* following setup instructions from http://gembundler.com/rails23.html
* adding generated files to .gitignore and .hgignore
* removing config.gem calls
* adding Gemfile that should work with all supported dbs and interpreters
* removing work-around for rubygems 1.5 deprecation. this seems to be fixed since now bundler handles the gem loading
2011-05-10 08:40:42 +02:00
13de4cc4b0
[ #383 ] Fixed failing tests due to a helper method name conflict (to_utf8)
...
Introduced in 1eee7312f6
2011-05-06 16:38:13 -07:00
d29315341d
[ #196 #216 #216 ] Complete the upgrade to Rails 2.3.11
2011-05-06 15:44:38 -07:00
cd73bd714f
[ #123 ] Fix test error due to un-reloaded object daddy objects
2011-05-06 14:48:11 -07:00
cc0c2165b5
[ #123 ] Fix test on postgres, .first isn't based on ORDER
2011-05-06 14:48:11 -07:00
65953cdc04
[ #123 ] Fix AttachmentsController test from 1f88288
2011-05-06 14:48:11 -07:00
1f8828838e
[ #123 ] Attachment changes need to be prefixed
2011-05-06 14:08:39 -07:00
ebf4584141
[ #380 ] Add example of a cross project wiki link
...
Contributed by Alf Gaida
2011-05-06 11:23:44 -07:00
9f07b2f4b4
Merge pull request #38 from edavis10/ticket/master/324-plugin-generators
...
Rename plugin generators to ChiliProject. #324
2011-05-05 13:14:26 -07:00
bfacd827a8
Removig english strings from RepositoriesHelper
2011-05-05 22:05:41 +02:00
d6da8cadf6
Merge pull request #39 from enderson/326-pt_BR-updates
...
pt-BR updates. #326
2011-05-05 12:27:49 -07:00
87e055cf47
disable browser autocomplete on password fields on user edit view. #360
2011-05-05 21:25:34 +02:00
6fa5eb895f
Merge pull request #47 from schmidt/b/374-url-escaping-in-js-calls
...
Don't HTML-escaped URLs before passing them to the JavaScript helper. #374
2011-05-05 12:00:41 -07:00
800cee548b
Merge pull request #46 from schmidt/b/373-duplicates-in-issue-autocomplete
...
Avoid duplicates in issue autocomplete. #373
2011-05-05 11:55:38 -07:00
5938048e42
Merge pull request #48 from schmidt/b/379-wrong-header-in-wiki-help
...
Fix html_title usage in help views for Ruby 1.9. #379
2011-05-05 11:44:57 -07:00
edb263cd2b
[ #379 ] using html_title properly
2011-05-05 10:54:39 +02:00
6408cddc40
[ #374 ] Not escaping URLs since they are used in a safe CDATA section, where no entity encoding is needed.
2011-05-04 19:28:24 +02:00
dbd6dfc69b
[ #373 ] Refactoring auto_completes#issues action
...
hoping to make it more intention revealing
2011-05-04 19:12:56 +02:00
8509212991
[ #373 ] Adding test and fix for duplicates in issue autocompleter
2011-05-04 19:01:15 +02:00
7cd96b6a6f
Merge branch 'f/362-introduce-help-controller'
2011-05-02 14:38:04 -07:00
0b7b564a34
adding basic test, to make sure, nothing breaks
2011-05-02 15:24:11 +02:00
913c60f71c
Fixing typo
2011-05-02 15:06:41 +02:00
Eric Davis
Adam Soltys
Gregor Schmidt
Felix Schäfer
Simon COURTOIS
Felix Schäfer