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 |