18937 Commits (b8b7c512f9bb7b8dcabc7fc91dead7408afc5d5d)

 

All Branches   

Search

Author	SHA1	Message	Date
Oliver Günther	f4b70ddf4e	Added empty body to please snowcrash	10 years ago
Oliver Günther	084f15ab44	Extend apiv3 blueprint for user (un-)locking ... With OmniAuth, we now have external services authenticate users in an asnychronous manner. With this change, proper means to manage the status based from these services become a necessity. Particularly, deleting and locking users based on outer events are a requirement for timely account administration. As the API(v3) already provides the functionality to remove user accounts, this commit suggests an extension to provide locking and unlocking user accounts through the API.	10 years ago
ulferts	a8a90dcb00	Merge pull request #2400 from opf/feature/npm-shrinkwrap-dev ... Lock down dev dependencies w/npm shrinkwrap too	10 years ago
Alex Coles	452a4d965c	Merge pull request #2398 from opf/feature/add_localization_for_id ... adds i18n for id	10 years ago
Alex Coles	afefa1e817	Document shrinkwrap workflow in DEVELOP ... Signed-off-by: Alex Coles <alex@alexbcoles.com>	10 years ago
Alex Coles	01efb3d58e	Lock down dev dependencies w/npm shrinkwrap too ... See 67d95139. Signed-off-by: Alex Coles <alex@alexbcoles.com>	10 years ago
ulferts	b672569a1c	Merge pull request #2399 from opf/fix/spec_stability ... increase spec stability by waiting for modal	10 years ago
Jens Ulferts	cf44eee0ee	increase spec stability by waiting for modal	10 years ago
Jens Ulferts	d79806bafe	adds i18n for id	10 years ago
Alex Coles	1715578281	Merge pull request #2396 from opf/feature/update_roar ... update roar to 1.0.0	10 years ago
Jens Ulferts	f9baee0bb7	update roar to 1.0.0	10 years ago
Alex Coles	6571905708	Merge branch 'release/4.0' into dev	10 years ago
Alex Coles	1057cc2201	Merge pull request #2395 from opf/hotfix/no_sort_in_session ... no longer use sort criteria of session for wp index	10 years ago
Alex Coles	b388d1eeef	Merge pull request #2394 from opf/fix/fix-karma-webpack-version ... Stay on karma-webpack 1.3.x	10 years ago
ulferts	28a5cdbfe2	Merge pull request #2327 from opf/fix/specify_null_links ... Specify null links	10 years ago
Alex Coles	f5f51e6e67	Stay on karma-webpack 1.3.x ... Use stricter ~ prefix for specifying version. 1.4.x does not appear to be compatible with our Webpack/Karma config. Signed-off-by: Alex Coles <alex@alexbcoles.com>	10 years ago
Jens Ulferts	e844362a8e	no longer use sort criteria of session for wp index ... This is not supported by the frontend so the information displayed was inconsistent.	10 years ago
Jens Ulferts	4a60c2a7b2	Revert "Merge pull request #2372 from 0xF013/feature/17263-save-button-conditions-fix" ... This reverts commit 6d88d71c81, reversing changes made to 0b6a2c7ad0.	10 years ago
Alex Coles	6154c63abe	Merge pull request #2379 from opf/fix/date-time-directive-test-cleanup-hook ... Clean-up (unset locale) after each dateTime test	10 years ago
Alex Coles	eb738cd4fa	Merge pull request #2393 from marutosi/finn/pry-byebug ... Gemfile: use no version mri for pry-byebug	10 years ago
Toshi MARUYAMA	0cc763330b	Gemfile: use no version mri for pry-byebug ... PR #2386	10 years ago
jonasheinrich	6cf3138206	Merge pull request #2392 from opf/feature/update-copyright-header-2015 ... Update year in copyright header to 2015	10 years ago
Alex Coles	e0191e759c	Update year in copyright header to 2015 ... [ci skip]	10 years ago
Alex Coles	4912d56f7a	Merge pull request #2390 from 0xF013/feature/migrate/relations-to-ui-select ... migrate relations to ui-select	10 years ago
Mihail Maxacov	b423201f08	migrate relations to ui-select	10 years ago
Alex Coles	6d88d71c81	Merge pull request #2372 from 0xF013/feature/17263-save-button-conditions-fix ... fix save button display conditions	10 years ago
Mihail Maxacov	1c3076701e	fix save button display conditions	10 years ago
Alex Coles	a040e523ba	Clean-up (unset locale) after each dateTime test ... Signed-off-by: Alex Coles <alex@alexbcoles.com>	10 years ago
Alex Coles	0b6a2c7ad0	Fix missing dependency after bad merge (4ece85c3) ... Signed-off-by: Alex Coles <alex@alexbcoles.com>	10 years ago
Alex Coles	b219b6d307	Fix dateTime directive test for dfc241b3 changes ... Signed-off-by: Alex Coles <alex@alexbcoles.com>	10 years ago
Alex Coles	4ece85c316	Merge branch 'release/4.0' into dev ... Signed-off-by: Alex Coles <alex@alexbcoles.com> Conflicts: app/assets/javascripts/angular/openproject-app.js	10 years ago
Alex Coles	d6708a0e57	Give function added in dfc241b3 a better name ... Signed-off-by: Alex Coles <alex@alexbcoles.com>	10 years ago
Alex Coles	f5609c7fd9	Merge pull request #2378 from 0xF013/hotfix/17069/dates-in-wp-table-displayed-in-german-when-english-language-settings-selected ... fix dates in wp table displayed in german when english language setting selected	10 years ago
Mihail Maxacov	dfc241b3e1	fix dates in wp table displayed in german when english language setting selected	10 years ago
Alex Coles	3f4c6619d2	Merge pull request #2376 from 0xF013/feature/17647-available-status-options-not-updated-when-removing-relation ... fix relation removal not triggering workpackage update	10 years ago
Mihail Maxacov	93867a20b3	Merge pull request #2377 from opf/feature/angular-1.3.8 ... Bump Angular to 1.3.8	10 years ago
Alex Coles	426af66fcb	Bump Angular to 1.3.8 ... Signed-off-by: Alex Coles <alex@alexbcoles.com>	10 years ago
Mihail Maxacov	270f1544b1	fix relation removal not triggering workpackage update	10 years ago
kgalli	4ce5d9fd63	Merge pull request #2374 from opf/feature/cucumber-default-formatter-progress ... Tell Cucumber to use progress Formatter by default	10 years ago
Alex Coles	9b9362644c	Tell Cucumber to use progress Formatter by default ... This makes more sense for most use cases, especially CI. Signed-off-by: Alex Coles <alex@alexbcoles.com>	10 years ago
Alex Coles	29f0f32501	Merge branch 'release/4.0' into dev ... Signed-off-by: Alex Coles <alex@alexbcoles.com> Conflicts: spec/features/work_packages/select_work_package_row_spec.rb	10 years ago
Alex Coles	cf68ece757	Merge pull request #2371 from opf/hotfix/wp_sorting_by_not_selected_column ... add sort criteria to columns joined to query	10 years ago
Jens Ulferts	fe6f30ab32	add sort criteria to columns joined to query	10 years ago
Alex Coles	a14cf46fe5	Merge pull request #2370 from 0xF013/bug/17805-fix-flickering-protractor-tests ... 17805 fix flickering protractor tests	10 years ago
Alex Coles	196bb8729f	Merge pull request #2350 from opf/feature/access_control_refactor ... replacing instance variables	10 years ago
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
Mihail Maxacov	e07004b268	add waitForAngular call after page.get()	10 years ago
Mihail Maxacov	42cd05efbc	increase protractor timeouts	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