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
Alexander Machehin
d3ac9d1a2c
[ #98 ] Add common issues tracker
2013-04-30 00:14:25 +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
Alexander Machehin
9c2f5eb8e9
Revert "[ #19 ] removed emoji"
...
This reverts commit 957b411154
.
2013-04-10 19:21:02 +06: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
Alexander Machehin
957b411154
[ #19 ] removed emoji
2013-04-10 18:18:41 +06:00
Vokhmin Alexey V
0bc804e69d
#93 : added icon for submodule, fixed messages of Tree, Submodule, Blob
2013-04-10 15:40:11 +04:00
Vokhmin Alexey V
511ccbc61a
#93 : update styles
2013-04-10 13:15:53 +04:00
Alexander Machehin
d2ae28a80b
[ #19 ] again try fix emoji precompile
2013-04-08 21:09:56 +06: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
cec46912a9
#30 : update icon for google
2013-04-04 18:03:10 +04:00
Vokhmin Alexey V
8de8b326d8
#30 : update facebook.png
2013-04-04 15:52:54 +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
4f40327293
#52 : updated JS and rendering discussion in pull_request
2013-03-28 15:04:07 +04:00
Vokhmin Alexey V
274c4d39be
#52 : extra change JS
2013-03-28 14:21:25 +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
79c178357e
#31 : UI: update #project_version field on change project
2013-03-27 17:36:01 +04:00
Vokhmin Alexey V
522e931761
#30 : update icon for facebook
2013-03-26 19:17:26 +04: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
3ea7cfbe32
#37 : remove unnecessary code
2013-03-21 00:48:24 +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
2c56283fba
#26 : fixed search by substring
2013-03-19 19:30:50 +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
f4381b61c6
#26 : update table on issues page with Ajax
2013-03-19 15:57:01 +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
65eae29c87
#12 fixed wrong updating all comments on page
2013-03-07 23:38:29 +06: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
79d81e9c13
#757 : add logic for enable/disable "auto_create_container" field on UI, some refactoring
2013-02-22 14:20:47 +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
Vokhmin Alexey V
46a5b8daad
#757 : enable extra containers and repositories for main platforms
2013-02-21 18:21:58 +04:00
Alexander Machehin
5e0ab5b6af
#921 add id to filter form
2013-02-21 18:23:48 +06:00
Alexander Machehin
b37cb79d9c
#921 remove debug code
2013-02-21 18:14:02 +06:00
Alexander Machehin
f71c3d9171
#921 use opasity
2013-02-21 18:08:43 +06:00
Alexander Machehin
1c4ec45639
[refs #921 ] fix show-hide filter
2013-02-21 01:00:40 +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
65b98a2d00
#757 : update name of methods, API
2013-02-19 19:22:38 +04:00
Vokhmin Alexey V
7cb9b8a85c
#757 : hide "extra repos" for main platforms
2013-02-18 20:23:54 +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
Vladimir Sharshov
0c69326e80
Merge pull request #900 from warpc/898-publish-i686-packages-into-x86_64-repository
...
[refs #898 ]: publish i686 packages into x86 64 repository
2013-02-07 06:57:09 -08:00
Vokhmin Alexey V
e9c023f273
#898 : add "publish_i686_into_x86_64" field into Project, update UI
2013-02-07 15:11:57 +04:00
Vokhmin Alexey V
8629ae8ca3
#756 : update UI
2013-02-06 13:42:34 +04:00
Vokhmin Alexey V
7c23bef412
#881 : update "use_save_to_repository" ckeckbox for main platforms
2013-02-04 15:56:27 +04:00
Vokhmin Alexey V
e9d666877c
#881 : add "use_save_to_repository" into BuildList
2013-02-01 14:00:56 +04:00
Alexander Machehin
421fa2880c
[refs #765 ] add CodeMirror resizable ability
2013-01-28 14:15:01 +06:00
Vokhmin Alexey V
d2a876c9cb
#843 : remove 'latest_' prefix
2013-01-21 21:08:19 +04:00
Vokhmin Alexey V
318007751c
#839 : enable new_core for all platforms
2013-01-17 14:46:51 +04:00
Vokhmin Alexey V
ac762388a4
#800 : enable "new_core" for personal platforms
2012-12-24 16:35:29 +04:00
Alexander Machehin
c6272d4a34
[refs #762 ] fix js fill
2012-12-12 17:05:02 +06:00
Alexander Machehin
fdce6eb325
[refs #762 ] move js code to assets
2012-12-11 20:03:55 +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
Vokhmin Alexey V
8f9cd0ff8a
updated logger on build product page
2012-11-09 21:42:25 +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
Alexander Machehin
9bc9eab4f1
[refs #579 ] remove new comment form after close & fix focus
2012-10-19 18:39:11 +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
a807a22230
[refs #579 ] remove debug code
2012-10-16 14:07:26 +06:00
Alexander Machehin
5c7fb21511
[refs #579 ] add cursor pointer to arrow
2012-10-16 00:16:01 +06:00
Alexander Machehin
1ee9e3f00e
[refs #579 ] fixed updating comment
2012-10-15 18:30:34 +06:00
Alexander Machehin
bb47567628
[refs #579 ] small improvements of the discussion
2012-10-13 00:12:04 +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
eaf29713cc
[refs #90 ] autoload refs
2012-10-01 22:03:08 +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
37c9a906c4
Merge branch '90-pull' into 90-separate-issues-and-pull-requests
2012-09-26 18:45:26 +04:00
Vokhmin Alexey V
6070c276f6
Merge branch 'master' into 90-pull
2012-09-26 18:33:04 +04:00
Vokhmin Alexey V
07b27b934f
#90 : updated #index page for pull-requests
2012-09-26 15:46:23 +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
Alexander Machehin
06e15cf3fa
[refs #616 ] remove unneeded code
2012-09-25 15:47:12 +06: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
2c6d4bae9e
[refs #616 ] add error messages to ajax
2012-09-24 23:34:14 +06:00
Alexander Machehin
fc672451c6
[refs #616 ] small changes in styles
2012-09-24 21:19:50 +06:00
Vokhmin Alexey V
c14f2851e3
#648 : revert changes
2012-09-21 22:04:58 +04: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
b65ca14131
[refs #616 ] small js refactoring
2012-09-21 16:31:55 +06:00
Alexander Machehin
378fe5847e
[refs #616 ] ugly replaces
2012-09-20 23:10:50 +06:00
Alexander Machehin
a85a95d18a
[refs #616 ] markdown cheat sheet
2012-09-19 23:35:43 +06:00
Alexander Machehin
daf845705a
[refs #616 ] comment update
2012-09-19 00:42:22 +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
7bb0ced8cb
#645 : fixed.
2012-09-14 18:49:08 +04:00
Vokhmin Alexey V
6bdaf06d86
#633 : removed unnecessary code
2012-09-14 02:30:54 +04:00
Vokhmin Alexey V
bdb3eb288c
#633 : removed checkbox from name of platform
2012-09-14 02:22:10 +04:00
Vokhmin Alexey V
ba6805598f
#633 : small refactoring
2012-09-13 20:16:13 +04:00
Vokhmin Alexey V
a99bfee4a6
#633 : UI has been updated
2012-09-13 20:08:41 +04:00
Vokhmin Alexey V
8d35786183
#641 : added is_package checkbox to #new page, updated model
2012-09-12 19:06:34 +04:00
Vokhmin Alexey V
71d14e43d6
#631 : fixed misprint
2012-09-06 19:39:26 +04:00
Vokhmin Alexey V
4d1166e6b3
#631 : updated UI and JS validation for build_lists, rewrote migration
2012-09-06 19:34:33 +04:00
Vladimir Sharshov
ff20c0b199
Merge pull request #622 from warpc/620-maintainer_db
...
[refs #620 ] Maintainer DB
2012-08-31 11:50:02 -07: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
Vladimir Sharshov
6bcff5ad6f
Merge pull request #623 from warpc/616-issues_and_comments
...
[refs #616 ] Refactoring and fixed bugs with issue:
* could not remove all labels from issue;
* after update issue body now no need reload page to view changes;
* refactoring issues controller.
2012-08-27 03:46:27 -07:00
Alexander Machehin
2c0826a77d
[refs #616 ] fixed showing body after update
2012-08-25 23:40:51 +06:00
George Vinogradov
d24a149d9a
[issue #620 ] Added search of maintainer by package
2012-08-24 20:06:59 +04:00
George Vinogradov
2fbb72e537
[issue #620 ] Changes in Maintainer db:
...
* Added maintainer selection on project page (see TODO in sources);
* Added `actual` field to BuildList::Package;
* Added rake task to set BuildList::Package.actual field.
Run it after migration (see TODO in sources);
* Packages after publising of BuildList becomes actual;
* Added MaintainerPresenter to avoid long method chains.
2012-08-24 19:21:24 +04:00
George Vinogradov
edd7bcdb6d
[issue #590 ] JS hack to force SelectBox to render.
2012-08-21 01:33:54 +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
ec7d132a3f
[refs #90 ] fixed update commits button
2012-08-08 23:57:03 +06:00
Alexander Machehin
910aac939e
[refs #90 ] fixed changing tabs & anchors
2012-08-08 21:47:58 +06: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
6e598ad5f9
[refs #565 ] fixed feedback image
2012-07-30 20:59:50 +06: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
c0036a1bb5
[refs #576 ] Fix should_show? method and template offsets
2012-07-25 16:41:12 +04: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
b24a4a35b2
[refs #90 ] modify pull tab urls
2012-07-19 00:02:27 +06:00
Alexander Machehin
0ac1f52e31
[refs #569 ] fixed hr style
2012-07-17 23:43:13 +06:00
Alexander Machehin
b9e1f44fe8
[refs #90 ] remove old code
2012-07-17 23:02:55 +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
77a67975b1
[refs #90 ] hide create pull button after change project or refs
2012-07-10 22:07:51 +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
Alexander Machehin
07e02d9a17
[refs #90 ] modified Update commits button
2012-07-10 00:41:39 +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
Alexander Machehin
89abd20c95
Merge branch 'master' into 90-pull
...
Conflicts:
db/schema.rb
2012-07-03 21:22:10 +06:00
konstantin.grabar
10aed58bdd
[refs #442 ] Small refactor. Remove bootstrap collapse
2012-06-28 15:31:25 +04:00
konstantin.grabar
b6d769ad66
[refs #442 ] Change mass builds table
2012-06-27 18:07:05 +04:00
Alexander Machehin
1ffb1b3940
Merge branch 'master' into 90-pull
...
Conflicts:
Gemfile
app/assets/stylesheets/design/custom.scss
app/models/project.rb
db/schema.rb
2012-06-27 16:20:38 +06:00
konstantin.grabar
bdb97b8891
[refs #442 ] Add statistics data to mass builds. Small refactor for report
2012-06-25 19:20:35 +04:00
konstantin.grabar
baec8a1016
[refs #525 ] Fix clear action rights
2012-06-25 18:26:01 +04:00
George Vinogradov
e4f62ea592
[issue #428 ] Added filter by advisory_id to Advisories
2012-06-20 21:51:08 +04:00
konstantin.grabar
904cfca5c9
[refs #529 ] Fix branch set for repository with dot in name
2012-06-19 18:52:29 +04:00
George Vinogradov
ecd4498484
[issue #428 ] Changes in advisories.
...
* Added Many2Many relation between advisories and projects.
* Added autocompletion to build list's advisory
* Bootstrap's JS moved to vendor/
2012-06-19 02:49:17 +04:00
Alexander Machehin
89bc8954e2
[refs #90 ] smaller font for diff
2012-06-08 14:31:33 +06:00
George Vinogradov
e7c0eab736
[issue #428 ] Merge branch 'master' into 428-advisory
...
Conflicts:
app/assets/stylesheets/design/custom.scss
2012-06-04 23:59:00 +04:00
George Vinogradov
abe2b8a30d
[issue #428 ] Work with existing advisories.
...
* Added advisories page to platform
* Added attacing of existing advisories to BuildList.
2012-06-04 23:49:20 +04:00
Alexander Machehin
60aba754ae
[refs #90 ] pull title/body update
2012-05-31 22:57:52 +06:00
Alexander Machehin
11c67fb07d
Revert "[refs #90 ] issue status -> state" & changed state -> status
...
This reverts commit 7470ee76e4783a0fbbd98607406d7b770a2980d1.
Conflicts:
app/controllers/projects/issues_controller.rb
db/migrate/20120412173938_create_pull_requests.rb
db/schema.rb
2012-05-29 16:50:25 +06:00
Vladimir Sharshov
c119ae0d20
Merge pull request #504 from warpc/442-mass_build
...
[refs #442 ] Add sidebar for mass rebuild page in platform
2012-05-28 05:45:48 -07:00
konstantin.grabar
82b5999e32
[refs #442 ] Add sidebar
2012-05-28 14:28:19 +04:00
Vladimir Sharshov
3ed195bb86
Merge pull request #502 from warpc/442-mass_build
...
[refs #442 ] Mass build refactor and fixes
2012-05-28 02:00:30 -07:00
konstantin.grabar
a79d946b6b
[refs #442 ] Mass build refactor and fixes
2012-05-25 19:56:26 +04:00
konstantin.grabar
2d1001f1c1
[refs #478 ] Fix js handler
2012-05-25 14:49:37 +04:00
konstantin.grabar
e38bf98d54
[refs #478 ] Move js logic to another handler
2012-05-25 11:26:42 +04:00
Alexander Machehin
4f1d23a2a4
[refs #90 ] branch, merge validation
2012-05-24 23:10:49 +06:00
konstantin.grabar
0958299f51
[refs #478 ] Change js handler logic
2012-05-24 16:51:39 +04:00
konstantin.grabar
3d2bcdd019
[refs #478 ] Add js handler to disable frozen platforms and their reps
2012-05-24 14:21:57 +04:00
konstantin.grabar
9aefce6b68
[refs #442 ] Merge master into 442-mass_build
2012-05-21 18:33:12 +04:00
Alexander Machehin
6b6887250b
Merge branch 'master' into 90-pull
...
Conflicts:
db/schema.rb
2012-05-21 17:31:49 +06:00
konstantin.grabar
be2ab9154c
[refs #442 ] Fix checkboxes styles. Return delay for build all. Add mass build select and more fixes
2012-05-21 14:18:29 +04:00
Vladimir Sharshov
241efb95b1
Merge pull request #486 from warpc/443-tour
...
[refs #443 ] fix dropmenu in tours pages for registered users
2012-05-18 03:17:01 -07:00
Alexander Machehin
3a2dc965c9
[refs #443 ] fixed dropmenu
2012-05-18 15:51:26 +06:00
Pavel Chipiga
bea7ed26d6
Fix advisory template. Fix rosa tour. Refs #428 , #482
2012-05-18 01:38:43 +03:00
Alexander Machehin
fcffff4178
Merge branch 'master' into 90-pull
...
Conflicts:
app/assets/stylesheets/design/custom.scss
config/locales/title.en.yml
config/locales/title.ru.yml
config/routes.rb
db/schema.rb
2012-05-17 22:58:29 +06:00
Vladimir Sharshov
2892689807
Merge pull request #469 from warpc/443-tour
...
[refs #466 ] Add localization for system tour. Fix for auto detecting users language.
2012-05-16 05:19:59 -07:00
Alexander Machehin
2651f0dc52
[refs #443 ] localize top image
2012-05-16 17:10:22 +06:00
Alexander Machehin
05746ea449
[refs #466 ] add i18n
2012-05-15 21:35:48 +06:00
Vladimir Sharshov
64d5600e6f
Merge pull request #447 from warpc/443-tour
...
[refs #443 ] Tour about the system
2012-05-12 10:11:16 -07:00
Alexander Machehin
7a011606a5
[refs #443 ] add pirobox popup
2012-05-12 19:17:07 +06:00
Alexander Machehin
0e5b2ba25d
[refs #443 ] compact styles
2012-05-12 15:54:24 +06:00
George Vinogradov
cada9f6e51
[issue #443 ] Changed tour routes. Fixed submenu position.
2012-05-12 01:05:48 +04:00
George Vinogradov
218904675d
[issue #443 ] Fixed styles. Removed whitespace between content and
...
footer.
2012-05-12 00:24:40 +04:00
Alexander Machehin
5f5eb00c4f
[refs #443 ] abf tour
2012-05-12 00:15:20 +06:00
konstantin.grabar
60fdf9e998
[refs #396 ] Add atom feed icon
2012-05-11 19:44:19 +04:00
Pavel Chipiga
52f5e01575
Fix build list controller bugs. Fix JS which controls checkboxes. Fix translations. Fix and refactor views. Refs #428
2012-05-06 00:43:04 +03:00
George Vinogradov
05ef799fa4
[issue #428 ] Added advisories list. Added translations.
2012-05-05 21:18:29 +04:00
Alexander Machehin
36b4ce2d99
Merge branch 'master' into 90-pull
...
Conflicts:
Gemfile
Gemfile.lock
app/controllers/projects/issues_controller.rb
app/models/project.rb
config/locales/menu.en.yml
config/routes.rb
db/schema.rb
2012-05-03 23:19:43 +06:00
Pavel Chipiga
72e3eaf1a1
Minor design fix. Refs #263
2012-05-03 18:56:33 +03:00
Pavel Chipiga
abb60a503a
Minor design fix. Refactor register requests. Refactor case insensitive search. Other minor fixes and code cleanup. Refacor and improve owner constraint. Refs #263
2012-05-03 17:08:02 +03:00
Alexander Machehin
9e5db741d3
Merge branch 'master' into 90-pull
...
Conflicts:
app/models/project.rb
db/schema.rb
2012-05-02 23:08:24 +06:00
Pasha
0c8f8e14a6
Merge pull request #419 from warpc/347-javascript_refactoring
...
[issue #347 ] Fixed artefacts in Add Collaborators form.
2012-04-23 12:21:00 -07:00
Alexander Machehin
a8ccf454ee
[refs #90 ] first steps of pull rendering
2012-04-23 23:34:11 +06:00
Alexander Machehin
628fed40ea
[refs #90 ] issue status -> state
2012-04-23 23:34:11 +06:00
konstantin.grabar
89bfa8d0a9
[refs #415 ] Fix radio button click handler
2012-04-23 13:50:42 +04:00
George Vinogradov
af18f4404f
[issue #347 ] Fixed artefacts in Add Collaborators form.
2012-04-22 13:17:33 +04:00
George Vinogradov
678f7cc0ed
[issue #347 ] Changed search field.
2012-04-20 00:35:31 +04:00
George Vinogradov
510b0c0c50
[issue #347 ] Merge branch 'master' into 347-javascript_refactoring
...
Conflicts:
app/assets/stylesheets/design/custom.scss
app/models/group.rb
app/models/user.rb
2012-04-19 19:32:11 +04:00
George Vinogradov
f9d2baef5a
[issue #347 ] Added filter.
2012-04-19 19:27:16 +04:00
George Vinogradov
618d1ecb49
[issue #408 ] Fixed bug with selectbox
2012-04-18 21:31:11 +04:00
George Vinogradov
9566855110
[issue #347 ] Added missed lib
2012-04-18 16:17:11 +04:00
George Vinogradov
9d96b2b565
[issue #408 ] Removed comment.
2012-04-18 14:46:34 +04:00
George Vinogradov
6c64125787
[issue #408 ] Changed behavior of build list for released platform
2012-04-17 22:18:39 +04:00
George Vinogradov
8204196275
[issue #347 ] Removed comments. Added filter field to collaborators
...
table.
2012-04-17 17:39:14 +04:00
Alexander Machehin
f31b243ae9
[refs #385 ] zip image
2012-04-17 18:06:04 +06:00
George Vinogradov
871c8ed1f4
[issue #347 ] Fixed bugs. Some changes.
2012-04-16 23:22:08 +04:00
Vladimir Sharshov
c339f2aee0
Merge pull request #403 from warpc/223-change_build_lists_new_js_handlers
...
[refs #223 ] Add platform branch auto select if this branch exist
2012-04-16 10:00:53 -07:00
konstantin.grabar
d24422f757
[refs #223 ] Add branch auto select
2012-04-16 20:06:34 +04:00
Alexander Machehin
2dedbd92d0
[refs #194 ] assignee & user
2012-04-14 01:44:04 +06:00
Alexander Machehin
5cfadcd723
[refs #385 ] add dropdown menu to choose archive format
2012-04-13 17:24:24 +06:00
George Vinogradov
a68d4a2926
[issue #347 ] Many changes.
...
Changes includes:
* Changed Collaborator model;
* Autocomplete now works through backbone;
* Changed autocomplete styles;
* Groups have their own avatar;
* Changed previous backbone scripts;
2012-04-13 02:01:24 +04:00
Alexander Machehin
770030e180
[refs #385 ] zip archive
2012-04-12 00:29:08 +06:00
konstantin.grabar
18bda07369
Merge master into 223-change_build_lists_new_js_handlers
2012-04-10 18:00:48 +04:00
konstantin.grabar
f7e09c993d
[refs #223 ] Optimise code by jQuery chains
2012-04-10 17:15:48 +04:00
konstantin.grabar
d6dc51ba93
[refs #223 ] Choosen rep auto set
2012-04-10 13:05:42 +04:00
Vladimir Sharshov
6d4f94e2c4
Merge pull request #389 from warpc/353-fork
...
[Refs #353 ] can fork project to group
2012-04-09 12:46:15 -07:00
Alexander Machehin
e349a69883
[refs #353 ] can fork project to group
2012-04-09 23:56:03 +06:00
George Vinogradov
71c8efabf9
[issue #347 ] Added backbone. Changed collaborators page.
2012-04-09 21:11:39 +04:00
konstantin.grabar
6ccf7e8456
[refs #223 ] Change js handlers and some inputs logics
2012-04-09 18:33:51 +04:00
Alexander Machehin
96b3c831b7
[refs #358 ] br -> p
2012-04-06 02:21:19 +06:00
konstantin.grabar
39dd53ff9b
[refs #358 ] Add git clone repo help hint
2012-04-05 11:26:03 +04:00
George Vinogradov
1e8021fe35
[issue #369 ] Added TOS page.
2012-03-31 17:18:22 +04:00
Pavel Chipiga
36b2eaa784
Fix root page search field design. Allow aninymous search only projects. Fix activity_feeds routes. Show anonymous project build lists. Remove unused specs. Refs #349
2012-03-31 03:43:55 +03:00
Pavel Chipiga
d6e6959f46
Write basic robots.txt. Apply configurable anonymous access, hide some functionality from guests. Apply basic design for main page. Autoconfirm manually created users. Code refactor and cleanup. Remove unused code, routes, containers, rpms, personal_repositories. Redo product_build_lists monitoring and filtering. Fix add_project to repo bug. Add links to bottom menu. Switch off deploy assets sppedup. Refs #349 , #263
2012-03-31 02:37:54 +03:00
George Vinogradov
78943fdc04
[issue #195 ] Added legend for projects table. Added titles.
2012-03-30 18:51:57 +04:00
George Vinogradov
c03ae5015e
[issue #195 ] Fixed leave button. Added participant icons.
2012-03-29 20:27:33 +04:00
George Vinogradov
baf35da99c
[issue #195 ] Merge branch 'master' into 195-new_design_for_projects
...
Conflicts:
app/controllers/projects_controller.rb
2012-03-27 21:23:09 +04:00
George Vinogradov
9bb1d80172
[issue #195 ] Added AJAX to /projects list.
2012-03-27 19:50:00 +04:00
George Vinogradov
a3aaf4f7ce
[issue #195 ] Fixed bug with line numbers in blob show.
2012-03-27 14:12:26 +04:00
George Vinogradov
dd8e3b0497
[issue #195 ] Added JQuery datatables to /projects
2012-03-25 01:36:56 +04:00
Vladimir Sharshov
f085367659
Merge pull request #337 from warpc/193-wiki
...
[Refs #193 ] Restyle wiki
2012-03-23 08:59:17 -07:00
Alexander Machehin
86bd036418
[refs #193 ] changes in wiki
2012-03-23 21:36:47 +06:00
Alexander Machehin
eb0545221c
[refs #194 ] change styles at issues list
2012-03-23 19:31:51 +06:00
Vladimir Sharshov
75ae7f2189
[Refs #263 ] Update css for new version
2012-03-22 20:33:43 +04:00
Alexander Machehin
071c391a6e
Merge branch '3.2-master' into 270-user_control
...
Conflicts:
app/assets/stylesheets/design/custom.scss
2012-03-22 21:15:10 +06:00
Vladimir Sharshov
a85ce1d1f7
Merge pull request #332 from warpc/195-new_design_for_projects
...
[Refs #195 ] new design for projects (support group as collaborators)
2012-03-22 08:08:26 -07:00
George Vinogradov
524fa2302f
[issue #279 ] Changed buttons alignment.
2012-03-22 17:53:35 +04:00
konstantin.grabar
c6eb68e903
[refs #325 ] Fixes descripton styles for project page into main css
2012-03-22 16:31:39 +04:00
konstantin.grabar
21c33b384b
[refs #325 ] Add new design to error pages
2012-03-22 11:16:56 +04:00
George Vinogradov
9e31ae75b1
[issue #195 ] Added groups support to project.
2012-03-22 04:44:05 +04:00
Vladimir Sharshov
ee867aa8d4
Merge pull request #324 from warpc/200-new_build_repos_rules
...
[refs #200 ] Fix chbx behaviour for repos and their platforms
2012-03-21 08:06:54 -07:00
konstantin.grabar
5abf64e353
[refs #200 ] Fix chbx behaviour for repos and their platforms
2012-03-21 19:04:01 +04:00
Alexander Machehin
3c7dec3b97
Merge branch '3.2-master' into 270-user_control
2012-03-21 19:39:55 +06:00
Vladimir Sharshov
81d18b5337
Merge pull request #323 from warpc/200-new_build_repos_rules
...
[Refs #200 ] Move some fields to rights part of the form. Hide empty platform. Fix checkbox checking on build list form.
2012-03-21 05:17:23 -07:00
konstantin.grabar
f9850c6885
[refs #200 ] Fix checkbox checking on build list form
2012-03-21 15:34:11 +04:00
Vladimir Sharshov
375aa7e74e
Merge pull request #322 from warpc/265-activity_feed_messages
...
[refs #265 ] add ajax to older messages
2012-03-21 03:50:25 -07:00
Alexander Machehin
b678320638
[refs #265 ] add ajax to older messages
2012-03-21 16:29:45 +06:00
Alexander Machehin
4a6ce6c8a8
Merge branch '3.2-master' into 270-user_control
...
Conflicts:
app/views/users/index.html.haml
2012-03-21 15:29:44 +06:00
Vladimir Sharshov
d2da4fc0ba
[Refs #263 ] Fix css
2012-03-21 02:53:56 +04:00
Vladimir Sharshov
ba140c67f9
[Refs #263 ] Align the menu, change colors for text and background
2012-03-21 02:47:51 +04:00
Alexander Machehin
20ff998f08
[refs #270 ] user control
2012-03-21 00:12:18 +06:00
Vladimir Sharshov
047425a27f
Merge pull request #318 from warpc/279-new_design_for_platforms
...
[Refs #279 ] new design for platforms(add control for members, fix bugs)
2012-03-20 09:48:57 -07:00
George Vinogradov
7c0585ee87
[issue #279 ] Added members and other changes.
2012-03-20 20:24:18 +04:00
Vladimir Sharshov
09fcc04489
Merge pull request #315 from warpc/200-new_build_repos_rules
...
[refs #200 ] Change build list repos and platforms interface
2012-03-20 06:02:49 -07:00
konstantin.grabar
31e0c9191c
[refs #200 ] Fix build list form interface and include_repos logic
2012-03-20 14:36:31 +04:00
konstantin.grabar
f0645be9c5
[refs #200 ] Change build list repos and platforms interface
2012-03-19 23:52:46 +04:00
George Vinogradov
ddc95c25fb
[issue #279 ] Merge branch '3.2-master' into 279-new_design_for_platforms
...
Conflicts:
app/assets/stylesheets/design/custom.scss
2012-03-19 18:56:04 +04:00
George Vinogradov
1cbc3f5b7a
[issue #279 ] Added block of connection data for personal platform.
2012-03-19 18:46:12 +04:00
Alexander Machehin
0c1d57cd8c
[refs #279 ] can resize textarea in product edit page
2012-03-19 18:16:12 +06:00
konstantin.grabar
348fd40daf
[refs #223 ] Fix build status color helpers
2012-03-19 12:39:46 +04:00
konstantin.grabar
b3d7091db0
Merge 3.2-master into 223-monitoring_design
2012-03-19 10:41:30 +04:00
konstantin.grabar
4b26eebeca
[refs #223 ] Add new design to build list task page
2012-03-18 12:20:31 +04:00
Vladimir Sharshov
42eb250942
Merge pull request #302 from warpc/279-new_design_for_platforms
...
[issue #279 ] Fixed some bugs:
* Redirect to repositroies page when remove repository.
* Fixed sorting background in Datatables styles.
* Fixed save button translation in platforms form.
* Fixed platform save & create flashes.
* Fixed cancel buttons in platform, product & repository forms.
* Redirect to created product on creation.
* Redirect to platform's products page after product destruction.
* Fixed permissions to Build button on product page.
* Fixed permissions to Add button on repository page.
* Fixed forbidden redirect when trying to acces
* RepositoriesController#projects_list by unprivilleged user.
2012-03-15 16:15:58 -07:00
George Vinogradov
cc68163238
[issue #279 ] Fixed some bugs:
...
* Redirect to repositroies page when remove repository.
* Fixed sorting background in Datatables styles.
* Fixed save button translation in platforms form.
* Fixed platform save & create flashes.
* Fixed cancel buttons in platform, product & repository forms.
* Redirect to created product on creation.
* Redirect to platform's products page after product destruction.
* Fixed permissions to Build button on product page.
* Fixed permissions to Add button on repository page.
* Fixed forbidden redirect when trying to acces
RepositoriesController#projects_list by unprivilleged user.
2012-03-16 02:56:12 +04:00
Vladimir Sharshov
e719633862
Merge pull request #300 from warpc/279-new_design_for_platforms
...
[Refs #279 ] new design for platforms (bugfixes, ACL and filters)
2012-03-15 14:50:37 -07:00
Vladimir Sharshov
7bab315b96
[Refs #279 ] Fix url and submit button size
2012-03-15 18:02:10 +04:00
George Vinogradov
3c60347a23
[issue #279 ] Fixes.
...
* Almost finished permissions fixes
* Removed is_template from product
* Some fixes in crontab_generator partial
2012-03-15 03:34:09 +04:00
George Vinogradov
747edb73a5
[issue #279 ] Merge branch '3.2-master' into 279-new_design_for_platforms
...
Conflicts:
db/schema.rb
2012-03-14 21:43:08 +04:00
George Vinogradov
5a77b17a43
[issue #279 ] Almost finished design for platforms
...
TODO:
* Add design for crontab generator
* Fix path generation
2012-03-14 21:22:47 +04:00
George Vinogradov
304141b1ba
[issue #279 ] Added views and removed datatables plugin
...
* Datatables plugin moved to lib.
* Added views to platform and repositories.
2012-03-13 19:12:06 +04:00
George Vinogradov
952c9e46ea
[issue #279 ] Added datatables pagination extension
2012-03-13 18:36:42 +04:00
Vladimir Sharshov
b07d81644a
[Refs #223 ] Monitoring colors code in index page
2012-03-13 15:04:29 +04:00
Vladimir Sharshov
19bcdf94d9
[Refs #195 ] More space for project url
2012-03-12 18:31:25 +04:00
George Vinogradov
61bd704cb1
[issue #279 ] Added platform repositories list.
2012-03-12 03:58:25 +04:00
George Vinogradov
535c075d3e
[issue #279 ] Added platform main page, menu & sidebar
2012-03-12 03:08:50 +04:00
George Vinogradov
19a962560a
[issue #279 ] Merge branch '3.2-master' into 279-new_design_for_platforms
...
Conflicts:
app/assets/stylesheets/design/custom.scss
2012-03-12 01:38:20 +04:00
Vladimir Sharshov
11434ff423
[Refs #285 ] Fix css style, rename button
2012-03-11 20:38:28 +04:00
Vladimir Sharshov
e2b3eb7b7f
[Refs #285 ] Fix current_user avatar for all user, replace button Edit
2012-03-11 20:02:07 +04:00
Pavel Chipiga
41cd1ddaf3
Redo cusel assign to avoid side effects. Refactor and cleanup projects controller, routes, views. Apply new design and functionality for projcts list page. Add fork button and fix fork. Apply gap repo during repo fork. Apply attr_accessible for projects. Cleanup locales. Fix new_build link ability check. Refs #195
2012-03-07 23:34:49 +02:00
Vladimir Sharshov
e49551756c
Merge pull request #276 from warpc/194-issue_page
...
[Refs #194 ] Fix for manage labels and executor
2012-03-07 11:26:11 -08:00
George Vinogradov
9c78a917a1
[issue #279 ] Added platforms page.
2012-03-07 22:59:37 +04:00
Alexander Machehin
8df4fdfa5c
[refs #194 ] remove labels search from js
2012-03-07 22:26:43 +06:00
Vladimir Sharshov
1cb109119d
Merge pull request #277 from warpc/274-file_detection_fixes
...
[Refs #274 ] file detection fixes
2012-03-07 06:53:16 -08:00
Alexander Machehin
c657efc338
[refs #194 ] show all project labels without searching
2012-03-07 19:36:17 +06:00
Alexander Machehin
9a6beef2da
[refs #194 ] fix issue managing labels
2012-03-07 16:50:45 +06:00
Alexander Machehin
4b173932e5
[refs #194 ] fix managing issue executor
2012-03-07 16:44:42 +06:00
Alexander Machehin
82d26b08b9
[refs #223 ] fix selector
2012-03-07 16:27:29 +06:00
George Vinogradov
d6d8410b0f
[issue #274 ] Fixed file detection.
...
TODO.
1. Change MIME in editor
2. Change MIME sorting
2012-03-07 05:20:35 +04:00
Alexander Machehin
4b9d0616d6
Merge branch '3.2-master' into 194-issue_page
...
Conflicts:
app/views/issues/_create_sidebar.html.haml
2012-03-07 01:19:34 +06:00
Pavel Chipiga
7308c4a0d2
Merge branch '3.2-master' into 255-search
...
Refactor avatars. Fix user bugs. Remove ssh_key delete migration
Conflicts:
app/assets/stylesheets/design/custom.scss
app/models/user.rb
2012-03-06 20:59:29 +02:00
Alexander Machehin
8ae7ebee2b
Merge branch '3.2-master' into 194-issue_page
2012-03-06 22:51:13 +06:00
Alexander Machehin
1791160b09
[refs #194 ] fix manage issue executor
2012-03-06 22:31:07 +06:00
konstantin.grabar
9565d58e8f
[refs #257 ] Merge 3.2-master into 257-new_design_for_profiles
2012-03-06 20:13:53 +04:00
Pavel Chipiga
d6f9b2c3e9
Minor gems update. Apply search design and controller. Add and refactor search scopes. Fix relations. Separate and refactor search translations. Refactor search form. Refs #255
2012-03-06 17:53:04 +02:00
Alexander Machehin
b9de81f4df
[refs #194 ] managing labels in the issue
2012-03-06 21:21:13 +06:00
George Vinogradov
f070a9d729
[issue #193 ] Merge branch '3.2-master' into 193-new_design_for_wiki
...
Conflicts:
app/assets/stylesheets/custom.scss
2012-03-06 17:40:44 +04:00
George Vinogradov
2b1b5504cd
[issue #193 ] Added fullname to history table.
2012-03-06 17:20:30 +04:00
George Vinogradov
cd57da0946
[issue #193 ] Fixed searchbar in wiki.
2012-03-06 17:08:19 +04:00
konstantin.grabar
de6490346b
[refs #257 ] Change error messages logic. Fix avatar ru translation
2012-03-06 15:24:42 +04:00
Alexander Machehin
9e6d06f1c9
[refs #194 ] manage issue executer
2012-03-06 00:28:55 +06:00
Vladimir Sharshov
9d8eb8a3f2
Merge pull request #269 from warpc/195-new_design_for_projects
...
[Refs #195 ] Add blane functions. Fixed syntax highlighting. Stub for rpm-specs.
2012-03-05 09:07:36 -08:00
George Vinogradov
93e2caccc8
[issue #195 ] Added blame view.
2012-03-05 19:29:05 +04:00
Alexander Machehin
dab45f9afe
[refs #228 ] fix checking remember me button
2012-03-05 16:49:31 +06:00
konstantin.grabar
73296059eb
[refs #257 ] Merge 3.2-master into 257-new_design_for_profiles
2012-03-05 13:42:39 +04:00
konstantin.grabar
f58e24b134
[refs #257 ] User edit pages fixes
2012-03-03 20:03:23 +04:00
Pavel Chipiga
a0f0c24f88
Fix flash messages. Add styles. Refs #263
2012-03-03 03:05:19 +02:00
Pavel Chipiga
13f0d8223d
Remove compass-bootstrap. Take back DJ fix. Refs #263
2012-03-03 02:42:10 +02:00
Pavel Chipiga
159fbe65dc
Re-add compass. Add flash messages design. Refactor and fix bugs after merge. Remove duplicates, sync and separate locales . Fix some specs. Refs #263
2012-03-03 02:28:27 +02:00
Vladimir Sharshov
403a8a19ce
Merge pull request #262 from warpc/194-nice_radio_change
...
[Refs #194 ] Fix triggering change event for niceRadio buttons
2012-03-02 10:27:27 -08:00
Alexander Machehin
dfa361f5c3
[refs #194 ] fix triggering change event for niceRadio buttons
2012-03-02 23:45:20 +06:00
George Vinogradov
6522650c5a
[issue #195 ] Merge branch '3.2-master' into 195-new_design_for_projects
...
Conflicts:
app/views/git/blobs/_show.html.haml
2012-03-02 20:58:28 +04:00
George Vinogradov
7b37846a54
[issue #195 ] Fixed line numbering with files contains <>
2012-03-02 19:50:17 +04:00
Alexander Machehin
50fc094bce
[refs #228 ] fuuuuu...
2012-03-02 21:32:00 +06:00
Alexander Machehin
7164dd580e
[refs #230 ] fix error messages + some refactoring
2012-03-02 18:27:38 +06:00
George Vinogradov
6cfb5d0c3d
[issue #195 ] Fixed bug with encodings. Added avatar. Stubbed blame.
2012-03-02 04:39:43 +04:00
Pavel Chipiga
e66f0110fc
Merge branch '3.2-master' into 195-new_design_for_projects
...
Conflicts:
app/assets/javascripts/extra/syntax.highlighter-init.js
app/assets/stylesheets/design/common.scss
vendor/assets/stylesheets/vendor.scss
2012-03-02 02:12:11 +02:00
George Vinogradov
900c1fe2f5
[issue #195 ] Fixes.
...
* Fixed translations
* Fixed blob display
* Fixed routes
2012-03-02 02:07:04 +02:00
Pavel Chipiga
accf38a088
Fix build_list display width. Refs #223
2012-03-02 02:04:07 +02:00
Alexander Machehin
cea7bc79bb
[refs #194 ] fix notification line style
2012-03-02 02:04:06 +02:00
Alexander Machehin
d7dbe79357
[refs #230 ] edit password page
2012-03-02 02:04:06 +02:00
Pavel Chipiga
036dfb6dd5
Fix build_lists bugs. Add build list display and new build list pages design, apply compass. Refactor and cleanup assets. Refactor abilities. Refactor build_list search. Improve layout_class helper. Change defaul build_lists index filter and fix specs. Fix assets path. Refs #223
2012-03-02 02:04:04 +02:00
Pavel Chipiga
84a7a9fe2d
Fix build_list display width. Refs #223
2012-03-02 01:37:05 +02:00
George Vinogradov
318dc72d29
[issue #195 ] Fixes.
...
* Added border to gutter in file preview
* Added "empty repo" message
* Fixed one of bugs with tree/branch selector
2012-03-02 02:23:53 +04:00
George Vinogradov
43c10ee812
[issue #195 ] Fixed long comments displaying.
2012-03-02 00:33:48 +04:00
Vladimir Sharshov
9e11a20f71
Merge pull request #249 from warpc/230-registration_page
...
[refs #230 ] Edit password page
2012-03-01 11:43:53 -08:00
Alexander Machehin
2f0981c12f
[refs #194 ] fix notification line style
2012-03-02 01:33:22 +06:00
Alexander Machehin
4931dc773b
[refs #230 ] edit password page
2012-03-02 01:16:49 +06:00
George Vinogradov
4b024d1728
[issue #195 ] Fixes.
...
* Fixed translations
* Fixed blob display
* Fixed routes
2012-03-01 21:37:24 +04:00
Pavel Chipiga
7d112d0524
Fix build_lists bugs. Add build list display and new build list pages design, apply compass. Refactor and cleanup assets. Refactor abilities. Refactor build_list search. Improve layout_class helper. Change defaul build_lists index filter and fix specs. Fix assets path. Refs #223
2012-03-01 19:33:46 +02:00
George Vinogradov
2a4e978857
[issue #195 ] Merge branch '3.2-master' into 195-new_design_for_projects
...
Conflicts:
app/assets/stylesheets/custom.scss
2012-03-01 14:22:39 +04:00
George Vinogradov
fe5ad9ebf3
[issue #195 ] Added missed js. Some changes.
2012-03-01 05:07:31 +04:00
George Vinogradov
dedd64f976
[issue #195 ] Returned lost files.
2012-03-01 03:29:16 +04:00
Alexander Machehin
cadd1995d1
[refs #230 ] fix forgot password SignUp style
2012-03-01 01:50:08 +06:00
Alexander Machehin
3a10ed91b2
[refs #194 ] more uniq
2012-03-01 00:33:01 +06:00
Alexander Machehin
fe0eba8e61
[refs #194 ] fix index page
2012-03-01 00:23:19 +06:00
Vladimir Sharshov
d9ca8ff8b6
Merge pull request #231 from warpc/195-new_design_for_projects
...
[Refs #195 ] new design for projects
2012-02-29 09:54:42 -08:00
konstantin.grabar
bc75b318ce
[refs #195 ] Merge 3.2-master into 195-new_design_for_projects
2012-02-29 21:37:28 +04:00
Alexander Machehin
3415c6eb9f
Merge branch '3.2-master' into 230-registration_page
2012-02-29 23:25:24 +06:00
Vladimir Sharshov
6e8b48188e
Merge pull request #229 from warpc/228-sign_in
...
[Refs #228 ] sign in
2012-02-29 09:22:42 -08:00
Alexander Machehin
ba4fae071f
[refs #230 ] error messages
2012-02-29 23:01:30 +06:00
Alexander Machehin
3136159777
[refs #230 ] add red borders to invalid attributes
2012-02-29 22:59:09 +06:00
Alexander Machehin
ee84ac84cf
[refs #228 ] fix I18n
2012-02-29 22:59:08 +06:00
Alexander Machehin
71d9079003
[refs #228 ] fix registration link
2012-02-29 22:59:08 +06:00
Alexander Machehin
a1bfe66791
[refs #228 ] sign_in page
2012-02-29 22:59:08 +06:00
George Vinogradov
5b9d20154b
[issue #195 ] Added translations and maybe missed partials
2012-02-29 20:27:32 +04:00
George Vinogradov
19dd58800b
[issue #195 ] Added comments to commit.
2012-02-29 19:05:36 +04:00
konstantin.grabar
c5d8041296
[refs #195 ] Add global fixes to projects and collaborators logic
2012-02-29 18:45:04 +04:00
Pavel Chipiga
cefaa902b1
Apply new design for projects build monitoring page. Improve and refactor filters. Improve abilities. Switch off old statuses. Separate build_lists translations. Refactor and remove duplicate translations. Refactor and code cleanup. Fix specs. Apply layout class helper. Refs #223
2012-02-29 16:04:38 +02:00
Alexander Machehin
89a5cf56b2
[refs #228 ] fix submit button style
2012-02-29 15:23:59 +06:00
Alexander Machehin
c9067da374
[refs #233 ] fix users menu toggle
2012-02-29 12:40:21 +06:00
Alexander Machehin
8126b49567
[refs #228 ] fix I18n
2012-02-29 11:43:40 +06:00
Alexander Machehin
c55d6d097e
[refs #228 ] fix registration link
2012-02-29 10:41:25 +06:00
George Vinogradov
fe46e53ad8
[issue #195 ] Many changes.
...
* Base presenter moved to lib
* Added diff display
* Changes in some views
TODO Add translations.
TODO Change commit page layout.
TODO Change representation of commit on commit page.
TODO Fix bug with tree/branch select.
2012-02-29 06:02:07 +04:00
Alexander Machehin
91eb306560
[refs #228 ] sign_in page
2012-02-29 02:43:17 +06:00
konstantin.grabar
fa69cd8ee4
[refs #195 ] Fix radio and checkboxes script. Fix project edit and new form
2012-02-28 23:11:08 +04:00
Alexander Machehin
e83e19ea50
[refs #194 ] remove duplicates
2012-02-28 22:36:29 +06:00
Alexander Machehin
c4719f12da
[refs #194 ] some change in the issue managing
2012-02-28 22:33:38 +06:00
Alexander Machehin
895b095058
Merge branch '3.2-master' into 194-tracker
...
Conflicts:
app/assets/stylesheets/custom.scss
app/assets/stylesheets/main.scss
2012-02-28 22:31:00 +06:00
konstantin.grabar
e9ae923b60
[refs #195 ] Merge 3.2-master into 195-new_design_for_projects
2012-02-28 20:10:31 +04:00
Alexander Machehin
99e3bbb762
[refs #194 ] update issue content
2012-02-28 21:41:47 +06:00
Pavel Chipiga
07b081cc0d
Fresh up assets. Force production SSL. Refs #223
2012-02-28 17:40:22 +02:00
Alexander Machehin
f9c834cf4d
Revert "[refs #194 ] return main.scss"
...
This reverts commit 0b8461a5df9f3d9bbca6e3b377164ff4aa4ac4e6.
2012-02-28 20:56:43 +06:00
Alexander Machehin
5abdbd4486
[refs #194 ] return main.scss
2012-02-28 20:37:30 +06:00
konstantin.grabar
39b0beb3ab
[refs #193 ] Fix wrap gollum and wiki page styles
2012-02-28 18:36:04 +04:00
Alexander Machehin
bc4a157703
Merge branch '3.2-master' into 194-tracker
...
Conflicts:
app/assets/stylesheets/application.scss
app/views/issues/_form.html.haml
app/views/platforms/show.html.haml
2012-02-28 20:13:08 +06:00
Alexander Machehin
0d75a37451
[refs #194 ] show page beta version
2012-02-28 20:05:18 +06:00
Alexander Machehin
66a08662c2
[refs #194 ] new styles; some changes
2012-02-28 15:23:27 +06:00
Pavel Chipiga
7508bb1339
Fix bugs to force new design work. Minor refactor and improvements. Refs #193
2012-02-27 20:58:37 +02:00
Alexander Machehin
2c0e1b6314
Merge branch '3.2-master' into 194-tracker
...
Conflicts:
app/assets/stylesheets/custom.scss
2012-02-27 23:55:18 +06:00
George Vinogradov
582063d066
[issue #195 ] Commits history, editing, showing...
2012-02-27 21:40:46 +04:00
Alexander Machehin
27c85d32df
[refs #194 ] create page; index pagination; some bugs
2012-02-27 22:10:12 +06:00
Pavel Chipiga
4d2459c60c
Refactor, fix and cleanup wiki templates and translations. Refs #193
2012-02-24 23:39:40 +02:00
George Vinogradov
3c83649627
[issue #96 ] Some fixes in layout and scripts.
2012-02-24 23:39:40 +02:00
Alexander Machehin
a6a51225b8
[refs #194 ] some js refactoring
2012-02-23 22:16:04 +06:00
Alexander Machehin
9e5e7cd5e4
[refs #194 ] labels manage
2012-02-23 20:48:46 +06:00
George Vinogradov
43b7ccd3dc
[issue #195 ] Added blob show. Some changes.
2012-02-23 02:11:55 +04:00
konstantin.grabar
3a48f8dea9
[refs #193 ] Add lost file with wiki_history checkboxes script
2012-02-21 20:11:16 +04:00
George Vinogradov
328cd17f46
[issue #195 ] Fixed bug in CommitPresenter
2012-02-21 19:51:48 +04:00
George Vinogradov
85f3d956f5
[issue #195 ] Merge branch '203-feed_message' into 195-new_design_for_projects
...
Conflicts:
app/views/layouts/application.html.haml
2012-02-21 19:42:30 +04:00
Alexander Machehin
5dcc4eabf8
[refs #194 ] tracker without tags manage
2012-02-20 22:54:45 +06:00
George Vinogradov
edc8774387
[issue #203 ] Some layout changes & presenters.
...
* Fixed bugs in layout
* Fixed typos
* Fixed bugs in JS
* Added universal partial _feed_message.html.haml
* Added presenters
* Added CommitAsMessage presenter, that prepares Grit::Commit
to be shown as message.
2012-02-19 02:47:57 +04:00
George Vinogradov
608faf3564
[issue #96 ] Some fixes in layout and scripts.
2012-02-17 03:07:22 +04:00
Pavel Chipiga
b7b69a86d8
Minor gems update. Sync with newest styles, javascripts, images. Refactor assets. Merge and fix wiki assets, temporary disable buggy ones. Change subscribeable_id type from string to decimal to avoid bugs. Auto convert commit subscribe subscribeable_id from hex to decimal. Refactor commentable. Fix bugs and some specs. Refactor application.yml. Refs #96
2012-02-14 18:05:41 +02:00
Pavel Chipiga
7d74b0af13
Merge branch 'master' into 96-upgrade_rails
...
Conflicts:
Gemfile
Gemfile.lock
app/models/group.rb
app/views/layouts/application.html.haml
db/schema.rb
public/stylesheets/git/style.css
2012-02-14 02:14:03 +02:00
Pavel Chipiga
7223b7deb9
Upgrade rails, devise, delayed_jobs and other gems. Fix dependencies. Apply assets pipeline, add to deploy. Refactor and cleanup Gemfile. Fix after upgrade bugs. Redo commentable_id from string to decimal. Refactor and code cleanup. Apply basic new design. Refactor main template. Automate menus. Improve translations. Refs #96
2012-02-09 01:46:25 +02:00