a994e7dd74
Merge remote-tracking branch 'origin/90-pull' into 90-pull
2012-09-26 23:10:45 +06:00
cc05fa695a
[refs #90 ] fixed pull abilities part 2
2012-09-26 23:09:29 +06:00
37fbb4632e
#90 : updated branch
2012-09-26 21:04:12 +04:00
613db04375
#90 : added limit for commits into the pull request
2012-09-26 21:00:58 +04:00
0ebc545b01
#90 : small refactoring of views
2012-09-26 19:16:34 +04:00
37c9a906c4
Merge branch '90-pull' into 90-separate-issues-and-pull-requests
2012-09-26 18:45:26 +04:00
6070c276f6
Merge branch 'master' into 90-pull
2012-09-26 18:33:04 +04:00
07b27b934f
#90 : updated #index page for pull-requests
2012-09-26 15:46:23 +04:00
eba6a14e0b
[refs #90 ] very small refactoring
2012-09-26 15:27:24 +06:00
397d411252
#90 : added #index action, updated routes
2012-09-26 00:50:40 +04:00
47a73a4ddb
[refs #90 ] fixed existing project name
2012-09-25 21:47:08 +06:00
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
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
c426f81abe
Merge pull request #656 from warpc/616-issues_and_comments
...
[refs #616 ] Markdown in issues descriptions and comments, ability to preview, help info about markdown, refactoring.
2012-09-25 03:37:44 -07:00
d15094f128
#648 : moved 'Create' button
2012-09-25 00:03:33 +04:00
91f215351c
#648 : small refactoring according to comment
2012-09-24 23:27:00 +04:00
9be978eb68
#648 : updated models, JS, controller according to comments and discussions
2012-09-24 22:04:53 +04:00
cee1ee6cb6
#648 : small refactoring
2012-09-23 20:22:49 +04:00
ceeae09332
#648 : small revert, updated filter name
2012-09-21 22:08:19 +04:00
2406423483
#648 : added filters to Projects page
2012-09-21 21:57:22 +04:00
855f1f356d
[refs #616 ] remove some inline styles
2012-09-21 18:10:47 +06:00
94c3863e27
[refs #616 ] fixed markdown image example
2012-09-21 16:43:54 +06:00
d25bdb2329
[refs #616 ] fixed preview bug
2012-09-21 16:32:53 +06:00
799a1464fb
#385 : fixed
2012-09-20 18:26:26 +04:00
7e28920bc7
Merge pull request #653 from warpc/385-change-name-for-git-archives
...
[refs #385 ] Support download project source code by build clients(rpmbuild)
2012-09-20 06:37:13 -07:00
b398a0e456
#634 : fixed
2012-09-20 16:43:23 +04:00
07f5224e76
#385 : removed before_filter
2012-09-20 15:21:54 +04:00
c76618441e
#385 : revert some changes according to discussion
2012-09-20 15:10:52 +04:00
f39adfd2f7
#385 : fixed specs, updated controller, view
2012-09-19 23:29:36 +04:00
32e05de186
[refs #616 ] cheat sheet small i18n
2012-09-20 00:53:40 +06:00
11c67b7951
[refs #616 ] fixed bug on new issue
2012-09-19 23:59:46 +06:00
fbc5f3a925
[refs #616 ] small refactoring
2012-09-19 23:59:14 +06:00
a85a95d18a
[refs #616 ] markdown cheat sheet
2012-09-19 23:35:43 +06:00
4fc9ba7aeb
[refs #616 ] add lost i18n
2012-09-19 15:41:08 +06:00
daf845705a
[refs #616 ] comment update
2012-09-19 00:42:22 +06:00
a492367a17
[refs #616 ] some fixes and refactoring
2012-09-18 16:00:21 +06:00
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
c690a8446a
Merge pull request #644 from warpc/633-fix-ui-on-build-list-page
...
[refs #633 ] Fixed blocking auto publication in personal repository. Refactoring creating build list page.
2012-09-13 16:39:19 -07:00
bdb3eb288c
#633 : removed checkbox from name of platform
2012-09-14 02:22:10 +04:00
fc4eb189b5
Add new staging server;
...
Remove special application config;
Change localization (builded to built);
Add quotes to git command.
2012-09-14 00:46:56 +04:00
a99bfee4a6
#633 : UI has been updated
2012-09-13 20:08:41 +04:00
8d35786183
#641 : added is_package checkbox to #new page, updated model
2012-09-12 19:06:34 +04:00
8c06b0c18d
[refs #631 ] Fix right for publication build list using publish button
2012-09-07 22:45:03 +04:00
768e40ee2a
Merge branch 'master' into 631-publish-to-the-repository-without-qa
...
Conflicts:
app/models/ability.rb
2012-09-07 16:38:21 +03:00
3247db53c6
[refs #635 ] Fixed the lack of choice owner on create a project page
2012-09-07 14:25:04 +04:00
71d14e43d6
#631 : fixed misprint
2012-09-06 19:39:26 +04:00
4d1166e6b3
#631 : updated UI and JS validation for build_lists, rewrote migration
2012-09-06 19:34:33 +04:00
ff20c0b199
Merge pull request #622 from warpc/620-maintainer_db
...
[refs #620 ] Maintainer DB
2012-08-31 11:50:02 -07:00
067615d79f
[refs #616 ] small js fix
2012-08-31 19:18:38 +06:00
3225274425
[refs #616 ] change styles
2012-08-31 19:02:03 +06:00
d775fa0d08
[refs #616 ] ugly md preview
2012-08-29 21:24:06 +06:00
6c4b13f0da
[issue #620 ] Removed project_maintainer & assignee
2012-08-28 18:25:57 +04:00
f688985814
[issue #620 ] Changed maintainer assignment.
...
* Added `project:maintainer:set_to_owner` task to set projects maintainer
to its owner
* Removed callbacks and methods to find maintainer 'on-the-fly'
2012-08-28 01:12:53 +04:00
e8d80b849a
[refs #616 ] fixed removing labels from issue
2012-08-25 21:26:24 +06:00
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
3abcb51395
[refs #616 ] simple format for issie body
2012-08-21 00:11:42 +06:00
e637191a61
[refs #616 ] fixed caption of the button
2012-08-20 23:27:43 +06:00
b8c6f0b896
[issue #590 ] Refactored checks for buttons.
2012-08-17 15:49:12 +04:00
84328742e4
[issue #590 ] Log returns through Rails with `tail -n`
2012-08-17 12:23:49 +04:00
99ce249fe6
[issue #590 ] Removed log reloading for not :build_started BuildLists.
2012-08-15 00:49:31 +04:00
6ac0d3c0df
[issue #590 ] Fixed Chrome bug in live log.
2012-08-14 21:05:53 +04:00
5a4c7a8e37
[issue #590 ] Fixed BuildList started check (thnx 2 @alexander-machehin)
2012-08-14 18:57:25 +04:00
0d06f73917
[issue #590 ] Merge branch '590-build_list_page_change' of github.com:warpc/rosa-build into 590-build_list_page_change
2012-08-14 18:46:45 +04:00
dfb6d0da0c
[issue #590 ] Fixed log viewer.
2012-08-14 18:43:05 +04:00
cada20ed63
Merge branch 'master' into 590-build_list_page_change
2012-08-14 15:46:16 +04:00
38e1d0c8ee
[issue #590 ] Added live log to BuildList
2012-08-14 01:41:15 +04:00
b2ff7326d1
Merge branch 'master' into 90-pull
...
Conflicts:
config/locales/en.yml
config/locales/ru.yml
2012-08-13 15:01:43 +06:00
efa08933fd
[issue #590 ] Added average build time to :build_started BuildLists
2012-08-12 02:08:28 +04:00
8c07e5a516
[issue #590 ] Fixed bug in JS timeparser.
2012-08-11 22:46:39 +04:00
2ad94139af
[issue #590 ] Fixed bug in JS timeparser.
2012-08-11 22:15:11 +04:00
c1c9f9680e
[refs #90 ] remove code duplication
2012-08-10 22:40:09 +06:00
e535ff2fed
Merge pull request #611 from warpc/590-build_list_page_change
...
[refs #590 ] Dirty hack to fix BuildList#index
2012-08-10 09:26:11 -07:00
9030056c1b
[issue #590 ] Changed _build_list partial.
2012-08-10 20:14:45 +04:00
e7407ae28f
[issue #590 ] Dirty hack to fix BuildList#index
2012-08-10 19:08:26 +04:00
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
e5e8cc7e7f
[issue #590 ] Changed time representation.
...
* Removed buggy jquery.countdown plugin
* Page reloads every minute
2012-08-09 20:39:01 +04:00
5cb2853c66
[issue #590 ] Added timers to BuildList index page.
2012-08-09 01:10:39 +04:00
ec7d132a3f
[refs #90 ] fixed update commits button
2012-08-08 23:57:03 +06:00
9bf2f728a7
[refs #90 ] change new action from post to get
2012-08-08 23:21:49 +06:00
910aac939e
[refs #90 ] fixed changing tabs & anchors
2012-08-08 21:47:58 +06:00
35642102dd
[refs #90 ] fixed show merge button
2012-08-07 19:25:08 +06:00
a316105e9c
Merge branch 'master' into 90-pull
...
Conflicts:
db/schema.rb
2012-08-07 18:21:04 +06:00
fb66b74019
[refs #90 ] fixed pull abilities
2012-08-07 00:12:15 +06:00
be71f7e22f
[issue #590 ] Fixed translation. Added repository link to container
2012-08-06 17:05:05 +04:00
b48762f174
[issue #590 ] Fixed translation. Added repository link to container
2012-08-06 17:04:05 +04:00
73e9e0be94
[issue #590 ] Changed BuildList show page.
2012-08-06 16:44:44 +04:00
cef621d6ae
[issue #590 ] Changed BuildList show page.
2012-08-06 16:42:58 +04:00
8934d310a0
Merge pull request #603 from warpc/590-build_list_page_change
...
[refs #590 ] On monitoring and build list pages change platform to repository.
2012-08-06 05:36:32 -07:00
dadbaefea4
[issue #590 ] On monitoring page platform changed to repository.
2012-08-06 16:31:44 +04:00
0e3e5c0ce1
Merge pull request #600 from warpc/590-build_list_page_change
...
[refs #590 ] build list page change:
* Fix migration;
* Repository rights checking moved to controller;
* Repository fetches through project and platform.
2012-08-06 04:18:26 -07:00
b963c9342a
[issue #590 ] Repository fetches through project and platform
2012-08-06 14:59:07 +04:00
6a04f4ad7a
Merge again branch 'master' into 90-pull
...
Conflicts:
db/schema.rb
2012-08-06 11:19:06 +06:00
23b4136d05
Merge pull request #598 from warpc/help_info
...
[refs #597 ] Add help page for new git repo. Remove link to README in project pages, small refactoring.
2012-08-03 09:24:26 -07:00
6eff6bffa5
[issue #590 ] Merge branch 'master' into 590-build_list_page_change
...
Conflicts:
db/schema.rb
2012-08-03 18:37:44 +04:00
8bc229f933
[refs #597 ] Add help page for new git repo. Remove link to README in project pages, small refactoring.
2012-08-03 18:31:04 +04:00
b299a51610
Merge branch 'master' into 90-pull
...
Conflicts:
db/schema.rb
2012-08-01 13:06:41 +06:00
1269806aae
Hide another raw link for huge blobs. Refs #263
2012-07-31 22:24:27 +03:00
8e91159b5b
Improve and refacror huge blob display. Fix wiki create and display. Fix build_lists test. Refs #263
2012-07-31 20:32:49 +03:00
724b36a4b4
Merge master into 570-mass_builds_status_counters_bug
2012-07-30 18:53:18 +04:00
6c11597de6
Merge branch 'master' into 90-pull
2012-07-30 16:53:59 +06:00
63801e2676
[issue #590 ] Platform fetches through repository.
2012-07-27 23:37:56 +04:00
cc66e2ee4a
[issue #590 ] Save repository to save to in BuildList.
2012-07-27 20:01:26 +04:00
25bdbb01d6
[refs #90 ] project fullname
2012-07-27 18:52:31 +06:00
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
5aecdc203b
Merge pull request #571 from warpc/263-refactoring
...
[refs #263 ] Big git refactoring
2012-07-27 04:51:34 -07:00
bc2eb541f3
[refs #583 ] Change and to &&
2012-07-27 03:17:37 +04:00
3e4c03dd6a
[issue #583 ] Added missing check to BuildList page
2012-07-27 01:44:15 +04:00
35e673d44e
Minor gems update. Fix string length, refactor git helper and module, add branches_and_tags method, refactor build_list filter, cleanup and refactor templates. Take back test. Filter incorrect symbols during git encoding fix. Fix git http level bug. Refs #263
2012-07-27 00:15:57 +03:00
d130409640
Merge branch 'master' into 90-pull
...
Conflicts:
app/assets/stylesheets/design/custom.scss
2012-07-20 15:33:11 +06:00
35b953ac11
[refs #90 ] add commit/pull lines ref
2012-07-19 22:42:37 +06:00
2cc3798cdc
Merge branch 'master' into 263-refactoring
2012-07-19 18:58:47 +03:00
1f0887ac97
[refs #570 ] Change localization for fields(part 2)
2012-07-18 23:26:13 +04:00
c5686c76d3
Merge branch '570-mass_builds_status_counters_bug' of github.com:warpc/rosa-build into 570-mass_builds_status_counters_bug
2012-07-18 23:08:57 +04:00
b24a4a35b2
[refs #90 ] modify pull tab urls
2012-07-19 00:02:27 +06:00
7061696100
[refs #570 ] Replace :all to :everything for builds filter
2012-07-18 17:49:21 +04:00
6430678c00
[refs #570 ] Add :all option for build lists visibility
2012-07-18 16:00:40 +04:00
b7911f3585
[refs #90 ] fixed create pull button text
2012-07-18 16:29:55 +06:00
08534810f6
[refs #569 ] tuning fork modal
2012-07-17 20:25:02 +06:00
cd681ab0ae
[refs #569 ] fixed fork modal
2012-07-17 19:49:13 +06:00
966368a660
[refs #90 ] show same title and body for issues and pulls
2012-07-17 16:50:40 +06:00
611b22baa5
Update gems, fix conflicts. Raise 404 error instead of redirect. Refactor git controllers. Refactor git methods, move to modules. Cleanup git helpers, refactor and remove unused variables from views, refactor git templates. Refactor project load. Refactor git routes and links, refactor constraints. Fix branches with slashes and dots. Apply github linguist and libmagic for binary file detection. Other refactor and code cleanup. Fix specs and deprecations. Refs #263
2012-07-17 11:02:56 +03:00
5b4c9b0948
[refs #90 ] remove reduntant information
2012-07-16 23:38:45 +06:00
b903969aa6
[refs #90 ] changed displaying status message
2012-07-16 23:02:04 +06:00
34e97510cd
[refs #90 ] modify pull headers
2012-07-16 22:27:41 +06:00
56db0fffd0
[refs #90 ] small refactoring
2012-07-16 14:46:44 +06:00
26617b7739
[refs #90 ] add close/reopen button
2012-07-12 20:15:28 +06:00
3290adb0b1
[refs #90 ] fixed merge ability
2012-07-10 22:58:39 +06:00
10b828c644
Merge branch 'master' into 90-pull
...
Conflicts:
db/schema.rb
vendor/assets/javascripts/vendor.js
2012-07-10 18:35:49 +06:00
cfb16f8118
[issue #561 ] Fixed bug on BuildList#show page
2012-07-10 03:57:25 +04:00
f83a1ae6c2
[issue #561 ] Changed translations.
2012-07-10 02:55:34 +04:00
3195969aab
[issue #561 ] Added bs_id to BuildList#show
2012-07-10 02:14:31 +04:00
f997e50905
[issue #561 ] Some cosmethic changes.
...
* Reordered columns in BuildLists table
* Reordered rows in BuildLists filter
* Removed created_at filter (Commented. See TODOs)
2012-07-10 01:49:19 +04:00
8c5a8c884d
[issue #561 ] Some DB query optimization.
2012-07-10 01:13:55 +04:00
7b3c74e97d
[issue #561 ] Changed BuildList pages
...
* Removed mass_build, cancel and updated_at fields from list
* Added link to commit in list (instead of version)
* Added platform field in list
* Added filter by main platforms
* Added cancel button and mass_build field to BuildList#show
2012-07-10 01:09:27 +04:00
07e02d9a17
[refs #90 ] modified Update commits button
2012-07-10 00:41:39 +06:00
d7ee0fe938
Merge pull request #559 from warpc/428-advisory
...
[refs #428 ] Advisory: new look
2012-07-09 08:44:13 -07:00
2839dc14b6
[issue #428 ] Using #name_with_owner in projects pages.
2012-07-09 19:19:30 +04:00
dd221cc880
[refs #90 ] autocomplete
2012-07-06 23:30:01 +06:00
3c8b77027e
[issue #428 ] Allowed any update_types when build for released platform.
2012-07-06 03:05:47 +04:00
ce1c1ff403
Merge pull request #528 from warpc/428-advisory
...
[issue #428 ] Advisories: final version:
* Added Many2Many relation between advisories and projects;
* Added autocompletion to build list's advisory;
* Bootstrap's JS moved to vendor;
* Added Atom feed for advisories;
* Added search in advisories page.
2012-07-04 07:29:30 -07:00
7b0c135a24
[refs #90 ] fixed pull button
2012-07-04 20:22:23 +06:00
a909a92ae8
[issue #428 ] Merge branch 'master' into 428-advisory
...
Conflicts:
db/schema.rb
2012-07-04 18:10:03 +04:00
07372dd1a3
[refs #442 ] Fix mass_builds link
2012-07-04 18:09:59 +04:00
8c88e7a0da
[issue #428 ] Some code simplification.
2012-07-04 15:42:43 +04:00
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
094f25c049
[issue #428 ] Changed attaching advisory to BuildList.
...
Removed Chosen. Added text field with incremental search.
2012-07-04 02:52:13 +04:00
89abd20c95
Merge branch 'master' into 90-pull
...
Conflicts:
db/schema.rb
2012-07-03 21:22:10 +06:00
004f603e02
[refs #442 ] Add new actions rights. Cancel build list btn rights fix
2012-06-29 23:10:18 +04:00
01db786728
[refs #442 ] remove double checking
2012-06-29 17:39:54 +06:00
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
8768317323
[refs #90 ] fix issue path
2012-06-26 15:52:20 +06:00
9b41fd50af
[refs #90 ] fixed translation of titles & headers
2012-06-26 15:40:37 +06:00
6aa9cfaa50
[refs #90 ] view pull status
2012-06-25 22:04:43 +06:00
4d91ea1d6e
[refs #531 ] fixed user roles
2012-06-20 23:59:47 +06:00
735afaea15
[issue #428 ] Merge branch 'master' into 428-advisory
...
Conflicts:
db/schema.rb
2012-06-19 02:57:39 +04:00
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
8542c60838
[refs #522 ] to fork check own projects
2012-06-15 00:12:44 +06:00
682f33a9bf
[refs #90 ] view merged status
2012-06-13 23:52:11 +06:00
724868e495
[refs #90 ] fixed view with #repo-wrapper
2012-06-08 14:28:23 +06:00
29d01f33a5
[refs #90 ] dont redirect in tracker
2012-06-08 14:11:46 +06:00
bf11afca4c
[refs #90 ] fixed diff view
2012-06-08 13:53:30 +06:00
5f50bacbe6
[refs #90 ] some refactoring with rtruncate method
2012-06-08 13:38:24 +06:00
62128d2c72
[refs #90 ] change diff anchors to digits
2012-06-08 01:20:06 +06:00
0b9c0fdd07
[refs #90 ] fixed rendering file rename
2012-06-08 01:19:18 +06:00
8fadbf2d41
[refs #90 ] rewrite diff
2012-06-07 23:23:28 +06:00
65fd4a8340
[refs #90 ] add anchor to commits list
2012-06-06 00:13:20 +06:00
614691a737
[refs #90 ] removed index action
2012-06-05 18:10:51 +06:00
91bf65d65d
[refs #90 ] comments for pull requests (slow version)
2012-06-05 18:08:52 +06:00
e7c0eab736
[issue #428 ] Merge branch 'master' into 428-advisory
...
Conflicts:
app/assets/stylesheets/design/custom.scss
2012-06-04 23:59:00 +04:00
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
4b8def5bd0
[refs #90 ] add pulls to tracker
2012-06-04 23:00:19 +06:00
8ed8e10cd6
[refs #90 ] moved update form lower
2012-05-31 23:30:10 +06:00
60aba754ae
[refs #90 ] pull title/body update
2012-05-31 22:57:52 +06:00
3c3448e26f
[refs #90 ] new/show views refactoring
2012-05-31 17:16:54 +06:00
26baf999f4
[refs #90 ] diff stats
2012-05-29 23:09:43 +06:00
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
780cc351d5
[refs #263 ] use user fullname
2012-05-28 16:22:18 +06:00
bc3212a374
fixed assignee uname for issue sidebar
2012-05-28 15:38:57 +06:00
a79d946b6b
[refs #442 ] Mass build refactor and fixes
2012-05-25 19:56:26 +04:00
df610931d7
[refs #90 ] commits tab
2012-05-25 16:48:44 +06:00
4f1d23a2a4
[refs #90 ] branch, merge validation
2012-05-24 23:10:49 +06:00
568df37570
Merge pull request #500 from warpc/478-project_build_failed
...
[refs #478 ] Change js handler logic for creating build build list for frozen platform
2012-05-24 06:11:36 -07:00
0958299f51
[refs #478 ] Change js handler logic
2012-05-24 16:51:39 +04:00
0d3e06b5d9
Merge pull request #499 from warpc/478-project_build_failed
...
[refs #478 ] Add js handler to disable frozen platforms and their reps
2012-05-24 03:39:55 -07:00
3d2bcdd019
[refs #478 ] Add js handler to disable frozen platforms and their reps
2012-05-24 14:21:57 +04:00
a83927c812
[refs #442 ] Fix mass_build_id locales
2012-05-23 18:19:04 +04:00
7c45263799
[refs #442 ] Add mass build select to monitoring. Remove build lists from build_all action
2012-05-22 17:40:27 +04:00
d643bb3cd0
[refs #90 ] try to prevent create same pull
2012-05-21 19:24:16 +06:00
6b6887250b
Merge branch 'master' into 90-pull
...
Conflicts:
db/schema.rb
2012-05-21 17:31:49 +06:00
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
74aee232f9
[refs #90 ] some fixes and merge button
2012-05-17 22:49:29 +06:00
f96990bd25
[refs #90 ] change view
2012-05-16 22:50:30 +06:00
1385133ed5
[refs #461 ] Merge master into 461-rename_is_rpm_to_is_package
2012-05-16 14:37:35 +04:00
c1b4a0639d
Fix build list display
2012-05-15 13:12:07 +03:00
1f088c0cfc
[refs #461 ] Rename is_rpm to is_package
2012-05-15 14:00:57 +04:00
8470674c62
Apply basic build list packages store functionality. Display build list package content. Write specs. Refactor. Refs #444
2012-05-14 22:08:31 +03:00
ff016efe1c
[refs #90 ] choose project
2012-05-14 23:09:18 +06:00
8060a9b8a9
[refs #451 ] Fix partial name
2012-05-14 12:16:37 +04:00
85d4489009
[refs #90 ] dont work pull
2012-05-12 00:23:09 +06:00
3e0ebdc929
[refs #90 ] change route
2012-05-10 22:57:59 +06:00
9a0f582a16
[issue #428 ] Fixed typo in PlatformsHelper
2012-05-10 20:04:48 +04:00
4040a486fe
[refs #90 ] fix diff
2012-05-10 18:32:54 +06:00
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
05ef799fa4
[issue #428 ] Added advisories list. Added translations.
2012-05-05 21:18:29 +04:00
381ae0a8b9
[refs #90 ] diff - dont work
2012-05-05 22:57:12 +06:00
6fe0e5b530
[issue #428 ] Added AdvisoriesController & show view.
2012-05-05 02:53:45 +04:00
1f07332892
[issue #428 ] Merge branch 'master' into 428-advisory
...
Conflicts:
app/controllers/projects/build_lists_controller.rb
config/routes.rb
db/schema.rb
2012-05-04 21:29:04 +04:00
813afe53cf
[refs #90 ] minor interface changes
2012-05-04 23:13:41 +06:00
c5731ff8dd
[refs #90 ] fixed merging errors
2012-05-04 16:56:11 +06:00
178dbdc5f0
[refs #90 ] move files
2012-05-03 23:55:08 +06:00
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
9e5db741d3
Merge branch 'master' into 90-pull
...
Conflicts:
app/models/project.rb
db/schema.rb
2012-05-02 23:08:24 +06:00
2539ef4795
Great controllers and routes refactor - separate them to namespaces. Add user/group routes in github style, refactor. Implement templates inheritance. Refactor and cleanup views. Fix specs. Other minor fixes. Refs #263
2012-05-02 12:18:07 +03:00
b957600eda
Merge branch 'master' into 263-refactoring
...
Conflicts:
app/models/project.rb
app/views/projects/_repo_block.html.haml
db/schema.rb
spec/controllers/issues_controller_spec.rb
spec/controllers/projects_controller_spec.rb
2012-05-01 15:54:13 +03:00
cb9588619a
[refs #416 ] dont show zip menu for empty project
2012-04-24 22:36:52 +06:00
9cae595d77
Merge branch 'master' into 263-refactoring
2012-04-23 22:22:24 +03:00
a8ccf454ee
[refs #90 ] first steps of pull rendering
2012-04-23 23:34:11 +06:00
c0d2d67c73
Merge branch 'master' into 263-refactoring
...
Conflicts:
Gemfile
Gemfile.lock
config/routes.rb
2012-04-23 17:58:45 +03:00
af18f4404f
[issue #347 ] Fixed artefacts in Add Collaborators form.
2012-04-22 13:17:33 +04:00
701da7e1f9
Disable bluepill. Update gems. Github project style URLs. Fix project load. Fix abilities. Fic urls generation. Fix some specs. Refs #263
2012-04-19 22:45:50 +03:00
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
f31b243ae9
[refs #385 ] zip image
2012-04-17 18:06:04 +06:00
871c8ed1f4
[issue #347 ] Fixed bugs. Some changes.
2012-04-16 23:22:08 +04:00
5cfadcd723
[refs #385 ] add dropdown menu to choose archive format
2012-04-13 17:24:24 +06:00
b281cdf65b
[refs #385 ] changed archive
2012-04-12 17:27:15 +06:00
770030e180
[refs #385 ] zip archive
2012-04-12 00:29:08 +06:00
96b3c831b7
[refs #358 ] br -> p
2012-04-06 02:21:19 +06:00
39dd53ff9b
[refs #358 ] Add git clone repo help hint
2012-04-05 11:26:03 +04:00
fe053537c3
[ fixed #377 ] Fixed Group.by_admin scope.
2012-04-03 17:08:22 +04:00
1e8021fe35
[issue #369 ] Added TOS page.
2012-03-31 17:18:22 +04:00
0f597ad544
Merge pull request #368 from warpc/195-new_design_for_projects
...
[issue #195 ] Fixed access string in repo block
2012-03-31 03:39:52 -07:00
eb4679de0e
[issue #195 ] Fixed access string in repo block
2012-03-31 14:27:20 +04:00
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
d18e55f180
[refs #340 ] titles - part2
2012-03-30 22:37:54 +06:00
897c4b730b
Merge pull request #360 from warpc/195-new_design_for_projects
...
[Refs #195 ] Added legend for projects table. Added titles.
2012-03-30 09:20:22 -07:00
78943fdc04
[issue #195 ] Added legend for projects table. Added titles.
2012-03-30 18:51:57 +04:00
0c2d0f4612
[Refs #263 ] Delete Categories
2012-03-29 23:01:25 +04:00
c03ae5015e
[issue #195 ] Fixed leave button. Added participant icons.
2012-03-29 20:27:33 +04:00
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
9bb1d80172
[issue #195 ] Added AJAX to /projects list.
2012-03-27 19:50:00 +04:00
d03f364b18
Merge branch '195-new_design_for_projects' of github.com:warpc/rosa-build into 195-new_design_for_projects
2012-03-25 01:38:32 +04:00
dd8e3b0497
[issue #195 ] Added JQuery datatables to /projects
2012-03-25 01:36:56 +04:00
d44de9f2bb
Redo projects list. Allow view projects through groups. Hide delete from project link from project owners. Refs #195
2012-03-23 22:37:17 +02:00
35c466820e
[refs #195 ] add lock/unlock icon
2012-03-23 23:36:37 +06:00
efd46249ed
[issue #195 ] Fixed merge artefact
2012-03-22 18:53:06 +04:00
9f23cf7727
[issue #195 ] Merge branch '3.2-master' into 195-new_design_for_projects
...
Conflicts:
app/views/projects/_sidebar.html.haml
2012-03-22 18:15:57 +04:00
401e570dc7
[issue #195 ] Change projects/sidebar to be more standart.
2012-03-22 04:42:56 +04:00
89f31e9782
Minor gems update. Prepare gemfile for jruby and rbx tests. Remove encoding hacks. Apply grit fixes for encoding support. Recode incorrect encodings. Refactor, cleanup and fix lots bugs in git section. Refactor and remove unused git routes. Translate some untranslated parts. Redo branch/tags selector. Fix files tree last commit message. Project section templates refactor and cleanup. Refs #190
2012-03-21 21:55:14 +02:00
fc465a4647
[refs #195 ] onfocus -> onclick
2012-03-12 20:46:11 +06:00
19bcdf94d9
[Refs #195 ] More space for project url
2012-03-12 18:31:25 +04:00
26e80af8cb
[refs #195 ] one click select
2012-03-12 16:13:34 +06:00
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
db8e1881ba
[refs #195 ] change repo url to readonly
2012-03-07 20:56:25 +06:00
e5d5ef11e3
[refs #194 ] fix submenu highlight
2012-03-05 20:00:49 +06:00
7e5e3ca609
[issue #195 ] Fixed another creating bug...
...
I feel like a slipper-man...
2012-03-03 04:24:57 +04:00
9ee3942702
[issue #195 ] Fixed bug with project creating
2012-03-03 03:25:20 +04:00
b3750f8644
[issue #195 ] Fixed branch selector.
2012-03-02 20:48:19 +04:00
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
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
4b024d1728
[issue #195 ] Fixes.
...
* Fixed translations
* Fixed blob display
* Fixed routes
2012-03-01 21:37:24 +04:00
6eb239385a
[issue #195 ] Fixed bug with creating project
2012-03-01 17:37:35 +04:00
55ff2c7f6b
[refs #195 ] Change new project route and some other changes
2012-03-01 16:10:12 +04:00
5b25ea221b
[refs #195 ] Add default value to is_rpm field for projects
2012-02-29 22:27:57 +04:00
c3d7221f97
[issue #195 ] Fixed bugs
...
* Highlighting in submenu
* File history
2012-02-29 21:53:14 +04:00
c5d8041296
[refs #195 ] Add global fixes to projects and collaborators logic
2012-02-29 18:45:04 +04:00
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
b586c5ddf0
[refs #195 ] Add js hack for sections bigpadding div class
2012-02-29 01:17:04 +04:00
577eadbc7c
[refs #195 ] Fix project form submit tag
2012-02-29 00:12:37 +04:00
fa69cd8ee4
[refs #195 ] Fix radio and checkboxes script. Fix project edit and new form
2012-02-28 23:11:08 +04:00
e9ae923b60
[refs #195 ] Merge 3.2-master into 195-new_design_for_projects
2012-02-28 20:10:31 +04:00
03663a8ed7
[refs #195 ] Add sections page and method to projects
2012-02-28 12:00:56 +04:00
e004822bd3
Remove/replace old assets to avoid production bugs. Fix deploy settings.
2012-02-28 01:16:14 +02:00
7508bb1339
Fix bugs to force new design work. Minor refactor and improvements. Refs #193
2012-02-27 20:58:37 +02:00
b6a52fb840
Merge branch '195-new_design_for_projects' of github.com:warpc/rosa-build into 195-new_design_for_projects
2012-02-27 21:47:05 +04:00
582063d066
[issue #195 ] Commits history, editing, showing...
2012-02-27 21:40:46 +04:00
72fec3b314
[refs #195 ] Add owner choose on project create
2012-02-27 13:03:28 +04:00
3c5cdfd5e4
[refs #195 ] Add is_rpm field to projects. Continue set new design
2012-02-24 17:05:58 +04:00
6fe88ed69d
[issue #195 ] Merge branch '195-new_design_for_projects' of github.com:warpc/rosa-build into 195-new_design_for_projects
...
Conflicts:
app/presenters/git_presenters/commit_as_message_presenter.rb
2012-02-23 02:16:20 +04:00
43b7ccd3dc
[issue #195 ] Added blob show. Some changes.
2012-02-23 02:11:55 +04:00
ba1798fd71
[refs #195 ] Add design to form and edit page
2012-02-22 21:48:37 +04:00
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
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
fab80d97eb
[refs #194 ] project submenu partial
2012-02-15 22:32:26 +06:00
50d27ad34d
[issue #171 ] Added ACL calls to project navigation.
2012-02-13 20:16:50 +04:00
4165b188eb
Merge branch 'master' into 64-project_wiki
...
Conflicts:
app/models/project.rb
config/locales/en.yml
2012-02-03 00:55:16 +04:00
2f315f869d
[issue #64 ] Merge branch 'master' into 64-project_wiki
...
Conflicts:
Gemfile.lock
app/models/project.rb
db/schema.rb
2012-01-30 13:27:22 +04:00
5efaca77cf
Merge branch 'master' into 114-comment_notifications
...
Conflicts:
app/models/project.rb
app/views/user_mailer/new_comment_notification.en.haml
app/views/user_mailer/new_comment_notification.ru.haml
app/views/user_mailer/new_comment_reply_notification.ru.haml
config/locales/devise.en.yml
config/locales/en.yml
config/locales/ru.yml
db/schema.rb
2012-01-30 13:06:06 +06:00
f9abc2d39c
Hide participate projects
2012-01-28 04:25:11 +04:00
549f0a55e8
[issue #64 ] Merge branch 'master' into 64-project_wiki
...
Conflicts:
Gemfile.lock
app/models/project.rb
app/models/user.rb
app/views/projects/_form.html.haml
config/locales/ru.yml
db/schema.rb
2012-01-27 18:27:23 +04:00
3f4bf65825
Upgrade paperclip. Apply srpm_import script and UI. Fix specs. Refs #31
2012-01-24 22:35:36 +02:00
9127b6b689
[refs #114 ] changed logics
2012-01-24 01:42:54 +06:00
23573a1a07
[issue #64 ] Added creation wiki to project.
2012-01-20 19:10:30 +04:00
800b02f544
[refs #18 ] Add project subsribe, tests
2012-01-20 00:20:03 +06:00
5237939f49
Merge issues with master
2011-12-26 13:26:13 +04:00
d901426b79
Move project build functinality to build_lists controller. Refactor downloads url - create model based methods for url genertion. Cleanup code. Add includeed_repos functionality. Display included_repos on build_list page. Refs #65
2011-12-21 16:01:50 +02:00
375c98366f
[ref #54 ] Add has_issue settings to projec edit. Fix routes and friendly_id bug. Fix some moments
2011-12-20 20:57:34 +04:00
d20d43eb2b
[refs #54 ] Base logic and templates for issues and comments to them
2011-12-19 19:30:14 +04:00
58cfe07124
[refs #56 ] Change project build page title
2011-12-16 11:59:34 +04:00
97579f8534
Fixed errors in projects representation.
2011-12-07 03:44:21 +04:00
9cc820080b
Groups base functional.
2011-12-05 16:32:18 +04:00
Alexander Machehin
Vokhmin Alexey V
Vladimir Sharshov
Pavel Chipiga
George Vinogradov
Pasha
konstantin.grabar