8091 Commits (14f9c847a6e4b8f8b64b1c33264241f02ce151bf)

 

All Branches   

Search

Author	SHA1	Message	Date
Philipp Tessenow	d5e28e4469	Merge remote-tracking branch 'origin/master' into feature/rails3_merge ... Conflicts: app/models/wiki_content.rb	12 years ago
Philipp Tessenow	d8d02fcaf1	Merge commit '3c3fbb0' into feature/rails3_merge ... Conflicts: config/environment.rb	12 years ago
Philipp Tessenow	9e02d12b94	Merge commit '5345c0f' into feature/rails3_merge	12 years ago
Philipp Tessenow	400bc1eb89	Merge commit 'f439d89' into feature/rails3_merge	12 years ago
Philipp Tessenow	307dd8e94b	Merge commit '4e4bc60' into feature/rails3_merge ... Conflicts: config/environment.rb	12 years ago
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
Jens Ulferts	e61b9b1351	uses a journal cache to render the history ... See the comment for some details. We should think about moving this into a different place like the controller or the User.current. Doing so would provide us with a request cache that can be reused for multiple purposes. However this might cause serious memory issues.	12 years ago
Jens Ulferts	89db6011e8	switches to join concatenation (as it was faster in my test)	12 years ago
Jens Ulferts	78fefce03b	moves issue tree row rendering into helper ... The partial was using content_tag methods anyway so readability was not improved by using a partial vs. a helper. Additionally the partial contained a lot of non view related ruby code. That and the fact that partials are expensive lead to moving it into a helper.	12 years ago
Jens Ulferts	e3be06f320	allows journal formatters to receive options and uses it to be able to ... pass an object cache For now it is only used by the NamedAssociation Formatter. The formatter requires to read a lot of model objects.	12 years ago
Jens Ulferts	892799d780	adds a very simple cache to cache arbitrary model objects ... yields a block with object_klass and object_id to be able to cope with not finding an object.	12 years ago
Jens Ulferts	db265d3123	adds a journaled_class method ... That way we do not have to load the class or do some magic parsing names when wanting to now what is journaled.	12 years ago
Jens Ulferts	747196f9b1	removes outdated comment	12 years ago
Jens Ulferts	74e21f7770	refactors querying for assignable users ... It is still not as fast as it should be. Even after refactoring it takes 1-2 seconds before the answer is calculated (used to be 5-6).	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
Jens Ulferts	cfd1412d4e	removes css rules no longer needed	12 years ago
Jens Ulferts	2ef3828ef0	applies proper css class to calendar filter header	12 years ago