3625 Commits (859bfa625dc18728691aa2df196b2fa113edad75)

 

All Branches   

Search

Author	SHA1	Message	Date
Tim Felgentreff	859bfa625d	Merge branch 'master' of git://github.com/edavis10/redmine into master-journalized ... Conflicts: app/models/wiki_content.rb app/views/wiki/history.rhtml config/locales/bg.yml config/locales/ca.yml config/locales/de.yml test/integration/api_test/projects_test.rb	14 years ago
Tim Felgentreff	d6013c62f7	fix a couple more tests	14 years ago
Eric Davis	7e359d3d7e	Add a Email Header setting. Useful for adding delimiters to every email. ... #2852 #6628 git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4362 e93f8b46-1217-0410-a6f0-8f06a7374b81	14 years ago
Eric Davis	0395eb99de	Remove email quotes (>) when searching for incoming email delimiters. #2852 #6628 ... Changes the email truncation so a delimiter can be prefixed by email quotes or spaces ("> Eric said..."). This will let it be combined with a "--- Reply above ---" delimiter to match "> --- Reply above ---" git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4361 e93f8b46-1217-0410-a6f0-8f06a7374b81	14 years ago
Eric Davis	a04d64881c	Refactor: convert username/password http basic auth api tests to shoulda macros #6447 ... git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4360 e93f8b46-1217-0410-a6f0-8f06a7374b81	14 years ago
Jean-Baptiste Barth	27049b848d	Use File#expand_path for require's in script/* for Ruby 1.9.2 compatibility. #4050 ... Since Ruby 1.9.2, LOAD_PATH does not include "." directory anymore, so we should use absolute paths instead to ensure both 1.8.x and 1.9.x compatibility. It has been included in railties 2.3.x branch since july 2009, see 7a427a83ca git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4359 e93f8b46-1217-0410-a6f0-8f06a7374b81	14 years ago
Eric Davis	bed79f523b	Refactor: convert api key tests to shoulda macros for reuse. #6447 ... git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4358 e93f8b46-1217-0410-a6f0-8f06a7374b81	14 years ago
Eric Davis	d5fde17bf5	Move all API tests into the ApiTest module to make management easier ... git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4357 e93f8b46-1217-0410-a6f0-8f06a7374b81	14 years ago
Jean-Philippe Lang	db2ecd3010	Fixed: "Template is missing" error when validation fails on version edit (#6766). ... git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4354 e93f8b46-1217-0410-a6f0-8f06a7374b81	14 years ago
Jean-Philippe Lang	ba56b3f763	Provides a default string for untranslated search types. ... git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4353 e93f8b46-1217-0410-a6f0-8f06a7374b81	14 years ago
Eric Davis	b2eeeb6fa0	Bump version to 1.0.3 ... git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4349 e93f8b46-1217-0410-a6f0-8f06a7374b81	14 years ago
Eric Davis	147a16cbf8	Update changelog for v1.0.3 ... git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4348 e93f8b46-1217-0410-a6f0-8f06a7374b81	14 years ago
Jean-Baptiste Barth	7c5497db65	Add a label for user and group search fields. #6521 ... Contributed by Felix Schäfer git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4312 e93f8b46-1217-0410-a6f0-8f06a7374b81	14 years ago
Jean-Baptiste Barth	abb83f4c4f	Added ability to create issue directly as a subtask of another one. #5484 ... Contributed by Felix Schäfer git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4311 e93f8b46-1217-0410-a6f0-8f06a7374b81	14 years ago
Jean-Baptiste Barth	f8b79c52cb	Force color to be disabled on git shell-outs. #5324 ... Contributed by Felix Schäfer git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4310 e93f8b46-1217-0410-a6f0-8f06a7374b81	14 years ago
Jean-Baptiste Barth	55cf64393d	Fixed Redmine.pm not working with LDAPS on a non-standard port. #4065 ... Contributed by Fabian Schlenz git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4309 e93f8b46-1217-0410-a6f0-8f06a7374b81	14 years ago
Jean-Baptiste Barth	31b9868fc1	Updated wiki-syntax help page to reflect new link options and last coderay upgrade. #5948 ... Contributed by Holger Just and Mischa The Evil git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4308 e93f8b46-1217-0410-a6f0-8f06a7374b81	14 years ago
Jean-Baptiste Barth	c91ca4fcd9	Fix wikilinks in project > settings > versions and version view. #6435 #4416 ... Contributed by Mischa The Evil and Felix Schäfer. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4307 e93f8b46-1217-0410-a6f0-8f06a7374b81	14 years ago
Jean-Baptiste Barth	1cf67b3a1d	Fixed: disabling autologin not persisted. #6438 ... Contributed by Felix Schäfer git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4306 e93f8b46-1217-0410-a6f0-8f06a7374b81	14 years ago
Azamat Hackimov	5d6245b059	Translation update (zh-TW, #6765) ... git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4305 e93f8b46-1217-0410-a6f0-8f06a7374b81	14 years ago
Azamat Hackimov	8dc0d4b916	Translation update (he, #6569) ... git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4304 e93f8b46-1217-0410-a6f0-8f06a7374b81	14 years ago
Eric Davis	c514dd6885	Refactor: convert WikiController to a REST resource ... git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4303 e93f8b46-1217-0410-a6f0-8f06a7374b81	14 years ago
Jean-Baptiste Barth	e7e7a91b85	Fixed potential nil method errors when trying to access /issues/context_menu with GET. #6750 ... git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4302 e93f8b46-1217-0410-a6f0-8f06a7374b81	14 years ago
Azamat Hackimov	6ffcbaa7b3	Translation update (ru) ... git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4301 e93f8b46-1217-0410-a6f0-8f06a7374b81	14 years ago
Azamat Hackimov	1b1a059d90	Fixing "Kilobyte" prefix to kB (#6740) ... git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4300 e93f8b46-1217-0410-a6f0-8f06a7374b81	14 years ago
Azamat Hackimov	d41391e87a	Readding string field_start_date (#6629) ... git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4299 e93f8b46-1217-0410-a6f0-8f06a7374b81	14 years ago
Azamat Hackimov	8ebe03ef86	Translation update (de, #6607) ... git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4298 e93f8b46-1217-0410-a6f0-8f06a7374b81	14 years ago
Azamat Hackimov	cc9d356a55	Translation updates ... * bg (#6669) * ja (#6732) * mk (#6731) * sv (#6739) * zh-TW (#6736) git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4297 e93f8b46-1217-0410-a6f0-8f06a7374b81	14 years ago
Eric Davis	e9efa5b981	Refactor: use :id instead of :page when linking to Wiki Pages ... git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4296 e93f8b46-1217-0410-a6f0-8f06a7374b81	14 years ago
Tim Felgentreff	fe33a89c76	fix issue_test	14 years ago
Tim Felgentreff	9bb45d9e75	Fix journal_observer	14 years ago
Tim Felgentreff	1a2aa363bd	fix journal observer tests, remove journal observer	14 years ago
Tim Felgentreff	8c5312e0ec	more merge fixups	14 years ago
Tim Felgentreff	5310327c8a	fix merge f*ckup	14 years ago
Tim Felgentreff	19c7dc0094	Merge remote branch 'edavis/master' into master-journalized ... Conflicts: app/controllers/application_controller.rb app/controllers/wiki_controller.rb app/helpers/issues_helper.rb app/models/time_entry.rb app/models/wiki_content.rb app/views/wiki/edit.rhtml config/locales/ja.yml test/functional/wiki_controller_test.rb	14 years ago
Tim Felgentreff	8cece46dd4	Merge branch 'master' into master-journalized ... Conflicts: app/controllers/application_controller.rb app/controllers/context_menus_controller.rb app/controllers/gantts_controller.rb app/controllers/issue_moves_controller.rb app/controllers/issues_controller.rb app/controllers/journals_controller.rb app/controllers/previews_controller.rb app/controllers/timelog_controller.rb app/helpers/issues_helper.rb app/helpers/journals_helper.rb app/models/issue.rb app/models/journal.rb app/models/journal_observer.rb app/views/admin/projects.rhtml app/views/context_menus/issues.html.erb app/views/issues/_action_menu.rhtml app/views/issues/_history.rhtml app/views/news/_news.rhtml app/views/news/index.rhtml app/views/repositories/diff.rhtml config/locales/bg.yml config/locales/bs.yml config/locales/ca.yml config/locales/cs.yml config/locales/da.yml config/locales/de.yml config/locales/el.yml config/locales/en-GB.yml config/locales/es.yml config/locales/eu.yml config/locales/fi.yml config/locales/fr.yml config/locales/gl.yml config/locales/he.yml config/locales/hr.yml config/locales/hu.yml config/locales/id.yml config/locales/it.yml config/locales/ko.yml config/locales/lt.yml config/locales/lv.yml config/locales/mn.yml config/locales/nl.yml config/locales/no.yml config/locales/pl.yml config/locales/pt-BR.yml config/locales/pt.yml config/locales/ro.yml config/locales/ru.yml config/locales/sk.yml config/locales/sl.yml config/locales/sr-YU.yml config/locales/sr.yml config/locales/sv.yml config/locales/th.yml config/locales/tr.yml config/locales/uk.yml config/locales/vi.yml config/locales/zh-TW.yml config/locales/zh.yml config/routes.rb doc/CHANGELOG lib/redmine.rb lib/redmine/export/pdf.rb lib/redmine/helpers/gantt.rb lib/redmine/version.rb public/stylesheets/application.css test/functional/context_menus_controller_test.rb test/functional/issues_controller_test.rb test/functional/journals_controller_test.rb test/functional/previews_controller_test.rb test/functional/users_controller_test.rb test/functional/wiki_controller_test.rb test/integration/routing_test.rb test/unit/issue_test.rb test/unit/mailer_test.rb test/unit/query_test.rb	14 years ago
Eric Davis	70bf0706b2	Refactor: convert WikiController#destroy to use HTTP DELETE ... git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4295 e93f8b46-1217-0410-a6f0-8f06a7374b81	14 years ago
Eric Davis	17eab0f5f9	Fix wiki links on the activity page. #6746 ... git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4294 e93f8b46-1217-0410-a6f0-8f06a7374b81	14 years ago
Eric Davis	c399e76324	Add Redmine::Plugin.installed?(:name) method to check if a plugin is installed ... git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4293 e93f8b46-1217-0410-a6f0-8f06a7374b81	14 years ago
Eric Davis	397222f198	Allow adding notes when moving issues ... git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4292 e93f8b46-1217-0410-a6f0-8f06a7374b81	14 years ago
Eric Davis	22e3cba0b7	Allow changing the Priority when moving issues. ... git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4291 e93f8b46-1217-0410-a6f0-8f06a7374b81	14 years ago
Eric Davis	4b045badcf	Refactor: Rename WikiController#page_index to #index ... index is the action that should list a collection of records, which is what #page_index does. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4290 e93f8b46-1217-0410-a6f0-8f06a7374b81	14 years ago
Eric Davis	0e951c0716	Fix the tests that were broken by r4286: ... "Refactor: merged error rendering methods." http://ci.finn.de/builds/1-8-7_redmine-trunk_mysql/4286 git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4289 e93f8b46-1217-0410-a6f0-8f06a7374b81	14 years ago
Jean-Philippe Lang	d9f2bccf70	Adds a user-agent to reposman (#6735). ... git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4288 e93f8b46-1217-0410-a6f0-8f06a7374b81	14 years ago
Jean-Baptiste Barth	d642964035	Fixed: auto links ending with right angle bracket shouldn't include the bracket in the URL. #5652 ... git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4287 e93f8b46-1217-0410-a6f0-8f06a7374b81	14 years ago
Jean-Philippe Lang	7824eca775	Refactor: merged error rendering methods. ... git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4286 e93f8b46-1217-0410-a6f0-8f06a7374b81	14 years ago
Jean-Philippe Lang	eea456ed84	Improved error message when trying to access an archived project (#2995). ... git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4285 e93f8b46-1217-0410-a6f0-8f06a7374b81	14 years ago
Jean-Philippe Lang	1e4776fa64	Updated french translation. ... git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4284 e93f8b46-1217-0410-a6f0-8f06a7374b81	14 years ago
Jean-Philippe Lang	a29c35e08f	Makes zoom buttons on gantt looks like the others. ... git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4283 e93f8b46-1217-0410-a6f0-8f06a7374b81	14 years ago
Eric Davis	0ca74df604	Refactor: move method to model with compatibility wrapper ... git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4282 e93f8b46-1217-0410-a6f0-8f06a7374b81	14 years ago