openproject

Commit Graph

Author	SHA1	Message	Date
kgalli	638406819a	Merge pull request #3117 from marutosi/patch-1 CVE-2015-1855: update Ruby to 2.1.6	10 years ago
Toshi MARUYAMA	43a6b326da	CVE-2015-1855: update Ruby to 2.1.6 https://www.ruby-lang.org/en/news/2015/04/13/ruby-openssl-hostname-matching-vulnerability/	10 years ago
kgalli	f4c5d109b4	Merge pull request #3036 from jonasheinrich/release/4.0 Updates README.md	10 years ago
Jonas Heinrich	847686a81d	Updates README.md	10 years ago
Jan Sandbrink	d2fafea1fe	Merge pull request #2940 from marutosi/finn/multi_json update multi_json version	10 years ago
Toshi MARUYAMA	a9426a9e98	update multi_json version	10 years ago
Jan Sandbrink	167b5d2cef	Revert "fix factoryGirl screws up rake db:migrate process" This reverts commit `5a0c4bdcad`.	10 years ago
Florian Kraft	4b674680fa	Merge pull request #3003 from NobodysNightmare/feature/avatar_xss avoid XSS through gravatars	10 years ago
Jan Sandbrink	552bdf58e7	avoid XSS through gravatars	10 years ago
Alex Coles	31d4535005	Merge branch 'marutosi-finn/FactoryGirl' into release/4.0	10 years ago
Alex Coles	f1ab01466e	Explicitly require factory_girl_rails in Cuke env Signed-off-by: Alex Coles <alex@alexbcoles.com>	10 years ago
Alex Coles	1700fed51c	Merge branch 'finn/FactoryGirl' of https://github.com/marutosi/openproject into marutosi-finn/FactoryGirl	10 years ago
Sven Uthe	7397ab4d1a	fixed backup task Added another way to read in rails configurations.	10 years ago
Toshi MARUYAMA	5a0c4bdcad	fix factoryGirl screws up rake db:migrate process $ rake db:migrate RAILS_ENV=test rake aborted! ActiveRecord::StatementInvalid: Could not find table 'work_package_journals' http://stackoverflow.com/questions/12423273/factorygirl-screws-up-rake-dbmigrate-process	10 years ago
kgalli	29cd4d537f	Bump version to 4.0.11	10 years ago
Florian Kraft	105934a5f9	Merge pull request #2920 from NobodysNightmare/feature/fix_username_with_space Allow whitespace in username (for LDAP)	10 years ago
Florian Kraft	42563066cd	Merge pull request #2908 from NobodysNightmare/feature/fix_category_filter Re-Enable Category filtering in WP list	10 years ago
Jan Sandbrink	f1a93e1cf3	this is why I hate comments	10 years ago
Jan Sandbrink	c075a7b401	only allow simple space in login also add specs to verify that	10 years ago
TribesTom	2910137c03	Added user changement	10 years ago
Florian Kraft	c0ad28437c	parse categories from api response finish up the groundwork laid out by @NobodysNightmare and actually parse the response fromthe backported api	10 years ago
Jan Sandbrink	a05c0a4e5b	WIP wire up category filters in frontend	10 years ago
Jan Sandbrink	900b2a4c45	Backporting APIv3 categories to OP 4.0 Backport was neccessary to implement missing categories filter without adding more technical debt. These changes will be merged into 4.1 and following branches and vanish in that merge (merge-strategy "ours") YOU SHOULD NOT SEE ANY CONTENTS FROM THIS COMMIT ANYWHERE AFTER 4.0.x! This commit was built from the commits of the GitHub-PR mentioned below, as well as some code dependencies for that. The GitHub-PR was https://github.com/opf/openproject/pull/2505	10 years ago
jonasheinrich	87fa476258	Bump version to 4.0.10	10 years ago
Jan Sandbrink	8007ad5638	Merge pull request #2903 from kgalli/hotfix/add-apiv2-document Add APIv2 documentation	10 years ago
kgalli	34748ca73e	Add APIv2 documentation This document has been public content on community.openproject.org for a while. Since the wiki has been removed the git repository is going to be the new home.	10 years ago
Alex Coles	e61a228fbe	Fix env var typo in CONFIGURATION / HT Stephen Kuehn Bug # 19649 [ci skip]	10 years ago
Alex Coles	304d126ae3	Merge pull request #2849 from marutosi/finn/test_time_format merge test_time_format tests from duplicate names	10 years ago
Alex Coles	95603e9c18	Merge pull request #2852 from marutosi/finn/request_store update request_store to 1.1.0	10 years ago
Alex Coles	d9b14829bf	Merge pull request #2881 from marutosi/finn/ldap-test-doc recovery ldap test doc	10 years ago
Toshi MARUYAMA	6b6292e7c4	recovery ldap test doc Revert "Update RUNNING_TESTS.rdoc to point to a wiki page" This reverts commit `e68a869d2d`.	10 years ago
Jan Sandbrink	7406c8a755	Merge pull request #2874 from marutosi/finn/slapd.conf-tabs [skip ci] replace tabs to spaces at test/fixtures/ldap/slapd.conf	10 years ago
Alex Coles	6a74c65548	Merge pull request #2871 from marutosi/finn/rmagick remove rmagick from .travis.yml	10 years ago
Toshi MARUYAMA	a51e9932ce	[skip ci] replace tabs to spaces at test/fixtures/ldap/slapd.conf	10 years ago
Alex Coles	3f024c3ccc	Merge pull request #2868 from marutosi/finn/lib/tasks/code.rake [ci skip] adapt Rails3 path of code.rake vendor	10 years ago
Toshi MARUYAMA	5dfaffeacb	remove rmagick from .travis.yml	10 years ago
Toshi MARUYAMA	a17066988a	[ci skip] adapt Rails3 path of code.rake vendor	10 years ago
Alex Coles	21280f1868	Merge pull request #2854 from marutosi/finn/release/4.0/README.md/travis [release/4.0] fix README.md travis branch	10 years ago
Toshi MARUYAMA	9c5c696a0a	[release/4.0] fix README.md travis branch	10 years ago
Toshi MARUYAMA	ba67f6aeeb	update request_store to 1.1.0	10 years ago
Toshi MARUYAMA	dce66ad9d4	merge test_time_format tests from duplicate names /home/travis/.rvm/rubies/ruby-2.1.5/lib/ruby/2.1.0/test/unit/testcase.rb:28:in `method_added' : test/unit warning: method Redmine::I18nTest#test_time_format is redefined (StandardWarning)	10 years ago
Alex Coles	fb954a13b8	Merge pull request #2846 from marutosi/finn/fix/svn-typo fix wrong default scm_subversion_command of doc/CONFIGURATION.md	10 years ago
Alex Coles	518d659d6e	Merge pull request #2845 from marutosi/finn/fix/redcloth-typo fix typo at lib/redcloth3.rb	10 years ago
Toshi MARUYAMA	62a4299f32	fix wrong default scm_subversion_command of doc/CONFIGURATION.md	10 years ago
Toshi MARUYAMA	9bd1fdd8d7	fix typo at lib/redcloth3.rb git-svn-id: http://svn.redmine.org/redmine/trunk@13091 e93f8b46-1217-0410-a6f0-8f06a7374b81	10 years ago
Alex Coles	e42f778e04	Merge pull request #2833 from marutosi/finn-gitignore-gemlock remove commented out Gemfile.lock from .gitignore	10 years ago
Oliver Günther	c3be047337	Fix work package CSS rule affecting syntax highlighter In the dynamic work package sidebar, user comments are addressed by CSS using span.comment in _activities_tab.sass. Unfortunately, this exact rule is CodeRay picks up the same rule, which causes the syntax highlighting of comments to be wrong. This commit renames the WP rule to .user-comment instead. Relevant work package: https://community.openproject.org/work_packages/19638 Conflicts: karma/tests/work_packages/tabs/user-activity-directive-test.js public/templates/work_packages/tabs/_user_activity.html	10 years ago
Toshi MARUYAMA	ffd90feb0d	remove commented out Gemfile.lock from .gitignore	10 years ago
linki	b09f9198d5	Merge pull request #2792 from machisuji/fix/back_to_logout_19410 19410 Fix back to logout	10 years ago
Markus Kahl	560d970b0f	in-regex comments	10 years ago

1 2 3 4 5 ...

17963 Commits (638406819a46f970d563af1358e8dcce65733773) All Branches Search

17963 Commits (638406819a46f970d563af1358e8dcce65733773)

All Branches