Commit Graph

402 Commits

Author SHA1 Message Date
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
Vokhmin Alexey V 6145f1753b #26: update styles for issues table 2013-03-18 23:27:15 +04:00
Vokhmin Alexey V 10e6fc1269 update styles for filters on build_lists page 2013-03-13 18:31:35 +04:00
Vokhmin Alexey V 7141db5c34 #3: update styles 2013-03-13 18:01:54 +04:00
Alexander Machehin d85039d5be Support git over ssh: hooks, support gitlab-shell api, UI, refactroing 2013-03-07 14:09:08 +06:00
Vokhmin Alexey V 8e8e24b202 #757: update "font-size" for header of help dialog 2013-02-25 19:57:22 +04:00
Vokhmin Alexey V 826126fb8e #757: update "font-size" of help dialog 2013-02-25 18:49:40 +04:00
Vokhmin Alexey V a3220d3bba #757: update help dialog 2013-02-22 17:44:00 +04:00
Vokhmin Alexey V c6bdb1fc44 #757: some refactoring, move "bootstrap" styles 2013-02-22 15:17:46 +04:00
Vokhmin Alexey V 7a2b547d2b #757: rename #extra_containers to #extra_build_lists 2013-02-22 15:04:14 +04:00
Vokhmin Alexey V 3e9c28e238 #757: merge master into branch 2013-02-22 02:17:20 +04:00
Vokhmin Alexey V e2e3ec06c0 #757: disable publication for main platform if some containers have not been published, update UI 2013-02-22 02:12:37 +04:00
Alexander Machehin 4d6dbb9a74 #921 bigger filter buttons 2013-02-22 01:29:13 +06:00
Alexander Machehin 3593820796 #921 fix css for the new build button 2013-02-22 00:41:33 +06:00
Alexander Machehin f71c3d9171 #921 use opasity 2013-02-21 18:08:43 +06:00
Alexander Machehin fef0ed2534 [refs #921] remove unneeded css 2013-02-21 00:58:46 +06:00
Alexander Machehin 3dda72a0ac Merge branch 'master' into 921-task-monitoring
Conflicts:
	app/assets/javascripts/extra/build_list.js
2013-02-21 00:54:04 +06:00
Alexander Machehin ec25a2f275 [refs #921] remove timepicker addon && some fixes 2013-02-21 00:43:00 +06:00
Alexander Machehin e5db61197e [refs #921] add new filter to the build list monitoring 2013-02-20 21:07:11 +06:00
Vladmir Sharhsov(warpc) dc5555a8d9 temporarily disable new monitoring style 2013-02-19 23:59:45 +04:00
Vokhmin Alexey V 4604ceb318 #757: some refactoring of styles 2013-02-18 20:10:34 +04:00
Vokhmin Alexey V 20691dabc5 #757: add migration, update UI, JS 2013-02-18 19:43:30 +04:00
Alexander Machehin 97f41f58a1 #921 smaller id 2013-02-15 15:56:13 +06:00
Alexander Machehin d585978550 #921 modify task monitoring page 2013-02-14 22:59:52 +06:00
Vokhmin Alexey V b9ed67584f #907: update #tags UI 2013-02-13 23:44:32 +04:00
Vokhmin Alexey V 3302624174 #907: update style 2013-02-13 18:39:16 +04:00
Vokhmin Alexey V fbe7deabb9 #907: fixed styles for Safary 2013-02-13 17:47:46 +04:00
Vokhmin Alexey V 747a0f8f8d #907: update styles 2013-02-13 17:35:54 +04:00
Vokhmin Alexey V c762d2b6e0 #907: update #tags action 2013-02-13 15:23:58 +04:00
Vokhmin Alexey V 3929c4bb57 #907: update #branches UI 2013-02-13 14:25:09 +04:00
Vokhmin Alexey V 77d3a01614 #907: add #branches, #tags actions 2013-02-12 20:35:14 +04:00
Vokhmin Alexey V 8629ae8ca3 #756: update UI 2013-02-06 13:42:34 +04:00
Alexander Machehin 421fa2880c [refs #765] add CodeMirror resizable ability 2013-01-28 14:15:01 +06:00
Alexander Machehin 80921e4237 [refs #762] remove collapse 2012-12-11 18:09:44 +06:00
Alexander Machehin ea542de6f1 [refs #762] change ui 2012-12-11 00:02:34 +06:00
Vokhmin Alexey V 8032437585 remove crontab 2012-11-09 21:56:39 +04:00
Alexander Machehin 6c8c1ca880 Merge branch 'master' into 579-code_line_comments
Conflicts:
	app/assets/stylesheets/design/custom.scss
2012-10-19 18:47:26 +06:00
Julea Pikareva eda6ea4691 [refs #704] Fix height button "Clear" 2012-10-19 16:38:01 +04:00
Julea Pikareva 9c62029f6d [refs #619] Fix long title in the activity feed
not observant
2012-10-19 16:07:19 +04:00
Julea Pikareva 81c80b42e8 [refs #619] Fix long title in activity feed 2012-10-19 15:54:32 +04:00
Julea Pikareva ef77f16fac [refs #619] Fix end-of-line format 2012-10-19 14:38:38 +04:00
Julea Pikareva ad27738ce9 [refs #619] Fix radio-button in Opera 2012-10-19 14:27:14 +04:00
Alexander Machehin 5c7fb21511 [refs #579] add cursor pointer to arrow 2012-10-16 00:16:01 +06:00
Alexander Machehin 548f698526 [refs #579] add a line comment button 2012-10-08 20:42:38 +06:00
Alexander Machehin afa6dd0706 [refs #579] fixed style 2012-10-05 15:39:07 +06:00
Alexander Machehin e085784d51 Merge branch 'master' into 579-code_line_comments
Conflicts:
	app/assets/stylesheets/design/custom.scss
	app/helpers/diff_helper.rb
	app/models/ability.rb
	app/views/projects/comments/_list.html.haml
	app/views/projects/git/commits/_commit_diff.html.haml
	lib/ext/git/inline_callback.rb
2012-10-05 15:32:29 +06:00
Alexander Machehin 527dd210bf [refs #579] alpha version of inline comments for commit 2012-10-05 00:40:12 +06:00
Alexander Machehin 94029c3cda [refs #90] base -> to, head -> from 2012-10-03 17:58:34 +06:00
Vladimir Sharshov d2c338e4e4 Merge pull request #665 from warpc/90-ui
[refs #90] pull request ui + fixes
2012-10-02 10:41:06 -07:00
Vokhmin Alexey V c7fda1a810 #349: updated ability model according to Alexander comments, reverted some changes, added paging for projects on #show page 2012-10-02 19:14:08 +04:00
Alexander Machehin 948e0892bf [refs #90] markdown in create pull 2012-10-01 22:48:26 +06:00
Alexander Machehin 9b9295ba4f [refs #90] change ui on create pull 2012-09-28 23:46:02 +06:00
Vokhmin Alexey V 3fdca32e0e #90: updated styles 2012-09-27 20:59:48 +04:00
Vokhmin Alexey V f41aaecd72 #90: added commits and comments for commits to pull-request discussion 2012-09-27 19:40:19 +04:00
Vokhmin Alexey V 6070c276f6 Merge branch 'master' into 90-pull 2012-09-26 18:33:04 +04:00
Alexander Machehin ccb004bc03 Merge branch 'master' into 579-code_line_comments
Conflicts:
	app/assets/stylesheets/design/custom.scss
2012-09-26 16:27:46 +06:00
Vokhmin Alexey V d54a50e2e0 #90: added line-height style 2012-09-25 19:31:06 +04:00
Vokhmin Alexey V 0299c069c6 #90: style changes for header, increase performanse for #autocomplete_base_project action 2012-09-25 19:18:22 +04:00
Alexander Machehin dfbf8a8d58 Merge branch 'master' into 90-pull
Fucking conflicts:
	app/controllers/projects/issues_controller.rb
	app/models/ability.rb
	app/views/projects/issues/show.html.haml
	config/routes.rb
	db/schema.rb
	lib/tasks/import.rake
	spec/models/comment_for_commit_spec.rb
	vendor/assets/javascripts/bootstrap-tab.js
	vendor/assets/stylesheets/bootstrap.css
2012-09-25 17:55:30 +06:00
Vladimir Sharshov 06099a15b6 Merge pull request #657 from warpc/648-add-filters-to-projects-page
[refs #648]: Filters by owners in projects page
2012-09-25 03:41:11 -07:00
Vokhmin Alexey V 1e468b5073 #648: updated styles, added icons for filters 2012-09-24 22:36:02 +04:00
Vokhmin Alexey V 9be978eb68 #648: updated models, JS, controller according to comments and discussions 2012-09-24 22:04:53 +04:00
Alexander Machehin fc672451c6 [refs #616] small changes in styles 2012-09-24 21:19:50 +06:00
Vokhmin Alexey V 2406423483 #648: added filters to Projects page 2012-09-21 21:57:22 +04:00
Alexander Machehin b5bee35275 Revert "[refs #616] add table styles"
This reverts commit 1818f25de28de0e9efa8d1ae9e22649445d3953d.
2012-09-21 19:23:41 +06:00
Alexander Machehin 855f1f356d [refs #616] remove some inline styles 2012-09-21 18:10:47 +06:00
Alexander Machehin 651be997b3 [refs #616] add table styles 2012-09-21 17:46:44 +06:00
Alexander Machehin a85a95d18a [refs #616] markdown cheat sheet 2012-09-19 23:35:43 +06:00
Alexander Machehin a492367a17 [refs #616] some fixes and refactoring 2012-09-18 16:00:21 +06:00
Alexander Machehin a4c8e8eff8 Merge branch 'master' into 616-issues_and_comments
Conflicts:
	Gemfile
	app/assets/stylesheets/design/custom.scss
	app/controllers/projects/projects_controller.rb
2012-09-17 16:52:50 +06:00
Vokhmin Alexey V bdb3eb288c #633: removed checkbox from name of platform 2012-09-14 02:22:10 +04:00
Vokhmin Alexey V 8d35786183 #641: added is_package checkbox to #new page, updated model 2012-09-12 19:06:34 +04:00
Alexander Machehin 3225274425 [refs #616] change styles 2012-08-31 19:02:03 +06:00
Alexander Machehin d775fa0d08 [refs #616] ugly md preview 2012-08-29 21:24:06 +06:00
George Vinogradov d24a149d9a [issue #620] Added search of maintainer by package 2012-08-24 20:06:59 +04:00
George Vinogradov 84328742e4 [issue #590] Log returns through Rails with `tail -n` 2012-08-17 12:23:49 +04:00
Vladimir Sharshov cada20ed63 Merge branch 'master' into 590-build_list_page_change 2012-08-14 15:46:16 +04:00
George Vinogradov 38e1d0c8ee [issue #590] Added live log to BuildList 2012-08-14 01:41:15 +04:00
Alexander Machehin b2ff7326d1 Merge branch 'master' into 90-pull
Conflicts:
	config/locales/en.yml
	config/locales/ru.yml
2012-08-13 15:01:43 +06:00
George Vinogradov efa08933fd [issue #590] Added average build time to :build_started BuildLists 2012-08-12 02:08:28 +04:00
Vladimir Sharshov 45169faf2f Merge pull request #609 from warpc/590-build_list_page_change
[refs #590] add time notification and periodic page update
2012-08-09 14:49:12 -07:00
George Vinogradov e5e8cc7e7f [issue #590] Changed time representation.
*  Removed buggy jquery.countdown plugin
  *  Page reloads every minute
2012-08-09 20:39:01 +04:00
George Vinogradov 7961bd5fc1 [issue #590] Added missed style. 2012-08-09 01:19:43 +04:00
Alexander Machehin 6a04f4ad7a Merge again branch 'master' into 90-pull
Conflicts:
	db/schema.rb
2012-08-06 11:19:06 +06:00
George Vinogradov a1b7bcac32 [issue #565] Merge branch 'master' into 565-feedback_form
Conflicts:
	app/assets/stylesheets/design/custom.scss
2012-08-03 23:36:14 +04:00
Alexander Machehin 944c6fc0e2 Merge branch 'master' into 90-pull
Conflicts:
	app/assets/stylesheets/design/custom.scss
	app/controllers/projects/git/commits_controller.rb
	app/helpers/git_helper.rb
	app/models/project.rb
	app/views/projects/git/commits/_commit_diff.html.haml
	db/schema.rb
	lib/ext/core/string.rb
2012-07-27 18:37:25 +06:00
Alexander Machehin 9c4db595cb [refs #579] new line comment icon 2012-07-25 22:24:58 +06:00
konstantin.grabar 931e7a22b4 [refs #576] Merge master into 576-flash_notifies 2012-07-24 14:08:34 +04:00
konstantin.grabar 15a86c2ecd [refs #576] Add flash notifies 2012-07-23 18:25:37 +04:00
George Vinogradov 6d046764ef [issue #565] Merge branch 'master' into 565-feedback_form
Conflicts:
	app/assets/stylesheets/design/custom.scss
2012-07-20 20:15:55 +04:00
George Vinogradov d6c65a1626 [issue #565] Added feedback form.
*  Added web pages to send request
*  Added mailer to send feedback message.
2012-07-20 20:06:31 +04:00
Alexander Machehin d130409640 Merge branch 'master' into 90-pull
Conflicts:
	app/assets/stylesheets/design/custom.scss
2012-07-20 15:33:11 +06:00
Alexander Machehin 35b953ac11 [refs #90] add commit/pull lines ref 2012-07-19 22:42:37 +06:00
Alexander Machehin 0ac1f52e31 [refs #569] fixed hr style 2012-07-17 23:43:13 +06:00
Alexander Machehin dc521f5844 [refs #90] link to refs 2012-07-17 22:40:48 +06:00
Alexander Machehin 08534810f6 [refs #569] tuning fork modal 2012-07-17 20:25:02 +06:00
Alexander Machehin cd681ab0ae [refs #569] fixed fork modal 2012-07-17 19:49:13 +06:00
Alexander Machehin 10b828c644 Merge branch 'master' into 90-pull
Conflicts:
	db/schema.rb
	vendor/assets/javascripts/vendor.js
2012-07-10 18:35:49 +06:00
George Vinogradov 3c8b77027e [issue #428] Allowed any update_types when build for released platform. 2012-07-06 03:05:47 +04:00
George Vinogradov e00e88340b [issue #428] Merge branch 'master' into 428-advisory
Conflicts:
	app/assets/stylesheets/design/custom.scss
	db/schema.rb
2012-07-04 03:31:51 +04:00
George Vinogradov 094f25c049 [issue #428] Changed attaching advisory to BuildList.
Removed Chosen. Added text field with incremental search.
2012-07-04 02:52:13 +04:00