Commit Graph
25 Commits
Author SHA1 Message Date
Job van der Voort d4a7036b8e remove useless nested form from admin group edit form 2014-03-21 08:26:39 +01:00
Job van der Voort 123d7dc0e2 add submit to fieldset so form is submittable 2014-03-20 14:58:27 +01:00
Dmitriy Zaporozhets 3915b4b9e0 Improve group edit page for admins
Add autocomplete selectbox for ldap group name.
Fixed align of LDAP settigs block

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-11 10:24:44 +02:00
Dmitriy Zaporozhets 2df9a76042 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into 6_5_ce
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
	VERSION
	app/assets/stylesheets/generic/common.scss
	app/views/projects/edit.html.haml
	config.ru
	db/schema.rb
	doc/install/installation.md
	doc/update/6.0-to-6.1.md
	doc/update/6.1-to-6.2.md
	lib/gitlab/upgrader.rb
2014-01-21 18:15:49 +02:00
Dmitriy Zaporozhets 95e6a5dcd3 Fix admin forms UI
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-10 14:39:45 +02:00
Dmitriy Zaporozhets 5fa805a7ba Restyle issue form. Replace inputs
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-01 22:11:18 +02:00
Dmitriy Zaporozhets d7a48443ce alert-error to alert-danger
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-31 16:34:14 +02:00
Dmitriy Zaporozhets 010a770b3f Migrate forms and inputs pt1
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-31 02:50:36 +02:00
Dmitriy Zaporozhets 16eb3ac360 Update form classes
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-31 01:27:02 +02:00
Dmitriy Zaporozhets 4e77b0b52d Merge branch '6-3-stable' of dev.gitlab.org:gitlab/gitlabhq into release/6-3
Conflicts:
	Gemfile.lock
	VERSION
	app/assets/javascripts/api.js.coffee
	app/models/user.rb
	app/views/help/index.html.haml
	doc/install/installation.md
	doc/update/5.4-to-6.0.md
	doc/update/6.0-to-6.1.md
	doc/update/6.1-to-6.2.md
	lib/api/api.rb
	lib/api/entities.rb
	lib/gitlab/ldap/user.rb
	lib/tasks/gitlab/check.rake

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-29 10:01:43 +02:00
David Pursehouse 20ea670e67 Remove "is" from labels 2013-10-18 13:28:49 +09:00
Dmitriy Zaporozhets 9ff730254a Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq
Conflicts:
	db/schema.rb
2013-08-12 13:47:02 +03:00
Dmitriy Zaporozhets 915315a460 ldap_access field added to group. set ldap group membership based on ldap_access value 2013-08-09 12:53:52 +03:00
Dmitriy Zaporozhets b2152847b1 Replace xlarge and xxlarge classes 2013-08-07 23:40:29 +03:00
Dmitriy Zaporozhets 49fa9907ae use control-group classes for inline forms in admin area 2013-08-07 23:20:10 +03:00
Dmitriy Zaporozhets 7fe779b86f Add/remove user to appropriate groups based on LDAP settings 2013-08-05 15:15:58 +03:00
Dmitriy Zaporozhets 36fd4de825 Replace page_title with page-title. Correct margin for some blocks/layouts 2013-07-13 08:45:48 +03:00
Dmitriy Zaporozhets 1af2aeffc8 Minor usability improvements 2013-04-18 17:28:09 +03:00
Andrew8xx8 d3f042a6f2 Css classes improved 2013-02-28 18:35:27 +04:00
Andrew8xx8 9f45e01e84 Description to groups added 2013-02-28 17:14:21 +04:00
Dmitriy Zaporozhets b742f47e89 remove old alert messages 2013-01-30 16:53:18 +02:00
Dmitriy Zaporozhets 033aa1a885 refactor buttons pt1 2013-01-29 22:18:19 +02:00
Dmitriy Zaporozhets 44209861e8 Allow group path renaming. Dont show project transfer if no permissions. More danger messages :) 2012-12-14 06:14:05 +03:00
Dmitriy Zaporozhets ba74fa1413 Remove some bugs. Add warnings for renaming group. Add ability to cahnge group owner. 2012-12-03 21:14:05 +03:00
Dmitriy Zaporozhets 224fb5770c Added ability to manage groups from admin 2012-10-03 12:49:43 +03:00