7969 Commits (d783dc46b5cd0a95732888c683ffb23a1446f8a1)

 

All Branches   

Search

Author	SHA1	Message	Date
jwollert	d783dc46b5	autocompletion for roles and members in project settings, now with infinite scrolling ... Conflicts: Rakefile app/controllers/members_controller.rb app/models/principal.rb app/models/role.rb app/views/layouts/base.rhtml app/views/members/_new_member_form.rhtml public/javascripts/members_select_boxes.js public/stylesheets/select2_customizing.css Conflicts: app/views/layouts/base.rhtml public/javascripts/members_select_boxes.js don't need to mark members form as 'new'. everyone will see cause it's awesome Conflicts: app/views/projects/settings/_members.rhtml Conflicts: app/views/members/_new_member_form.rhtml Conflicts: app/views/projects/settings/_members.rhtml Conflicts: app/views/members/_member_form_non_impaired.rhtml app/views/projects/settings/_members.rhtml Conflicts: app/controllers/members_controller.rb app/views/layouts/base.rhtml app/views/members/_autocomplete_for_member.rhtml app/views/members/_member_form_impaired.rhtml Conflicts: app/controllers/members_controller.rb app/views/layouts/base.rhtml public/javascripts/application.js Conflicts: app/assets/images/suche_lupe.png app/controllers/members_controller.rb app/views/members/_autocomplete_for_member.rhtml app/views/projects/settings/_members.rhtml public/images/search_magnifier.png public/images/suche_lupe.png public/stylesheets/application.css public/stylesheets/select2_customizing.css Conflicts: config/locales/de.yml config/locales/en.yml	11 years ago
jwollert	6bd45259e9	reformatting the new member form inside project settings ... Conflicts: app/views/members/_member_form.rhtml app/views/projects/settings/_members.rhtml public/stylesheets/application.css Conflicts: app/views/projects/settings/_members.rhtml Conflicts: app/views/projects/settings/_members.rhtml public/stylesheets/application.css Conflicts: app/views/projects/settings/_members.html.erb Conflicts: app/views/projects/settings/_members.html.erb Conflicts: app/views/projects/settings/_members.html.erb	11 years ago
jwollert	26bff02cc7	starting on infinite scrolling of select2 inside members form. member itself might be working, roles are definitely not ... Conflicts: app/controllers/members_controller.rb app/models/principal.rb Conflicts: app/controllers/members_controller.rb removes deprecated test for autocompletion Conflicts: Gemfile app/views/members/_new_member_form.rhtml public/javascripts/members_select_boxes.js Conflicts: Gemfile Conflicts: Gemfile test/functional/members_controller_test.rb	11 years ago
jwollert	b8aaa2bd64	adjusting focus color for select2 container ... Conflicts: public/stylesheets/application.css public/stylesheets/select2_customizing.css Conflicts: public/stylesheets/application.css public/stylesheets/select2_customizing.css	11 years ago
jwollert	2467c89e2f	removes dead code formatting divs we don't want to format ... Conflicts: public/stylesheets/application.css	11 years ago
Philipp Tessenow	53b9d102ba	Merge pull request #224 from opf/feature/rails3_fix_travis ... Gemfile: Remove pry from test group	11 years ago
Michael Frister	5cbc0506f4	Cukes: Fix debugging without pry in test bundler group	11 years ago
Michael Frister	8980fab85b	Travis: Don't install development dependencies, begin with cukes ... Cukes take longest, so begin with them. This should improve total duration for one build. [ci skip]	11 years ago
Michael Frister	0c32c542e2	Gemfile: Remove pry out of test group, explicily add rspec ... Travis fails to install debugger, which regularly has to be updated for new Ruby versions. Travis told us to remove debugger from the test group, which not only saves installing it when running tests on CI, but also should make debugger not break our CI runs in the future. The only downside I see is, that running pry from tests might require loading pry before using it, so 'binding.pry' becomes 'require "pry"; binding.pry'.	11 years ago
sschu	3f1c6716f9	Merge pull request #114 from opf/fix/rails3-members-edit ... Fixes Members Edit Button	11 years ago
ulferts	500edafb9b	Merge pull request #214 from opf/feature/move_responsible_association ... Move responsible association to work package	11 years ago
cratz	d0105c8291	Merge pull request #220 from opf/feature/rails3_fix_ci_scenario_disabler ... Moved back to the old version of disabling scenarios hoping the ci does ...	12 years ago
Sebastian Schuster	cc5a06d651	Moved back to the old version of disabling scenarios hoping the ci does not complain anymore	12 years ago
Philipp Tessenow	6bf458e954	Merge pull request #218 from opf/feature/rails3_changelog ... Add changelog with new format, remove old changelog	12 years ago
Michael Frister	398c056aa0	Add changelog with new format, remove old changelog	12 years ago
Niels Lindenthal	9913365f75	Update CHANGELOG.rdoc	12 years ago
jwollert	7429b3983c	Merge branch 'feature/rails3' of github.com:opf/openproject into feature/rails3	12 years ago
jwollert	23e3a030d1	removes debugger statement	12 years ago
Hagen Schink	f6d2ca321e	Move responsible association to work package	12 years ago
Johannes Wollert	83d649a9a2	Merge pull request #212 from opf/fix/timelines_pagination ... updated pagination api to v2.	12 years ago
ulferts	9ce439d12c	Update RUNNING_TESTS.md ... fix typo	12 years ago
Johannes Wollert	2b5bba77d5	Merge pull request #211 from opf/fix/broken_application_js ... fixes broken application.js	12 years ago
Nils Kenneweg	6026db5bac	Merge pull request #210 from opf/feature/move_responsible_association ... Move responsible association to work package	12 years ago
cratz	ba1935a90a	Merge pull request #208 from opf/feature/rails3_fix_scenario_disabler ... Scenariodisabler now uses skip_invoke! to skip scenarios and	12 years ago
Nils Kenneweg	c3de2dd008	updated pagination api to v2.	12 years ago
Nils Kenneweg	ce6afcb794	fixes broken application.js	12 years ago
jwollert	e785a042a0	hide adding a member inside membertab of project settings behind a step	12 years ago
Hagen Schink	1db2adea3f	Fix randomly failing language spec	12 years ago
jwollert	5c9e0cdd0d	move membership deletion step to the rest of the member steps	12 years ago
Jens Ulferts	dcce9d5f52	adds translations for created_/updated_on	12 years ago
Jens Ulferts	a372909c2f	adapts time_entry step to work_package	12 years ago
Christian Ratz	ccdfff1da5	update special version	12 years ago
Hagen Schink	5d7c859545	Merge pull request #195 from opf/feature/rails3_sti_pe_issue	12 years ago
cratz	fba68125f3	Merge pull request #191 from opf/feature/rails3_force_password_reset ... Add option to force a user to change the password on the next login	12 years ago
cratz	de6c6595da	Merge pull request #207 from opf/feature/jquery-ajax-indicator ... ajax indicator fix.	12 years ago
sschu	c3b21f0859	Merge pull request #205 from opf/feature/rails3_added_hooks_for_admin_info ... Added hooks to admin info view	12 years ago
Nils Kenneweg	7b51a60bb4	removed comment...	12 years ago
Michael Frister	85eeaa0a3b	Fix username not being shown on my/password page ... Also add test for username on forced password change form.	12 years ago
Christian Ratz	0ca018a014	Added hooks to admin info view ... - one on top and one on bottom - added headlines for the different parts	12 years ago
Nils Kenneweg	163de0b86f	ajax indicator fix.	12 years ago
Jens Ulferts	d9144b3394	Merge branch 'feature/rails3' into feature/rails3_sti_pe_issue	12 years ago
Jens Ulferts	463bc78489	sets work_package label to issue for now	12 years ago
Michael Frister	c75820a3e1	Don't force password change after using lost password ... Fixes: * don't redirect after login * show login name on my/password page	12 years ago
Sebastian Schuster	ea97537132	Scenariodisabler now uses skip_invoke! to skip scenarios and ... checks for existence of a feature method to maintain compatibility with scenario outlines	12 years ago
Jens Ulferts	1dfb7bc329	disable callback for system user to prevent failing migrations	12 years ago
sschu	6ba93562bc	Merge pull request #204 from opf/feature/rails3_more_reliable_footer_content_helper ... more reliable footer_content helper	12 years ago
cratz	5c04bfa74a	Merge pull request #203 from opf/feature/select2-rails-gem ... remove vendored select2	12 years ago
Jens Ulferts	f72417bb78	i18n for created_/updated_at	12 years ago
Hagen Schink	293f652a5a	Fix general step	12 years ago
cratz	7d1f630a37	Merge pull request #196 from opf/fix/html_calendar_issue ... Calendar Issue Hover Bugfix.	12 years ago