Commit Graph

402 Commits

Author SHA1 Message Date
Alexander Machehin aa959496c9 Merge branch 'master' into 369-bootstrap
Conflicts:
	app/views/projects/build_lists/show.html.haml
	app/views/shared/_build_results.html.haml
2014-06-02 19:46:58 +06:00
Alexander Machehin 8a574e13a3 [#369] update build list page 2014-05-31 01:38:48 +06:00
Alexander Machehin 4ad974b829 [#369] changed build list info to the table 2014-05-29 00:30:06 +06:00
Alexander Machehin bbb62b1213 [#369] build list page 2014-05-28 23:06:56 +06:00
Alexander Machehin 77374a9be0 [#369] customize top menu; add submenu content 2014-05-28 19:14:15 +06:00
Alexander Machehin afb6afaf06 [#369] remove unneeded styles 2014-05-27 12:48:19 +06:00
Alexander Machehin 7eb5b5e395 [#369] monitoring page; some fixes 2014-05-26 23:42:27 +06:00
Vokhmin Alexey V ea62617ed5 #388: Updated UI 2014-05-21 01:15:06 +04:00
Alexander Machehin 508085306c [#369] remove rounded corners from the top menu 2014-05-06 19:06:17 +06:00
Alexander Machehin 2ef938a389 [#369] refactoring; add pagination 2014-05-06 15:51:04 +06:00
Alexander Machehin 8d211e5a75 [#369] remove ngTable; update all issues table 2014-05-06 01:16:15 +06:00
Alexander Machehin 5075486405 [#369] remove codemirror highlighting 2014-04-29 13:19:08 +06:00
Alexander Machehin ae7de6776d Merge branch '369-remove_codemirror' into 369-bootstrap
Conflicts:
	config/environments/production.rb
2014-04-17 13:15:10 +06:00
Alexander Machehin fe96da0eea [#369] add resize 2014-04-15 22:36:40 +06:00
Alexander Machehin d66d9accaf Merge branch '369-remove_codemirror' into 369-bootstrap
Conflicts:
	Gemfile
	Gemfile.lock
	vendor/assets/javascripts/old-codemirror.js
	vendor/assets/javascripts/old-codemirror/keymaps/emacs.js
	vendor/assets/javascripts/old-codemirror/keymaps/vim.js
	vendor/assets/javascripts/old-codemirror/modes/clike.js
	vendor/assets/javascripts/old-codemirror/modes/clojure.js
	vendor/assets/javascripts/old-codemirror/modes/coffeescript.js
	vendor/assets/javascripts/old-codemirror/modes/css.js
	vendor/assets/javascripts/old-codemirror/modes/diff.js
	vendor/assets/javascripts/old-codemirror/modes/gfm.js
	vendor/assets/javascripts/old-codemirror/modes/go.js
	vendor/assets/javascripts/old-codemirror/modes/groovy.js
	vendor/assets/javascripts/old-codemirror/modes/haskell.js
	vendor/assets/javascripts/old-codemirror/modes/htmlembedded.js
	vendor/assets/javascripts/old-codemirror/modes/htmlmixed.js
	vendor/assets/javascripts/old-codemirror/modes/javascript.js
	vendor/assets/javascripts/old-codemirror/modes/jinja2.js
	vendor/assets/javascripts/old-codemirror/modes/less.js
	vendor/assets/javascripts/old-codemirror/modes/lua.js
	vendor/assets/javascripts/old-codemirror/modes/markdown.js
	vendor/assets/javascripts/old-codemirror/modes/mysql.js
	vendor/assets/javascripts/old-codemirror/modes/ntriples.js
	vendor/assets/javascripts/old-codemirror/modes/pascal.js
	vendor/assets/javascripts/old-codemirror/modes/perl.js
	vendor/assets/javascripts/old-codemirror/modes/php.js
	vendor/assets/javascripts/old-codemirror/modes/plsql.js
	vendor/assets/javascripts/old-codemirror/modes/python.js
	vendor/assets/javascripts/old-codemirror/modes/r.js
	vendor/assets/javascripts/old-codemirror/modes/rpm-changes.js
	vendor/assets/javascripts/old-codemirror/modes/rpm-spec.js
	vendor/assets/javascripts/old-codemirror/modes/rst.js
	vendor/assets/javascripts/old-codemirror/modes/ruby.js
	vendor/assets/javascripts/old-codemirror/modes/rust.js
	vendor/assets/javascripts/old-codemirror/modes/scheme.js
	vendor/assets/javascripts/old-codemirror/modes/shell.js
	vendor/assets/javascripts/old-codemirror/modes/smalltalk.js
	vendor/assets/javascripts/old-codemirror/modes/sparql.js
	vendor/assets/javascripts/old-codemirror/modes/stex.js
	vendor/assets/javascripts/old-codemirror/modes/tiddlywiki.js
	vendor/assets/javascripts/old-codemirror/modes/velocity.js
	vendor/assets/javascripts/old-codemirror/modes/verilog.js
	vendor/assets/javascripts/old-codemirror/modes/xml.js
	vendor/assets/javascripts/old-codemirror/modes/xmlpure.js
	vendor/assets/javascripts/old-codemirror/modes/yaml.js
	vendor/assets/javascripts/old-codemirror/overlay.js
	vendor/assets/javascripts/old-codemirror/runmode.js
	vendor/assets/javascripts/vendor.js
	vendor/assets/stylesheets/old-codemirror.scss
	vendor/assets/stylesheets/old-codemirror/modes/diff.scss
	vendor/assets/stylesheets/old-codemirror/modes/rpm-spec.scss
	vendor/assets/stylesheets/old-codemirror/modes/tiddlywiki.scss
	vendor/assets/stylesheets/old-codemirror/themes/cobalt.scss
	vendor/assets/stylesheets/old-codemirror/themes/eclipse.scss
	vendor/assets/stylesheets/old-codemirror/themes/elegant.scss
	vendor/assets/stylesheets/old-codemirror/themes/monokai.scss
	vendor/assets/stylesheets/old-codemirror/themes/neat.scss
	vendor/assets/stylesheets/old-codemirror/themes/night.scss
	vendor/assets/stylesheets/old-codemirror/themes/rubyblue.scss
	vendor/assets/stylesheets/vendor.scss
2014-04-15 19:04:27 +06:00
Alexander Machehin c005d9ca1a [#369] remove comment 2014-04-15 16:27:00 +06:00
Alexander Machehin f23259775e [#369] remove codemirror; use pygments 2014-04-15 15:11:14 +06:00
Vokhmin Alexey V cf479a144d ActiveAdmin integration 2014-04-12 00:29:43 +04:00
Alexander Machehin 1a1838a363 [#369] add templates; add codemirror 2014-04-11 14:57:00 +06:00
Alexander Machehin 09b75e4110 [#369] add new comment & new push notifications 2014-04-08 19:11:34 +06:00
Alexander Machehin 7644a0f4cc [#369] remove angular-busy; add loading-bar 2014-04-04 16:15:15 +06:00
Alexander Machehin c08fd6d569 [#369] add angular spinner; some fixes 2014-04-02 16:33:05 +06:00
Alexander Machehin a0f3225dad [#369] top menu & footer 2014-03-30 19:50:57 +06:00
Alexander Machehin f29eee6d5d [#325] try to fix input 2013-11-20 16:19:41 +06:00
Alexander Machehin 188c3be355 [#325] add abibity to create fork with different name 2013-11-19 17:06:44 +06:00
Vokhmin Alexey V 21f2f83060 small style changes 2013-11-07 00:21:32 +04:00
Vokhmin Alexey V 3b3ca4f7ea #309: added extra_params into BuildList 2013-09-20 22:21:23 +04:00
Alexander Machehin 99975010c7 [#277] refactoring css 2013-09-11 21:40:56 +06:00
Alexander Machehin 758e378b47 [#277] small table border 2013-09-11 16:51:24 +06:00
Alexander Machehin e2c4f9c162 [#277] fix opera styles 2013-09-11 00:01:01 +06:00
Alexander Machehin 5ff87be8a9 [#277] profile projects 2013-09-10 23:03:00 +06:00
Alexander Machehin 7da70b5f12 [#277] profile projects 1 ver. 2013-09-08 17:56:43 +06:00
Alexander Machehin fab3b3c3bb [#107] fix gm styles 2013-09-04 16:17:31 +06:00
Alexander Machehin 01380be9a7 Revert "try stop bots"
This reverts commit e6238a7621.

Conflicts:
	app/assets/stylesheets/devise/registration.scss
2013-08-28 19:35:16 +06:00
Alexander Machehin 5689e36890 one more style 2013-08-27 12:11:13 +06:00
Alexander Machehin e6238a7621 try stop bots 2013-08-26 23:53:03 +06:00
Alexander Machehin 234b0a2075 [#277] refactoring css 2013-08-23 23:15:42 +06:00
Vokhmin Alexey V 61163736f4 Fixed styles 2013-08-15 21:01:25 +04:00
Vokhmin Alexey V 4f8e7ab71e #258: removed advisories backbone JS 2013-08-08 16:16:51 +04:00
Vokhmin Alexey V b59c43b4bd #258: updated Project Collaborators 2013-08-07 22:54:42 +04:00
Vokhmin Alexey V cc1bfb75c2 #258: added AngularJS CollaboratorsController 2013-08-07 20:27:24 +04:00
Vokhmin Alexey V 64b6329fea #251: updated styles 2013-08-05 19:23:25 +04:00
Vokhmin Alexey V 935cda4a0a #251: updated pagination, some refactoring 2013-08-05 16:34:01 +04:00
Vokhmin Alexey V 7873822f3c #251: added border for open group 2013-08-02 21:20:02 +04:00
Vokhmin Alexey V f5c7c2efad #251: added highlight 2013-08-02 19:50:39 +04:00
Vokhmin Alexey V 39ccf5c91d #251: added groups to build_lists 2013-08-02 18:04:16 +04:00
Vokhmin Alexey V 04d6dd12cc #231: Show PlatformArchSetting in table 2013-07-24 19:11:23 +04:00
Vokhmin Alexey V d0e748cce0 #231: added PlatformArchSetting model, migration, updated views 2013-07-24 18:43:41 +04:00
Vokhmin Alexey V 6f67b580c4 #222: added form for creating new branch 2013-07-22 15:27:14 +04:00
Vokhmin Alexey V c79fbbd2d5 Merge branch 'master' into 214-delete-and-restore-branches 2013-07-13 00:31:52 +04:00
Vokhmin Alexey V ffcdd26c66 #214: updated UI of PullRequest#show 2013-07-12 18:21:46 +04:00
Vokhmin Alexey V df40520946 #82: added search form to Contents page 2013-07-08 14:39:44 +04:00
Vokhmin Alexey V f4c0bd8950 Merge branch 'master' into 192-hidden-platforms-and-tokens 2013-07-01 13:37:58 +04:00
Vokhmin Alexey V b7b2a0b2ff #202: added highlighting 2013-06-28 16:32:40 +04:00
Vokhmin Alexey V 0e5e8cfd0b #192: some refactoring of views 2013-06-26 12:08:05 +04:00
Vokhmin Alexey V c501331e52 #192: updated translations, views 2013-06-25 17:56:39 +04:00
Alexander Machehin 9830d0cf62 [#135] small fix button styles 2013-06-11 16:42:53 +06:00
Alexander Machehin 28b12b8c96 [#135] add publish & reject publish action 2013-06-10 17:26:12 +06:00
Vokhmin Alexey V 237bd6affb #156: update UI of MassBuild#new BuildList#new 2013-06-04 23:59:08 +04:00
Vokhmin Alexey V a26aac8463 #114: Split extra repos and build_lists into 2 elements 2013-05-27 22:13:00 +04:00
warpc d092a355a3 Merge pull request #128 from abf/rosa-build:98-common_tracker
[refs #98] common tracker for issues and pull requests
2013-05-16 12:29:14 +04:00
Alexander Machehin 88700c7b26 [#122] fix error messages in the registration page 2013-05-15 18:20:53 +06:00
Alexander Machehin 4a807903ff [#122] Add flash block for guest main page 2013-05-15 18:18:44 +06:00
Alexander Machehin 942d5a669e [#98] add top menu for activity & tracker/pull requests 2013-05-13 22:23:49 +06:00
Alexander Machehin 9d3be37fab fix button text 2013-05-07 21:22:08 +06:00
warpc 8fdcb33a83 Merge pull request #94 from abf/rosa-build:93-support-git-submodule
#93: Support git submodule
2013-04-11 14:15:47 +04:00
warpc 0f95623470 Merge pull request #57 from abf/rosa-build:30-social-login-and-open-registration
[refs #30]: Social login and open registration
2013-04-10 16:52:50 +04:00
Vokhmin Alexey V 511ccbc61a #93: update styles 2013-04-10 13:15:53 +04:00
Alexander Machehin 914a2967c3 Merge branch 'master' into 19-gfm
Conflicts:
	app/views/projects/issues/_issue.html.haml
2013-04-08 17:04:59 +06:00
Vokhmin Alexey V 33bf06659b #78: hot fix styles 2013-04-05 16:50:57 +04:00
Alexander Machehin 7d7df64611 [#19] restore codemirror highlight for comments code 2013-04-05 17:34:22 +06:00
Vokhmin Alexey V aa41f0bf31 #78: update styles for issues and pull_requests pages 2013-04-05 00:25:36 +04:00
Alexander Machehin 50b288b707 [#19] set max size for the image 2013-04-05 01:46:59 +06:00
Vokhmin Alexey V 6e1798729e #30: update styles 2013-04-04 18:19:49 +04:00
Vokhmin Alexey V df56f518b3 Merge branch 'master' into 30-social-login-and-open-registration 2013-04-04 15:51:13 +04:00
Alexander Machehin cac49cf96d Merge branch '19-attach_issue_to_issue' into 19-gfm 2013-04-01 16:31:21 +06:00
Alexander Machehin 3ce1f2e795 [#19] add pygment styles 2013-04-01 16:27:02 +06:00
Vokhmin Alexey V fc52e673d4 update css styles for highlight-line 2013-03-29 17:20:11 +04:00
warpc eefe15d600 Merge pull request #63 from abf/rosa-build:52-highlighting-the-line-which-have-followed-by-link
#52: Highlighting the line which have followed by link
2013-03-29 16:44:31 +04:00
Vokhmin Alexey V 230c46539d #52: added highlighting for multi lines 2013-03-28 18:20:46 +04:00
Vokhmin Alexey V 853284ba8c add z-index to #assigned-popup 2013-03-28 16:10:09 +04:00
Vokhmin Alexey V 390d80a9a2 #52: added highlighting for line 2013-03-28 01:10:34 +04:00
Alexander Machehin 70e37925c6 Merge branch 'master' into 19-attach_issue_to_issue
Conflicts:
	app/assets/stylesheets/design/custom.scss
	db/schema.rb
2013-03-28 00:19:59 +06:00
Vokhmin Alexey V e74e660973 #30: update UI for sign_in and sign_up 2013-03-26 15:52:38 +04:00
Alexander Machehin d737960913 [#19] add issues link from comment 2013-03-26 16:47:42 +06:00
Vokhmin Alexey V 79f428f6d2 #37: merge master into branch 2013-03-25 19:16:06 +04:00
Vokhmin Alexey V 817715b9c4 #40: small refactoring of DOM model 2013-03-22 18:29:18 +04:00
Vokhmin Alexey V 580068f93d #40: rename css class 2013-03-22 17:05:14 +04:00
Vokhmin Alexey V f746b39093 #40: change links to buttons on mass_builds page 2013-03-22 16:58:06 +04:00
Vokhmin Alexey V 770bb48d35 #37: update styles for Issue title 2013-03-22 01:31:39 +04:00
Vokhmin Alexey V 8e21159314 #37: some styles changes 2013-03-22 01:20:36 +04:00
Vokhmin Alexey V 922ab778f4 #37: search user by keyup instead of 'press enter' 2013-03-21 22:14:07 +04:00
Vokhmin Alexey V cff502bf48 #40: added ability to publish build lists of mass build. 2013-03-21 18:41:45 +04:00
Vokhmin Alexey V 26c2a26680 #37: update styles, text message 2013-03-21 14:54:47 +04:00
Vokhmin Alexey V 4261e250e8 #37: updated "assigned" for PullRequests 2013-03-21 00:36:22 +04:00
Vokhmin Alexey V f6ec81bb35 #37: update UI for "Assignee" Issues and PullRequests 2013-03-20 19:06:25 +04:00
Vokhmin Alexey V a92df70c5e #26: update 'font-size' for issue-title, increase count of issues on page 2013-03-20 01:30:35 +04:00
Vokhmin Alexey V 842e30be74 #26: update styles for filters 2013-03-19 19:04:23 +04:00
Vokhmin Alexey V 57a0dbf03b #26: update styles for filters 2013-03-19 18:06:33 +04:00
Vokhmin Alexey V f8fb48a85b #26: remove unnecessary stiles, JS, update PullRequests controller 2013-03-19 16:11:02 +04:00