Commit graph

211 commits

Author SHA1 Message Date
Dmitriy Zaporozhets cf8b3692cd Merge pull request #2105 from jouve/improve_admin_views
Improve admin section
2012-11-29 00:39:50 -08:00
Dmitriy Zaporozhets c873cf81f6 Restyled error messages in common way. Added title to head partial 2012-11-28 19:40:54 +02:00
Cyril e0a9ffcdaa Improve admin views for project and groups
* layout: add 'Groups' item to main_menu
* admin/dashboard: add a ui-box for groups
* projects and groups: remove nav tabs
2012-11-28 18:04:28 +01:00
Dmitriy Zaporozhets f5551efdfd Rewrite and improve git backend logic. Fix project movind. Raise exception to prevent unexpected issues 2012-11-27 09:31:15 +03:00
Dmitriy Zaporozhets 70bf7f6e19 Project -> update repo only on create and destroy. Fixtures Updated with namespaces. Fixed moving repo 2012-11-21 08:54:05 +03:00
Dmitriy Zaporozhets 470aa7675e Fix project.code-related functionality 2012-11-23 21:31:09 +03:00
Riyad Preukschas 3e800c3bb1 Refactor GFM JS naming and access 2012-11-21 20:25:49 +01:00
Riyad Preukschas 1cda62465f Fix GFM JS code style 2012-11-21 20:05:37 +01:00
Dmitriy Zaporozhets 0046409970 I prefer icons on header 2012-11-21 08:14:05 +03:00
Dmitriy Zaporozhets 942c410119 Implemented bootstrap 2.2.1.1. Restyled header panel 2012-11-20 23:05:15 +02:00
randx 3c5a3fe0ae Merge branch 'front-end' of https://github.com/NARKOZ/gitlabhq into NARKOZ-front-end
Conflicts:
	app/views/issues/_form.html.haml
2012-10-27 11:24:11 +03:00
Riyad Preukschas ff396e0a7e Extract search field into a partial 2012-10-25 23:39:02 +02:00
Nihad Abbasov 57c134c39a cleanup coffeescript code for mentions auto-complete 2012-10-19 03:41:10 -07:00
Riyad Preukschas e4aa5a5c8f Extract and split GFM auto-completion setup JS
* static initialization and setup moved to assets
* per request initialization moved to layout partial
2012-10-10 00:53:55 +02:00
Dmitriy Zaporozhets d88332709c Fixed group issues/mr. Also speedup project list of admin area 2012-10-04 10:51:35 +03:00
Dmitriy Zaporozhets f963d37408 Merge pull request #1592 from jouve/devise_layout
make devise controllers use devise layout
2012-10-03 07:06:08 -07:00
Dmitriy Zaporozhets 224fb5770c Added ability to manage groups from admin 2012-10-03 12:49:43 +03:00
randx 1b6a3dfec9 Move all stuff to groups controller 2012-10-02 20:42:15 +03:00
Dmitriy Zaporozhets f9eda9b33a Group filtering on dashboard 2012-10-02 19:37:53 +03:00
Cyril 236fd1e63b all devise controller use devise layout 2012-09-29 13:06:53 +02:00
Cyril be18397d82 rename ProjectController to ProjectResourceController 2012-09-27 20:59:42 +02:00
Cyril e563e948bb Merge branch 'master' into simplify_controllers2
Conflicts:
	app/controllers/commits_controller.rb
	app/controllers/refs_controller.rb
2012-09-27 12:25:52 +02:00
Robert Speicher d8f7748dea Remove app_menu and project_menu partials
Now it's consistent across layouts where their main menus are.
2012-09-26 17:00:52 -04:00
Robert Speicher 36f68140d1 Replace various "active tab" checks with nav_link
Also remove now-unused tab_class helper
2012-09-26 16:38:28 -04:00
Robert Speicher 0887dda8e4 Use current ref for Files and Commits if available
Closes #1452
2012-09-26 16:32:25 -04:00
Robert Speicher b62d6a1fe2 Remove commit_tab_class helper 2012-09-26 16:32:25 -04:00
Robert Speicher 86a7864dc7 Fix various links 2012-09-26 16:32:25 -04:00
Robert Speicher 8fe63dab52 Use current_controller? in layouts/_head partial 2012-09-26 16:32:24 -04:00
Robert Speicher 51c1e49900 Change active tab and nav class to "active"
The main nav used active, the sub nav used current. This normalizes it.
2012-09-26 16:32:24 -04:00
Robert Speicher 1048917232 Update usages of project_commit[s] route helpers 2012-09-26 16:32:23 -04:00
Robert Speicher 3574826920 Use Commits#show instead of Commits#index
Takes tree-ish + path as ID
2012-09-26 16:32:22 -04:00
Robert Speicher 79a02df92e Update usages of tree_file_project_ref_path to project_tree_path 2012-09-26 16:32:21 -04:00
Cyril bdf317addc layout selected by controller name 2012-09-26 22:27:44 +02:00
Dmitriy Zaporozhets dc37c8aaae Refactored profile area 2012-09-14 19:13:25 +03:00
Dmitriy Zaporozhets 621affecb5 Merge branch 'master' of https://github.com/funglaub/gitlabhq into funglaub-master
Conflicts:
	Gemfile.lock
	app/helpers/application_helper.rb
	app/views/devise/sessions/new.html.erb
	db/schema.rb
2012-09-12 06:49:52 +03:00
Robert Speicher 3b89f14090 Convert main.js to coffee
Remove duplicate 's' hotkey code
2012-09-09 07:28:41 -04:00
Alex Denisov 09a86bd4d6 Capitlization of /gitlab/i normalized. #1367 2012-09-06 11:21:35 +03:00
Florian Unglaub 48443d20ca Merge branch 'master' of git://github.com/gitlabhq/gitlabhq 2012-08-24 15:25:52 +02:00
randx b2b88b2ff2 Added font for head panel. Major restyle for header 2012-08-20 22:51:37 +03:00
Florian Unglaub a64aff2f1c Omniauth Support 2012-08-17 15:20:55 +02:00
Dmitriy Zaporozhets 05da3801f5 Restyled erros pages & avatar class 2012-08-16 09:13:50 +03:00
Martin Bastien 6641761e5c Fix current class for hooks tab in admin section
Signed-off-by: Martin Bastien <martin.bastien@studiofrenetic.com>
2012-08-15 00:03:13 -04:00
Robert Speicher 7754189187 Fully embrace Ruby 1.9 hash syntax
Didn't bother with files in db/, config/, or features/
2012-08-10 18:25:15 -04:00
Dmitriy Zaporozhets 354d243878 Merge pull request #983 from JamesEarlDouglas/notify-grammar
cleanup the wording of the notification footer
2012-07-28 07:38:17 -07:00
randx 4261acda90 move SSH keys tab closer to begining 2012-07-21 10:27:09 +03:00
Valeriy Sizov c38578428b System Hooks: CRUD has done 2012-07-19 00:25:10 +03:00
Staicu Ionut ba7b85d0d9 issues counter are now live updated on creation/deleteion/reopening
buttons on forms are disabled on submit (re-enabled after the request is complete)
2012-07-10 07:33:04 +03:00
Dmitriy Zaporozhets 4c24cabf47 Merge pull request #1012 from NARKOZ/devise
Add 10 minutes lock after 10 failed login attempts (Devise :lockable)
2012-07-06 08:18:18 -07:00
Nihad Abbasov 2abd054b0c update devise 2012-07-05 23:50:24 -07:00
Dmitriy Zaporozhets 0a6b64e6a9 MR: Handle broken diff ex. in case its too huge 2012-07-05 22:59:37 +03:00