7022 Commits (a144b41cc69ecc4eca42e901a0aa393ec22c59c0)

 

All Branches   

Search

Author	SHA1	Message	Date
Philipp Tessenow	25d101c1a4	Merge commit 'd677b0f' into feature/rails3_merge	12 years ago
Philipp Tessenow	effb8e0909	Merge commit '57e7d73' into feature/rails3_merge ... Conflicts: app/assets/images/chosen/chosen-sprite.png app/assets/javascripts/application.js app/assets/javascripts/chosen.js app/assets/stylesheets/chosen.css app/helpers/application_helper.rb app/views/layouts/base.html.erb config/routes.rb	12 years ago
Philipp Tessenow	6f96b1fd67	Revert "backports CVE-2013-0155" ... Fix is included in latest rails This reverts commit 1b27c78edb.	12 years ago
Philipp Tessenow	27107cf41c	Merge commit '524aa2f' into feature/rails3_merge	12 years ago
Philipp Tessenow	33092f1c56	Merge commit '239cdf7' into feature/rails3_merge ... Conflicts: app/models/mail_handler.rb	12 years ago
Philipp Tessenow	645b265270	Merge commit '8bfc52a' into feature/rails3_merge	12 years ago
Philipp Tessenow	8bb75666c3	Merge commit 'f1ae269' into feature/rails3_merge	12 years ago
Philipp Tessenow	956f319eac	Merge commit '09c8c45' into feature/rails3_merge ... Conflicts: app/models/mail_handler.rb	12 years ago
Philipp Tessenow	655f394910	Merge commit 'f3d9d9b' into feature/rails3_merge ... Conflicts: app/assets/stylesheets/default/application.css.erb	12 years ago
Philipp Tessenow	fd6420fb1f	Merge commit '3fcf87e' into feature/rails3_merge ... Conflicts: config/environment.rb config/initializers/10-patches.rb	12 years ago
Philipp Tessenow	671e825504	Revert "Backported fix for CVE-2012-5664" ... The security fix is included in newest Rails releases. This reverts commit b6d165bd87.	12 years ago
Philipp Tessenow	852b2621bb	Merge commit 'd975b83' into feature/rails3_merge	12 years ago
Philipp Tessenow	a1fcb8f414	Use ActiveSupport::Inflector.transliterate should instead of I18n.transliterate	12 years ago
Philipp Tessenow	50ac08de42	Merge commit '7a32bcd' into feature/rails3_merge	12 years ago
Philipp Tessenow	dcb817ab73	Merge commit 'ec37b04' into feature/rails3_merge ... Conflicts: app/models/journal.rb config/routes.rb lib/plugins/acts_as_journalized/lib/journal_formatter.rb test/integration/routing_test.rb	12 years ago
Martin Czuchra	4104f501ce	Merge pull request #31 from opf/fix/wiki_journals_after_2.3.17 ... removes explicit casting of changes to yaml	12 years ago
Jens Ulferts	e28a52e05a	removes explicit casting of changes to yaml ... Journal changes are serialized anyway. This double serialization worked fine until a security risk was identified and a fix for that was created which prevents already serialized data to be serialized again (rails 2.3.17)	12 years ago
Philipp Tessenow	53c5034c8b	Merge commit '233d0c9' into feature/rails3_merge ... Conflicts: Gemfile	12 years ago
Philipp Tessenow	43ad2c8b27	Merge commit '22eb508' into feature/rails3_merge	12 years ago
Philipp Tessenow	437ee1f4fe	Merge commit '64dd7a9' into feature/rails3_merge	12 years ago
Philipp Tessenow	d4a1fa1dfc	deactivate the setup script for now	12 years ago
Philipp Tessenow	175986f205	Merge commit 'f55283a' into feature/rails3_merge	12 years ago
Philipp Tessenow	6114976ff8	Merge commit '055a01b' into feature/rails3_merge	12 years ago
Philipp Tessenow	1854eacd6f	Merge commit '4e1296c' into feature/rails3_merge	12 years ago
Philipp Tessenow	f92a511192	Merge commit 'aa7b584' into feature/rails3_merge ... Conflicts: app/views/help/wiki_syntax.html.erb	12 years ago
cratz	3c3fbb0a92	Merge pull request #30 from opf/rails/2.3.17 ... updates rails to 2.3.17	12 years ago
Jens Ulferts	0dd5553af9	updates rails to 2.3.17	12 years ago
Philipp Tessenow	89a41fbc1d	Revert "test the ci with disabled transactional fixtures" ... This reverts commit fdf7608404.	12 years ago
Philipp Tessenow	fdf7608404	test the ci with disabled transactional fixtures	12 years ago
Philipp Tessenow	faff457c80	bundle update rails	12 years ago
ulferts	5345c0f8f9	Merge pull request #24 from opf/feature/index-on-project-identifier ... Adds index to identifier field on projects.	12 years ago
Philipp Tessenow	66139c2f95	refactored application_helper test to be more robust with wiki pages	12 years ago
Martin Czuchra	4eb461fbd2	Adds index to identifier field on projects.	12 years ago
Philipp Tessenow	86df804f7d	Revert "ci-test - revert this later" ... This reverts commit 7d59d5f3cb.	12 years ago
Philipp Tessenow	7d59d5f3cb	ci-test - revert this later	12 years ago
Philipp Tessenow	e460fb60ba	set html-class 'new' only for actually new wiki pages	12 years ago
Philipp Tessenow	ad4893cf8b	set correct status for anonymous user in user_factory	12 years ago
Philipp Tessenow	d92d03efe4	added issue_relation factory	12 years ago
Philipp Tessenow	df4db5c7a5	make admin, anonymous, and deleted_user a subclass of the user factory	12 years ago
Philipp Tessenow	71d31a5f43	WIP first attempt to fix user mailer tests	12 years ago
Philipp Tessenow	360369fbc8	refactor a single test in issue_test.rb to use FactoryGirl	12 years ago
Jens Ulferts	f439d892cb	fixes issue diff link when having a relative_url_root defined ... Because relative_url_root gets applied along with Setting.host_name having the same root when constructing the link the root is included two times in the resulting link. This is accounted for with this fix. There is a better method of doing so but this would require OpenProject to use rails 3.2 and we are not there yet.	12 years ago
Jens Ulferts	4e4bc603f6	sets rails to 2.3.16	12 years ago
Philipp Tessenow	ddc6cdec54	force message to update its watchers and watcher_users when creating a new watcher in its after_create hook	12 years ago
Philipp Tessenow	8ec06df04c	refactor timelog_helper_test	12 years ago
Philipp Tessenow	df4be748f3	add factories for TimeEntryActivities	12 years ago
Philipp Tessenow	a62e3adc32	Merge branch 'feature/rails3' of github.com:opf/openproject into feature/rails3	12 years ago
Philipp Tessenow	1a29a1ce99	refactor member_tests	12 years ago
Philipp Tessenow	c14eb536d5	implement possible_watchers on things that can be watched	12 years ago
ulferts	d677b0f48c	Merge pull request #18 from finnlabs/fix/project-jump-behaviour ... Fixes project jumping behaviour.	12 years ago