18736 Commits (6e11dc44c437985ba85529b262c326213b608be2)

 

All Branches   

Search

Author	SHA1	Message	Date
Jens Ulferts	6e11dc44c4	Merge branch 'release/4.0' into dev ... Conflicts: app/controllers/work_packages_controller.rb app/models/work_package/csv_exporter.rb spec/controllers/work_packages_controller_spec.rb	10 years ago
ulferts	561be6e39d	Merge pull request #2366 from TribesTom/hotfix/fix_csv_export ... Hotfix/fix csv export	10 years ago
Alex Coles	f5a83411c8	Merge pull request #2368 from opf/fix/packager-npm-bower-missing-dependencies ... Remove (unused) rimraf as dev dependency	10 years ago
Alex Coles	21c7e7ef8a	Merge pull request #2367 from opf/fix/clean-npm-shrinkwrap ... Clean unnecessary properties in npm-shrinkwrap.json	10 years ago
Alex Coles	05ff6bfe56	Merge branch '0xF013-feature/17683-migrate-to-ui-select' into dev	10 years ago
Alex Coles	93908d0633	Specify ui-select as runtime (non-dev) dependency ... Signed-off-by: Alex Coles <alex@alexbcoles.com>	10 years ago
Alex Coles	1aa170530e	Merge branch 'feature/17683-migrate-to-ui-select' of https://github.com/0xF013/openproject into 0xF013-feature/17683-migrate-to-ui-select	10 years ago
ulferts	5f596d54af	Merge pull request #2364 from opf/fix/attachment_tests ... make attachment specs more realistic	10 years ago
TribesTom	5972ccd75f	Merge pull request #1 from opf/hotfix/fix_wp_csv_export ... Hotfix/fix wp csv export	10 years ago
Alex Coles	8adb2e4b2c	Remove rimraf as (unused) dev dependency ... rifraf is required by Bower. Having rifraf specified as our own dev dependency stopped it from being installed correctly on npm install when invoked with the `--production` flag and in the presence of an `npm-shrinkwrap.json` (since 67d95139). Signed-off-by: Alex Coles <alex@alexbcoles.com>	10 years ago
Alex Coles	3fc4a5971d	Commit latest npm-shrinkwrap.json ... Signed-off-by: Alex Coles <alex@alexbcoles.com>	10 years ago
Alex Coles	cc428bc30c	Add script to clean up npm-shrinkwrap.json ... Script stolen verbatim from Angular JS project. See: dd3587a8c1 See also previous commit 71fed757. This should be fixed upstream in npm: https://github.com/npm/npm/issues/3581 Signed-off-by: Alex Coles <alex@alexbcoles.com>	10 years ago
Alex Coles	71fed75797	Clean unnecessary properties in npm-shrinkwrap.json ... Apparently npm shrinkwrap is not idempotent. This allows for clean diffs. See https://github.com/npm/npm/issues/3581 See also commit comment: e5dd832b20 Signed-off-by: Alex Coles <alex@alexbcoles.com>	10 years ago
Jens Ulferts	fdae20f2c8	refactor to reduce complexity	10 years ago
Jens Ulferts	18279b9b5f	set export title to query or default	10 years ago
Jens Ulferts	aec124e459	remove unused variable	10 years ago
Jens Ulferts	dda5c4e866	whitespace/styling fixes	10 years ago
Mihail Maxacov	6cf3a1593a	change status to ui.select	10 years ago
Jonas Heinrich	77d795cda6	updates npm shrinkwrap	10 years ago
Openproject	3cadf8fdd1	Bug fix CVS is fixed	10 years ago
Openproject	2a78f2f20a	Bug CVS is fixed	10 years ago
Martin Linkhorst	964ff49007	make attachment specs more realistic ... the sent params to not match the ones that are actually sent when running the server. change them to mirror the real world better	10 years ago
Mihail Maxacov	5b4bdaeee9	revert bower.json unneeded changes	10 years ago
Mihail Maxacov	a4095103cf	change tests selector for ui.select; fix minor issues	10 years ago
Mihail Maxacov	574a4f0024	migrate assignee and responsible to ui.select	10 years ago
ulferts	dcfb0c2cad	Merge pull request #2357 from 0xF013/feature/6462-display-filter-operator-when-adding-filter ... fix display filter operator when adding filter	10 years ago
ulferts	8da530350f	Merge pull request #2347 from 0xF013/feature/refactor-inplace-editor-view ... refactor inplace editor switch	10 years ago
Jan Sandbrink	b981cee3f7	fix aglio warning	10 years ago
Mihail Maxacov	979b247817	refactor inplace editor switch	10 years ago
Alex Coles	87f2782050	Merge pull request #2349 from opf/feature/restructure_redmine.rb ... splits redmine.rb into initializers	10 years ago
Mihail Maxacov	cd3b7475c6	fix display filter operator when adding filter	10 years ago
Alex Coles	860cc29256	Merge pull request #2356 from tessi/bug/fix_update_browser_translation ... Fix misleading upgrade-browser translation	10 years ago
Philipp Tessenow	ba7b9a627c	Fix misleading upgrade-browser translation ... We were told that our browser is not supported, when in fact the browser **version** is not supported. This issue was raised in https://crowdin.com/translate/openproject/19/en-da#11749 by the fellow translator Mogelbjerg. All praise goes to him :)	10 years ago
Alex Coles	8bd7875fe6	Merge branch 'release/4.0' into dev ... Signed-off-by: Alex Coles <alex@alexbcoles.com> Conflicts: lib/redmine/wiki_formatting/textile/formatter.rb	10 years ago
Alex Coles	32b25ef333	Merge pull request #2354 from opf/hotfix/syntax_highlight ... rename syntax highlight class	10 years ago
Jens Ulferts	d8f313faed	rename syntax highlight class	10 years ago
Alex Coles	0e5b656ca0	Merge pull request #2340 from opf/fix/17748-unable-to-open-modal-more-once ... 17748 Update angular-modal: fix opening modal more than once	10 years ago
Alex Coles	4d1c9c7df4	Update angular-modal commit ... Fixes support for Angular 1.3 ($animate API changes). See: https://github.com/btford/angular-modal/pull/30 See: https://github.com/finnlabs/angular-modal/pull/2 Bug # 17748 Signed-off-by: Alex Coles <alex@alexbcoles.com>	10 years ago
Alex Coles	9d16886b7a	Switch to Finnlabs fork of angular-modal ... Signed-off-by: Alex Coles <alex@alexbcoles.com>	10 years ago
Alex Coles	c8c6da42c7	Merge branch 'release/4.0' into dev	10 years ago
Alex Coles	6740baefc0	Merge pull request #2353 from opf/hotfix/icon_positioning_in_themes ... Revert "Bring in legacy styles with require directive"	10 years ago
Jens Ulferts	e7c229ed62	Revert "Bring in legacy styles with require directive" ... The change is in conflict with the themes. As themes import the default.css.sass again in order to have their styles applied to the rules, the complete css should be handled by saas. Otherwise, files handled via sprockets are not included as an include will not contain "require" files. This reverts commit 240c7eeb88. Conflicts: app/assets/stylesheets/default.css.sass	10 years ago
ulferts	1e81d16bac	Merge pull request #2351 from opf/fix/minor-api-v3-spec-issues ... Fix various issues with API v3 request specs	10 years ago
Alex Coles	6c3671ad61	Correct Work Package API spec to use query strings ... Signed-off-by: Alex Coles <alex@alexbcoles.com>	10 years ago
Alex Coles	472be05c63	Fix POSTing empty body in Work Package Form spec ... Signed-off-by: Alex Coles <alex@alexbcoles.com>	10 years ago
Alex Coles	743dfb8e5b	Merge pull request #2335 from 0xF013/feature/overview-cleanup ... 17684 wp details overview cleanup	10 years ago
Alex Coles	fa43f2f8cb	Merge pull request #2346 from opf/fix/17437_activity_comment_and_details_as_formattable ... 17437 Activity comment and details as formattable	10 years ago
Jens Ulferts	6ed300af16	splits redmine.rb into initializers	10 years ago
Mihail Maxacov	342cb717e8	refactor overview-related protractor tests	10 years ago
Mihail Maxacov	6d5debadd6	refactor wp details overview	10 years ago