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
bfacd827a8
Removig english strings from RepositoriesHelper
2011-05-05 22:05:41 +02:00
bdc7325a82
Merge branch 'master' into unstable
...
Conflicts:
doc/CHANGELOG.rdoc
2011-05-01 13:58:02 -07:00
9d13deee46
Merge branch 'release-v1.3.0'
2011-05-01 13:56:36 -07:00
07772e7eb7
Bump version to 1.3.0
2011-05-01 13:09:15 -07:00
db89e91927
Update Changelog for 1.3.0 release
2011-05-01 12:47:16 -07:00
afe5a2b2e8
Merge branch 'ticket/master/347-execution-after-redirect'
2011-05-01 12:31:43 -07:00
614bad89a5
Merge branch 'ticket/unstable/310-skip-issue-mail-notifications' into unstable
...
Conflicts:
config/locales/en.yml
test/unit/journal_test.rb
2011-04-29 08:46:13 -07:00
d2973a641e
[ #347 ] Fix potential Execution After Redirect bugs
...
Execution After Redirect (EAR) happens when redirect in a controller is
triggered but there still is code that is executed in the action.
Contributed by Adam Doupé
2011-04-28 14:39:19 -07:00
72cd7f2049
[ #347 ] Add missing fixture when running a focused test
2011-04-28 14:22:29 -07:00
65692235a4
[ #352 ] Use ChiliProject on error pages
2011-04-26 15:19:44 -07:00
b1ed5e4c7d
Merge acts_as_journalized to unstable. #123
2011-04-23 21:25:52 +02:00
d02d8e7e17
Merge remote-tracking branch 'schmidt/b/346-fix-invalid-yaml' into unstable
2011-04-21 13:08:52 -07:00
90987ca34e
[ #346 ] Fixing polish and swedish translations to work with psych
2011-04-21 13:24:49 +02:00
31d292ce95
[ #346 ] Fixing hebrew translations to work with psyc
2011-04-21 13:21:13 +02:00
50faef3712
[ #346 ] also fixing errornous string starting with %
2011-04-21 12:04:04 +02:00
3b7ea67a99
[ #346 ] changing i18n files to use valid yaml syntax that may be parsed by psych
2011-04-21 11:47:32 +02:00
61f0e67c0d
Upgrade tests to new journals type.
2011-04-21 11:46:00 +02:00
ef8141a2c1
Remove deprecated journals tests and controller.
2011-04-21 11:45:31 +02:00
d4adcae569
Update the Issue#show.api to new journals type
2011-04-21 11:44:55 +02:00
Eric Davis
Adam Soltys
Gregor Schmidt
Simon COURTOIS
Felix Schäfer