Pavel Chipiga
a831a4aa63
Merge branch '3.2-master' of github.com:warpc/rosa-build into 3.2-master
2012-03-03 01:43:14 +02:00
Pavel Chipiga
56a12dc9ea
Merge branch 'master' into 3.2-master
...
Conflicts:
app/models/comment.rb
app/models/issue.rb
config/locales/en.yml
2012-03-03 01:38:43 +02:00
Vladimir Sharshov
622d80c6d3
Merge pull request #261 from warpc/194-tracker
...
[Refs #194 ] Fix ACL and tests for issues
2012-03-02 11:48:10 -08:00
Alexander Machehin
7cd3e40efc
[refs #194 ] fix accessible list
2012-03-03 01:23:45 +06:00
Alexander Machehin
319fcdad86
[refs #194 ] refactoring
2012-03-03 00:21:46 +06:00
Alexander Machehin
c7b412c0e0
[refs #194 ] some refactoring
2012-03-02 23:38:00 +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
Alexander Machehin
41c0d1e856
[refs #194 ] fix security and tests
2012-03-02 22:52:15 +06:00
George Vinogradov
b3750f8644
[issue #195 ] Fixed branch selector.
2012-03-02 20:48:19 +04:00
konstantin.grabar
8677fa7493
[refs #232 ] Remove name field
2012-03-02 14:39:48 +04:00
konstantin.grabar
3369953b4c
[refs #232 ] Remove unused commented code from groups controller
2012-03-02 13:46:16 +04:00
konstantin.grabar
1700588b97
[refs #232 ] Merge 3.2-master into 232-new_groups_design
2012-03-02 13:44:54 +04:00
konstantin.grabar
d376b55a57
[refs #232 ] Move groups locales to another files. Remove unsused commented code. On small sidebar fix
2012-03-02 12:47:16 +04: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
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
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
konstantin.grabar
eb689b7f18
[refs #232 ] Add new design and logic refactor for group members action
2012-03-01 19:41:40 +04:00
konstantin.grabar
fc3d4c0b6d
[refs #232 ] Add group members edit page design
2012-03-01 18:23:26 +04:00
konstantin.grabar
55ff2c7f6b
[refs #195 ] Change new project route and some other changes
2012-03-01 16:10:12 +04:00
konstantin.grabar
bc75b318ce
[refs #195 ] Merge 3.2-master into 195-new_design_for_projects
2012-02-29 21:37:28 +04:00
konstantin.grabar
12d8f5e7b8
[refs #232 ] Add new design to some group pages
2012-02-29 21:12:06 +04:00
Vladimir Sharshov
05eac4918f
Fix NoMethodError: undefined method `default_order' for ActiveRecord::Relation
2012-02-29 19:10:01 +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
konstantin.grabar
2ec2548390
[refs #195 ] Add base design and functional to project members page
2012-02-29 01:01:25 +04:00
konstantin.grabar
e9ae923b60
[refs #195 ] Merge 3.2-master into 195-new_design_for_projects
2012-02-28 20:10:31 +04:00
Vladimir Sharshov
529d8d3708
Merge pull request #192 from warpc/123-activity-feed
...
[Refs #123 ] activity feed (commits notifcation not work)
2012-02-28 07:46:55 -08:00
Alexander Machehin
99e3bbb762
[refs #194 ] update issue content
2012-02-28 21:41:47 +06:00
Alexander Machehin
0abea8ff55
[refs #194 ] fix issues count
2012-02-28 20:28:11 +06: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
konstantin.grabar
03663a8ed7
[refs #195 ] Add sections page and method to projects
2012-02-28 12:00:56 +04:00
Pavel Chipiga
70963d0943
Merge branch 'master' into 3.2-master
2012-02-27 22:34:21 +02:00
Pavel Chipiga
159ef26b38
Merge branch 'master' into 3.2-master
...
Conflicts:
app/views/wiki/_compare.html.haml
app/views/wiki/_diff_data.html.haml
db/schema.rb
2012-02-27 22:32:57 +02:00
Vladimir Sharshov
ddda2b92ab
[Refs #221 ] Delete product build lists (only in web)
2012-02-28 00:00:33 +04:00
George Vinogradov
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
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
konstantin.grabar
72fec3b314
[refs #195 ] Add owner choose on project create
2012-02-27 13:03:28 +04:00
Vladimir Sharshov
46a5ab1c76
Merge branch 'master' into 123-activity-feed
...
Conflicts:
config/deploy.rb
db/schema.rb
2012-02-24 20:44:36 +04:00
George Vinogradov
586d4e0bea
Fixed bug with Windows line endings in blob editing.
2012-02-24 20:34:41 +04:00
Pavel Chipiga
15f78e30a0
Redo platform build_all with sleep and errors rescue. Refs #207
2012-02-24 19:28:00 +04:00
Pavel Chipiga
9015b971aa
Redo clone logic. Split clone process for repositories. Optimize and refactor. Refs #207
2012-02-24 19:28:00 +04:00
Pavel Chipiga
069c226110
Place platform destroy to background. Redo clone process to 2 phases - base_clone and relations_clone. Place relations clone and XML RPC to background. Remove unneeded validations. Refactor xml_rpc_clone. Refs #207
2012-02-24 19:28:00 +04:00
Pavel Chipiga
7c273c022b
Remove raise. Refs #207
2012-02-24 19:27:59 +04:00
Pavel Chipiga
600df031f5
Refactor platform clone controller and routes. Refactor and fix clone process for platform, repository, product. Place XML RPC clone request to DJ. Refs #207
2012-02-24 19:27:59 +04:00
Pavel Chipiga
5e58ec9e59
Delegate all repo abilities to platform. Remove repository owner and relations. Fix templates and specs. Refactor and code cleanup. Refs #205
2012-02-24 19:27:58 +04:00
George Vinogradov
5986cd6dde
[issue #64 ] Removed debug methods and unnecessary comments.
2012-02-24 19:27:55 +04:00
Pavel Chipiga
bab3a90155
Apply approved and rejected filters for register requests. Tune abilities. Link to user profile if user have already registered. Refs #174
2012-02-24 19:27:55 +04:00
George Vinogradov
43c896021e
[issue #64 ] Added possibility to diff and revert last commit
2012-02-24 19:27:55 +04:00
konstantin.grabar
28e2494e14
[refs #123 ] Remove stubs controller
2012-02-24 15:26:50 +04:00
Pavel Chipiga
66fc31e404
Redo platform build_all with sleep and errors rescue. Refs #207
2012-02-23 20:32:56 +02:00
Alexander Machehin
a6a51225b8
[refs #194 ] some js refactoring
2012-02-23 22:16:04 +06:00
Alexander Machehin
027012d3e5
[refs #194 ] some refactotring
2012-02-23 21:57:51 +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
Pavel Chipiga
9eb191da7b
Redo clone logic. Split clone process for repositories. Optimize and refactor. Refs #207
2012-02-22 22:24:29 +02:00
Pavel Chipiga
8f4c207545
Place platform destroy to background. Redo clone process to 2 phases - base_clone and relations_clone. Place relations clone and XML RPC to background. Remove unneeded validations. Refactor xml_rpc_clone. Refs #207
2012-02-22 14:35:40 +02:00
Pavel Chipiga
5829ab87e9
Remove raise. Refs #207
2012-02-21 23:43:06 +02:00
Pavel Chipiga
5b29de93af
Refactor platform clone controller and routes. Refactor and fix clone process for platform, repository, product. Place XML RPC clone request to DJ. Refs #207
2012-02-21 23:27:11 +02: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
Pavel Chipiga
ed60751dfa
Delegate all repo abilities to platform. Remove repository owner and relations. Fix templates and specs. Refactor and code cleanup. Refs #205
2012-02-21 01:13:05 +02:00
Alexander Machehin
5dcc4eabf8
[refs #194 ] tracker without tags manage
2012-02-20 22:54:45 +06:00
Alexander Machehin
eaa6a46a43
[refs #96 ] fixed commit subscribing
2012-02-15 19:07:56 +06:00
Vladimir Sharshov
90c1250769
Merge pull request #186 from warpc/64-project_wiki
...
[Refs #64 ] - Fix diff for russians pages, add ability to revert last commit
2012-02-15 01:44:41 -08:00
George Vinogradov
5b7d1a79d0
[issue #64 ] Removed debug methods and unnecessary comments.
2012-02-15 02:13:52 +04:00
Alexander Machehin
da0d791f74
[refs #96 ] fixed commentable & subscribeable ids
2012-02-15 02:28:01 +06:00
Pavel Chipiga
2c493cdbb7
Apply approved and rejected filters for register requests. Tune abilities. Link to user profile if user have already registered. Refs #174
2012-02-14 20:15:52 +02:00
konstantin.grabar
101fa63514
Small ActivityFeed refactoring
2012-02-14 20:46:08 +04:00
konstantin.grabar
08ffd8c25d
[refs #123 ] Add wiki to ActivityFeed
2012-02-14 20:09:41 +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
George Vinogradov
e9c5273136
[issue #64 ] Added possibility to diff and revert last commit
2012-02-14 18:54:44 +04:00
konstantin.grabar
5039907431
Merge branch 'master' into 123-activity-feed
2012-02-14 14:30:27 +04: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
George Vinogradov
99ee490e94
[issue #64 ] Added callback for notifications + some minor changes
2012-02-14 03:30:17 +04:00
George Vinogradov
159bf21810
Merge branch 'master' into 64-project_wiki
2012-02-14 02:29:32 +04:00
Vladimir Sharshov
141a078cce
Merge pull request #175 from warpc/133-editing_from_web
...
[Refs #133 ] Edit files in git-repo with web editor
2012-02-13 13:07:55 -08:00
George Vinogradov
4dcc39975d
[issue #133 ] Fixed redirection bugs
2012-02-13 23:04:41 +04:00
Vladimir Sharshov
2ca69df1cd
Merge pull request #165 from warpc/150-acl-collaborators
...
[Fix #150 ] Disable edit and update action for non-admin collaborators in projects.
2012-02-13 10:49:01 -08:00
George Vinogradov
c26962c216
[issue #133 ] Added redirects if cannot find Blob object
2012-02-13 22:45:45 +04:00
George Vinogradov
e4da6057a5
[issue #64 ] Changed authorization filters
2012-02-13 22:28:43 +04:00
George Vinogradov
99c314fb11
[issue #133 ] Merge branch 'master' into 133-editing_from_web
...
Conflicts:
db/schema.rb
2012-02-13 21:48:40 +04:00
George Vinogradov
8c0cd29f0e
[issue #133 ] Fixed bug with no acl on editing blobs
2012-02-13 19:21:00 +04:00
George Vinogradov
8417e8c16f
[issue #174 ] multiupdate in admin view.
2012-02-10 15:18:40 +04:00
George Vinogradov
a17f548168
[issue #174 ] Fixed bugs
2012-02-10 14:04:15 +04:00
George Vinogradov
d0fe7f55d5
[issue #174 ] added static pages and some changes
2012-02-10 02:57:43 +04:00
George Vinogradov
ce39cdd04f
[issue #174 ] A half of work to create invitations system
2012-02-09 21:46:23 +04:00
George Vinogradov
ffe2608c32
[issue #133 ] Some makeup and a lot of encodings magic
2012-02-09 04:27:26 +04: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
George Vinogradov
74d401d087
[issue #133 ] Writed draft of web editing.
2012-02-08 21:51:30 +04:00
Alexander Machehin
02217752af
[refs #169 ] fix creating build list on empty repository
2012-02-08 17:07:16 +06:00
konstantin.grabar
96d3b35bdf
[refs #123 ] Merge master into 123-activity-feed
2012-02-06 19:46:32 +04:00
konstantin.grabar
a83d64eaab
[refs #150 ] Fix collaborators cancan authorize
2012-02-06 19:04:56 +04:00
Alexander Machehin
70346f0015
[refs #151 ] refactoring
2012-02-06 20:12:33 +06:00
Alexander Machehin
a79a081fd1
Merge branch 'master' into 151-grit_encodings_problems
2012-02-06 19:55:59 +06:00
George Vinogradov
f2bfcf8699
[issue #151 ] Probably fixed.
2012-02-05 00:12:37 +04:00
Alexander Machehin
87abfb4352
[refs #64 ] fixed forbidden redirection after signin
2012-02-03 21:28:19 +06:00
George Vinogradov
a2f07fad10
Merge branch '64-project_wiki' of github.com:warpc/rosa-build into 64-project_wiki
2012-02-03 04:05:18 +04:00
George Vinogradov
e05f391f8e
[issue #64 ] Write User.uname instead of User.name to commit
2012-02-03 04:04:20 +04:00
Vladimir Sharshov
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
Vladimir Sharshov
8562b882da
Merge pull request #136 from warpc/114-comment_notifications
...
Notifications and subscribtions about new comments in commit [Refs #114 ]
2012-02-01 11:12:24 -08:00
George Vinogradov
d0717c8f9e
[issue #64 ] Merge branch 'master' into 64-project_wiki
...
Conflicts:
Gemfile.lock
db/schema.rb
2012-02-01 22:39:04 +04:00
George Vinogradov
b117ec1331
[issue #64 ] Yet another hacks.
2012-02-01 22:33:53 +04:00
konstantin.grabar
0559f1b678
[refs #127 ] Filter request refactor
2012-02-01 20:00:19 +04:00
George Vinogradov
8733c4dc34
[issue #64 ] Some dirty hacks.
...
Diff for file with russian name don't work yet.
2012-02-01 03:20:42 +04:00
George Vinogradov
6f78e5456c
[issue #64 ] Changes for ruby 1.9.3 compatibility.
2012-01-31 20:40:46 +04:00
Alexander Machehin
f15cb90b87
Merge branch 'master' into 114-comment_notifications
...
Conflicts:
config/locales/ru.yml
2012-01-31 21:42:37 +06:00
George Vinogradov
24124766f4
[issue #64 ] Merge branch 'master' into 64-project_wiki
...
Conflicts:
Gemfile.lock
config/locales/en.yml
db/schema.rb
2012-01-31 02:07:11 +04:00
Pavel Chipiga
13780a1b53
Add magic encodings. Refs #95
2012-01-30 22:39:34 +02:00
Pavel Chipiga
33dce21312
Upgrade to ruby 1.9.3 and fix bugs. Fix bug with commit_hash save during project build. Move some russian text to yml. Code cleanup. Fix templates, deploy and import scripts. Fix specs. Translate event_logs. Refs #95
2012-01-30 22:36:58 +02:00
George Vinogradov
2a27cd3662
[issue #64 ] Some fixes.
2012-01-30 19:27:54 +04:00
Alexander Machehin
119c378149
[refs #114 ] change subsrcibe status to boolean
2012-01-30 17:59:57 +06:00
George Vinogradov
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
George Vinogradov
f7c58f6a77
[issue #64 ] Removed unnecessary files.
2012-01-30 13:12:18 +04:00
Alexander Machehin
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
Alexander Machehin
e0b7699ffd
Revert "Merge branch '114-comment_notifications' into user-emails-list"
...
This reverts commit 2179cbbf40334cbe5d4fa9ba3a7f297d8f543a0a, reversing
changes made to 9bf06e5e1a595f320dc4527ebd44f14be05fcd64.
Conflicts:
app/models/user.rb
2012-01-30 12:22:54 +06:00
Alexander Machehin
f6b6bbfb54
Revert "[refs #114 ] emails control"
...
This reverts commit 26fb1fcbfb843163231d8b8f0caf582bafccbe57.
Conflicts:
app/models/subscribe.rb
app/models/user.rb
spec/models/comment_for_commit_spec.rb
2012-01-30 12:19:54 +06:00
Alexander Machehin
dc39eefe62
Revert "[refs #114 ] add js"
...
This reverts commit 48a9c4d50b9f11a11cc4f2c5831c4b5b25fdc4d1.
2012-01-30 12:16:09 +06:00
Alexander Machehin
2e2e7e43d3
[refs #114 ] some refactoring
2012-01-30 02:18:14 +06:00
George Vinogradov
1ef2bc0f75
[issue #64 ] Actions authorization moved to filters
2012-01-29 22:02:18 +04:00
George Vinogradov
acdd1f22b6
[issue #64 ] Fixed bug with revert all wiki.
2012-01-28 16:10:43 +04:00
Pasha
cd41980441
Merge pull request #135 from warpc/112-sync_projects
...
Доработки автоматической синхронизации
2012-01-27 18:38:31 -08:00
George Vinogradov
aa5641da2f
[issue #64 ] Fixed CanCan bugs.
2012-01-28 06:05:13 +04:00
Pavel Chipiga
fab4aa6eb6
Refactor and fix projects by_name scope. Apply case insensitive projects, repositories and platforms name uniqness validation. Apply case insensitive project search fallback. Redirect import task outnput to log file. Rename all task. Refs #112
2012-01-28 03:04:11 +02:00
Vladimir Sharshov
f9abc2d39c
Hide participate projects
2012-01-28 04:25:11 +04:00
George Vinogradov
a89db6f3a5
[issue #64 ] Fixed bug with multiword page names
2012-01-27 23:14:53 +04:00
George Vinogradov
324e9a294f
[issue #64 ] Fixed some bugs.
2012-01-27 22:30:45 +04:00
George Vinogradov
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
Alexander Machehin
06ab99a1d0
[refs #114 ] add js
2012-01-27 18:20:07 +06:00
George Vinogradov
b04a9e0176
[issue #64 ] Removed duplicated authorization.
2012-01-27 00:51:11 +04:00
Alexander Machehin
e71a9e84cb
[refs #114 ] emails control
2012-01-27 02:11:07 +06:00
George Vinogradov
3cb426a508
[issue #64 ] Added cancan restrictions.
2012-01-26 20:26:21 +04:00
Vladimir Sharshov
c529e63c96
Merge pull request #122 from warpc/105-internationalization
...
[refs #105 ] Fix devise translations
2012-01-26 08:06:34 -08:00
George Vinogradov
da88ac7df7
[issue #64 ] Some refactoring
2012-01-26 18:10:25 +04:00
Alexander Machehin
e04b2eb59b
Merge branch '114-comment_notifications' into user-emails-list
...
Conflicts:
app/models/subscribe.rb
config/locales/en.yml
2012-01-26 14:55:16 +06:00
Alexander Machehin
77420d2a8f
[refs #114 ] user emails
2012-01-26 14:53:40 +06:00
Pavel Chipiga
374628a216
Render answer before publication trying to avoid bug. Refs #97
2012-01-26 00:28:11 +02:00
Alexander Machehin
4cca8f7bb1
[refs #114 ] some refactoring
2012-01-25 23:33:26 +06:00
konstantin.grabar
990a46018c
[refs #123 ] Add base logic for activity feed
2012-01-25 12:31:49 +04:00
George Vinogradov
45877e8b5c
[issue #64 ] Bug fix & views refactoring
...
* Fixed bug with history
* Navigation moved to partial.
2012-01-25 00:47:55 +04:00
Alexander Machehin
61be317b21
[refs #114 ] i18n
2012-01-25 01:00:51 +06:00
Alexander Machehin
6df1640485
[refs #114 ] fix logics
2012-01-24 18:18:39 +06:00
Alexander Machehin
9127b6b689
[refs #114 ] changed logics
2012-01-24 01:42:54 +06:00
George Vinogradov
6140c0c0bc
[issue #64 ] Added some comments
2012-01-23 17:38:10 +04:00
George Vinogradov
230c25eefd
[issue #64 ] Some changes.
...
* WikiController#compare splitted into WikiController#compare
and WikiController#compate_wiki
* Show only last 30 versions in history.
2012-01-23 16:45:38 +04:00
George Vinogradov
d939edda8f
[issue #64 ] Fixed some bugs.
2012-01-21 02:11:46 +04:00
konstantin.grabar
5d93d40693
[refs #113 ] Remove unused action from blobs controller
2012-01-20 22:33:22 +04:00
konstantin.grabar
23ace52d90
[refs #113 ] Images render and download href for binary data into blobs
2012-01-20 22:31:01 +04:00
Alexander Machehin
06a977ea21
Merge branch 'master' into 114-comment_notifications
2012-01-20 22:03:04 +06:00
Alexander Machehin
371abac031
[refs #114 ] fix controller tests
2012-01-20 21:17:05 +06:00
George Vinogradov
011efb0c4b
[issue #64 ] Added git access to Wiki.
2012-01-20 19:01:59 +04:00
konstantin.grabar
e3a716b7db
[refs #105 ] Fix some translations
2012-01-20 15:29:32 +04:00
George Vinogradov
364f2e40c0
[issue #64 ] Added Wiki history, compare, revert.
2012-01-20 03:25:15 +04:00
Alexander Machehin
800b02f544
[refs #18 ] Add project subsribe, tests
2012-01-20 00:20:03 +06:00
George Vinogradov
54bc26d960
[issue #64 ] Added translations.
2012-01-19 18:37:36 +04:00
George Vinogradov
0c527af291
[issue #64 ] Added revisions comparsion.
2012-01-19 17:49:32 +04:00
George Vinogradov
32b64d3462
[issue #64 ] Minor fixes in WikiController
2012-01-19 16:07:08 +04:00
konstantin.grabar
bd6abf2681
[refs #105 ] Add locale fixes
2012-01-19 00:58:38 +04:00
Alexander Machehin
dba11f4662
[refs #114 ] FIXME subscribers
2012-01-19 01:12:52 +06:00
George Vinogradov
0386c34246
[issue #64 ] Added page deletion.
2012-01-18 18:33:35 +04:00
Pasha
4ba268dd67
Merge pull request #109 from warpc/18-commit_comments
...
18 commit comments
2012-01-18 05:49:57 -08:00
Pasha
eb6ec413da
Merge pull request #108 from warpc/105-internationalization
...
105 internationalization
2012-01-18 05:38:55 -08:00
George Vinogradov
a608ded8c4
[issue #76 ] Fixed potential bug in redirects
2012-01-18 04:44:42 +04:00
George Vinogradov
407130f3d7
[issue #64 ] Minor fix in WikiController#show.
2012-01-18 03:46:44 +04:00
George Vinogradov
a9989f07fe
[issue #64 ] Fixed bug with update page
2012-01-18 03:30:04 +04:00
George Vinogradov
51e9b5d1f6
[issue #64 ] Some changes in views and routes.
2012-01-18 02:28:59 +04:00
Alexander Machehin
310e11b666
[refs #18 ] Fix if blocking referer
2012-01-18 00:33:42 +06:00
Pavel Chipiga
f8be867aaf
Replace annotated tags to lightweight. Improve specs. Restore lost migrations. Refs #103
2012-01-17 19:37:41 +02:00
konstantin.grabar
bbbf17c2b4
[refs #105 ] Merge master with 105-internationalization
2012-01-17 17:58:49 +04:00
santaux
62d0419bdd
Merge pull request #106 from warpc/103-bl_publish_new_params
...
Сохранение сборочного коммита, добавление неподписанного тега на сохраненный коммит после публикации
2012-01-17 04:34:15 -08:00
konstantin.grabar
d205eb2dd9
[refs #105 ] Add language check on user save
2012-01-17 15:57:46 +04:00
konstantin.grabar
726eddc40e
[refs #105 ] Add internationalization support to project
2012-01-17 15:48:40 +04:00
Alexander Machehin
d2c5df93a9
Merge branch '18-commit_comments' of github.com:warpc/rosa-build into 18-commit_comments
...
Conflicts:
app/models/comment.rb
app/models/issue.rb
app/views/comments/edit.html.haml
app/views/issues/show.html.haml
2012-01-17 15:57:12 +06:00
Alexander Machehin
bf4e4f02ed
Right merge branch 'master' into 18-commit_comments
...
Conflicts:
app/controllers/comments_controller.rb
app/views/comments/edit.html.haml
app/views/issues/show.html.haml
db/schema.rb
2012-01-17 15:52:46 +06:00
Pavel Chipiga
a687a6601b
Save commit_hash during build_list create. Tag git repo during build_list publish. Write and fix specs. Refs #103
2012-01-16 23:51:20 +02:00
George Vinogradov
1e1dab369b
[issue #64 ] Added some views, styles and scripts.
...
* Added base gollum styles
* Added base gollum javascripts (with minor changes)
* Fixed some bugs in WikiController
* Added some views (draft yet)
2012-01-17 01:48:38 +04:00
Alexander Machehin
80ba40f6ee
Merge branch 'master' into 18-commit_comments
...
rspec spec/ = 528 examples, 12 failures
2012-01-17 00:52:16 +06:00
konstantin.grabar
52696791f2
[refs #54 , #94 ] Merge master into issues
2012-01-16 13:42:44 +04:00
Alexander Machehin
bdc3b3a3d1
[refs #18 ] controller tests
2012-01-14 18:16:42 +06:00
Pavel Chipiga
712ca8d95a
Save package_version during success build_list publish. Add specs. Refs #103
2012-01-13 18:45:13 +02:00
konstantin.grabar
a1a92e9878
[refs #54 ] Fix comments serial_id routing and some logic
2012-01-13 20:07:46 +04:00
Alexander Machehin
794c55a030
Merge branch 'master' of github.com:warpc/rosa-build into 18-commit_comments
2012-01-13 22:01:30 +06:00
Alexander Machehin
8252367537
some fix
2012-01-13 21:58:48 +06:00
konstantin.grabar
db0a66846b
[refs #94 ] Add new notifier rules. Fix some issues and comments bugs
2012-01-13 19:07:01 +04:00
George Vinogradov
729bd94045
[issue #64 ] Merge branch 'master' into 64-project_wiki
...
Conflicts:
config/routes.rb
db/schema.rb
2012-01-13 18:05:42 +04:00
George Vinogradov
0751a94974
[update #76 ] Merge branch 'master' into 76-project_autocomplete
...
Conflicts:
app/views/layouts/_stylesheets.html.haml
2012-01-12 20:43:32 +04:00
George Vinogradov
73b710ae4e
[ close #76 ] Changed styles. Fixed bug with pagination.
2012-01-12 20:37:50 +04:00
konstantin.grabar
f6e4de3b72
[refs #54 ] Fix issue assign user subscribe update filter
2012-01-12 17:07:54 +04:00
Alexander Machehin
07dc7a4800
[refs #18 ] add comments to commit
2012-01-12 17:19:22 +06:00
George Vinogradov
49082c2a8d
[issue #76 ] Fixed bug with JSON generation.
2012-01-12 01:12:56 +04:00
Pavel Chipiga
c23312ad51
Research and fix problem with build_lists#auto_publish feature. Fix specs. Refs #97
2012-01-11 21:43:33 +02:00
konstantin.grabar
2b8aca5f09
[refs #54 ] Add settings notifier
2012-01-11 17:58:13 +04:00
konstantin.grabar
16c9d0ec15
[refs #54 ] Fix some bugs of issues and comments + add comment body to email
2011-12-31 14:51:47 +04:00
George Vinogradov
7c50b2c3f5
[issue #76 ] Added jQuery DataTable. But it doesn't work yet
2011-12-31 02:42:58 +04:00
konstantin.grabar
e8977a7d95
Merger issues with master
2011-12-30 18:23:16 +04:00
George Vinogradov
633e5ebffc
Added actions to WikiController
2011-12-29 22:00:43 +04:00
Pavel Chipiga
acb970686c
Apply auto_publish for build_lists. Apply publish build_list error status. Remove circle build info. Display auto_publish info. Fix bugs. Refactor. Apply specs for all build_lists core callbacks. Refs #72
2011-12-29 04:37:34 +02:00
konstantin.grabar
49ec1ebe98
[refs #54 ] Remove unused comments
2011-12-28 18:24:24 +04:00
konstantin.grabar
fa8656d1f5
[refs #54 ] Refactor subscires routes and authorize
2011-12-28 17:54:45 +04:00
konstantin.grabar
1c263c6e0a
[refs #54 ] Notification DJ support. Routes fixes.
2011-12-28 14:47:54 +04:00
konstantin.grabar
a783b460bd
Merge issues with master
2011-12-28 13:22:57 +04:00
Pavel Chipiga
5e3addd5d2
Great refactor for cancan abilities. Remove product relations. Fix git abilities. Fix and refactor specs. Refs #85 . Refactor issues controller to avoid serial_id problem. Fix links and routes. Fix minor bugs and translations. Fix specs. Refs #54
2011-12-28 04:59:05 +02:00
konstantin.grabar
ecbfed9300
[refs #54 ] Fix user_id validation into issues
2011-12-27 21:49:08 +04:00
konstantin.grabar
8face9208e
[refs #54 ] Add fixes and locales to subscribes
2011-12-27 16:35:31 +04:00
George Vinogradov
ec95373d28
[#issue 64] Routes to Wiki and some methods in controller.
...
Useless yet.
2011-12-26 21:07:16 +04:00
George Vinogradov
81378478ca
[issue #64 ] Added Wiki controller and some methods in Project
2011-12-26 21:07:07 +04:00
konstantin.grabar
ce6746f7a9
[refs #54 ] Add subscribes and notifications
2011-12-26 19:48:57 +04:00
Pavel Chipiga
7d3dd5eaf1
[ #82 ] Merge branch 'master' into 65-build_repo
...
Conflicts:
spec/models/cancan_spec.rb
2011-12-26 14:51:30 +02:00
konstantin.grabar
5237939f49
Merge issues with master
2011-12-26 13:26:13 +04:00
konstantin.grabar
bf2f3d1bc7
[refs #54 ] Add issue statuses filters
2011-12-23 18:34:32 +04:00
konstantin.grabar
894bc0c077
[refs #54 ] Add issues tests. Fix some CanCan rights. Make some fixes to logic
2011-12-23 14:56:46 +04:00
Pavel Chipiga
8c3291d237
Fix and redo specs after great build_lists refactoring and improvement. Fix minor bugs. Code cleanup. Refs #65
2011-12-23 04:14:28 +02:00
konstantin.grabar
e2144e0fdb
[refs #54 ] Fix issue ability and comment redirect after update
2011-12-22 11:41:37 +04:00
Pavel Chipiga
a82f59f35a
Add route, action and statuses for publish_build. Apply status assign and check. Localize statuses. Convert tabs to spaces. Refs #80
2011-12-22 02:53:55 +02:00
Pavel Chipiga
2c67843c34
Refactor and cleanup build_lists controller and routes. Rename methods. Allow deffis in platform and repository name. Add missing relation and migration to force work user assign in build_lists. Fix and simplify links. Abstract sidebar. Refs #65
2011-12-21 23:42:06 +02:00
Pavel Chipiga
8c2b837600
Fix build_list user assign. Refs #65
2011-12-21 21:17:55 +02:00
Pavel Chipiga
e588482f32
[ #74 ] Merge branch 'master' into 65-build_repo
...
Conflicts:
app/controllers/build_lists_controller.rb
app/controllers/projects_controller.rb
db/schema.rb
2011-12-21 20:13:57 +02:00
konstantin.grabar
3ab55d34b8
[refs #54 ] Add CanCan rules for issues and comments. Fix serial_id routes and some actions
2011-12-21 18:48:16 +04:00
Pavel Chipiga
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
George Vinogradov
6c48e058be
[ close #70 ] Removed all & filter methods in BuildListsController
...
* Removed methods
* Changed abilities
* Changed routes
* Added specs
2011-12-21 05:30:34 +04:00
Vladimir Sharshov
cb91bdb858
Merge pull request #68 from warpc/build_list_visibilities
...
Customize build list monitoring:
* show all user public build list
* show private build list only who have access for project
* admin see all build list
2011-12-20 15:46:43 -08:00
George Vinogradov
3eb2ae545a
[issue #27 ] Merge branch 'master' into build_list_visibilities
...
Conflicts:
app/views/build_lists/_filter.html.haml
2011-12-20 21:25:35 +04:00
George Vinogradov
0978312366
[update #27 ] Removed unnecessary comments.
2011-12-20 21:22:44 +04:00
George Vinogradov
39dade9945
[ closed #63 ] Added user column to build_list.
2011-12-20 21:09:29 +04:00
konstantin.grabar
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
konstantin.grabar
446cdac8e6
[refs #54 ] Add new locales. Fix routes. Fix issues and comments update
2011-12-20 14:20:00 +04:00
konstantin.grabar
d20d43eb2b
[refs #54 ] Base logic and templates for issues and comments to them
2011-12-19 19:30:14 +04:00
George Vinogradov
a946349bb4
[ close #23 ] Changed searching.
2011-12-16 04:33:44 +04:00
Vladimir Sharshov
021f1f8691
Merge pull request #58 from warpc/47-fork_bug
...
Fix #47 . Problem with fork when project already exist in personal repository
* Allow to add only own projects to personal repository(solution);
* Fix tests;
* Remove deprected relation.
2011-12-15 14:08:03 -08:00
George Vinogradov
0c3b62b235
[issue #27 ] Changed abilities. Added test, but test fails.
2011-12-16 01:58:20 +04:00
Pavel Chipiga
7448d74416
Allow to add only own projects to personal repository. Fix tests. Remove deprected relation. Refs #47
2011-12-15 23:52:45 +02:00
konstantin.grabar
b3f422e713
[refs #32 ] Add user filter
2011-12-15 20:15:25 +04:00
George Vinogradov
e3663381db
Merge branch 'master' into build_list_visibilities
2011-12-15 03:29:22 +04:00
Pavel Chipiga
a855366a75
Fix merge bug. Take back method. Refs #1
2011-12-15 00:11:31 +02:00
Pavel Chipiga
f1465f51ca
Merge branch 'master' into 1-bluepill
...
Conflicts:
app/controllers/platforms_controller.rb
app/models/platform.rb
2011-12-14 23:51:31 +02:00
George Vinogradov
2a108981d5
[update #20 ] To server sends id instead of uname. Added some specs
2011-12-14 19:54:04 +04:00
George Vinogradov
1b3e473b94
[ closed #20 ] Changed adding collaborators to project
...
Changed collaborators page of project:
* Added form to input group and/or project nickname.
* In tables show only projects/groups that already added to project
2011-12-14 19:52:47 +04:00
Vladimir Sharshov
9ab07c1675
Merge pull request #36 from warpc/platform_edit
...
Edit platform;
Added callback updates with new owner.
Added a button for call edit action;
Removed unnecessary to edit platform form field when you upgrade.
2011-12-14 03:15:41 -08:00
Vladimir Sharshov
1d55e8758e
Merge pull request #26 from warpc/platform_admin_fixes
...
Fix autocomplete. Rsync stubs for development env. Blocked problematic validation for development env
2011-12-14 02:00:01 -08:00
Pavel Chipiga
045b8441f6
Apply basic bluepill configuration, write capistrano recipe for it. Change deploy logic to integrate with bluepill. Refactor unicorn config. Cleanup depoy. Refactor mount_downloads script. Write autostart script. Remove old scripts. Refactor platform mount/umount methods. Fix bugs. Refs #1
2011-12-13 23:48:25 +02:00
George Vinogradov
30b08c4a80
[issue #27 ] Commented maybe unnecessarry scope.
...
Removed BuildList#scoped_open_to_user_with_groups because its
functionality provides CanCan after changes in [issue #37 ].
2011-12-13 19:24:02 +04:00
konstantin.grabar
4a723369a2
[refs #12 ] Add platform update options
2011-12-13 17:27:27 +04:00
Vladimir Sharshov
e0e0dd1fed
Merge branch 'master' of github.com:warpc/rosa-build
2011-12-13 17:15:22 +04:00
Vladimir Sharshov
fdd89eb51b
#24 . Fix "uninitialized constant BuildList::BUILD_STARTED"
2011-12-13 15:02:41 +04:00
santaux
24766d2383
Merge pull request #14 from warpc/group_members_change
...
Changed adding members to group.
2011-12-13 02:16:37 -08:00
George Vinogradov
461cf3fd8e
[issue #27 ] Added using of new BuildList scope in controller
2011-12-13 04:27:03 +04:00
konstantin.grabar
222033de5e
[refs #12 ] Fix platform relations again
2011-12-12 19:37:37 +04:00
konstantin.grabar
6a364b73a6
[refs #12 ] Fix platform admin relations. Locales correction. Add validationa and rsync stubs.
2011-12-12 18:10:39 +04:00
George Vinogradov
c3f4c8dd87
[updated #16 ] admin_id renamed to admin_uname.
2011-12-11 21:43:42 +04:00