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
2bdcdb6fd3
[refs #193 ] Fix compare buttons and links design
2012-02-20 14:27:58 +04:00
f22d9809ff
[refs #193 ] Remove debug puts from wiki controller
2012-02-20 14:02:04 +04:00
43a268371f
[issue #203 ] Some changes in ApplicationPresenter
2012-02-19 03:21:34 +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
d9025b093f
[refs #193 ] Compare routes repair and compare design
2012-02-17 18:12:05 +04:00
4bdc763ef0
Merge branch '3.2-master' into 195-new_design_for_projects
2012-02-17 18:02:43 +04:00
7863869a30
[refs# 193] Move some gollum style to docs/gollum. Add new styles to edit and new pages
2012-02-17 16:47:33 +04:00
d8a3983b07
[refs #193 ] Add new design to wiki
2012-02-17 15:13:54 +04:00
608faf3564
[issue #96 ] Some fixes in layout and scripts.
2012-02-17 03:07:22 +04:00
a5375c369c
[refs #134 ] lost env!
2012-02-16 22:29:41 +06:00
4888993c3f
[refs #134 ] fixed bug with new project
2012-02-16 21:08:08 +06:00
98059d6570
Merge pull request #191 from warpc/134-git-hook
...
[refs #134 ] Fixed git hook (hadr-coded desctionation and wrong rails env)
2012-02-16 05:52:09 -08:00
c140c1b466
Merge branch '194-project_submenu' into 193-new_design_for_wiki
2012-02-16 12:23:41 +04:00
fab80d97eb
[refs #194 ] project submenu partial
2012-02-15 22:32:26 +06:00
5dac20bac5
Some fixes:
...
* Changed default visibility to personal platforms to 'open'
* Changed 'Erase' button to simple link in comments partial
* Probably added domain name to links in mail notifications
* Fixed protocol in repo links form 'http' to 'https'
2012-02-15 20:30:56 +04:00
0763936e38
[refs #193 ] Wiki navigation design
2012-02-15 19:01:49 +04:00
eaa6a46a43
[refs #96 ] fixed commit subscribing
2012-02-15 19:07:56 +06:00
20836e8864
[refs #134 ] fixed git hook
2012-02-15 17:12:49 +06:00
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
5b7d1a79d0
[issue #64 ] Removed debug methods and unnecessary comments.
2012-02-15 02:13:52 +04:00
da0d791f74
[refs #96 ] fixed commentable & subscribeable ids
2012-02-15 02:28:01 +06:00
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
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
e9c5273136
[issue #64 ] Added possibility to diff and revert last commit
2012-02-14 18:54:44 +04:00
85723f7da6
[issue #64 ] Fixed encodings bugs
2012-02-14 18:54:18 +04:00
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
99ee490e94
[issue #64 ] Added callback for notifications + some minor changes
2012-02-14 03:30:17 +04:00
159bf21810
Merge branch 'master' into 64-project_wiki
2012-02-14 02:29:32 +04:00
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
4dcc39975d
[issue #133 ] Fixed redirection bugs
2012-02-13 23:04:41 +04:00
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
c26962c216
[issue #133 ] Added redirects if cannot find Blob object
2012-02-13 22:45:45 +04:00
e4da6057a5
[issue #64 ] Changed authorization filters
2012-02-13 22:28:43 +04:00
99c314fb11
[issue #133 ] Merge branch 'master' into 133-editing_from_web
...
Conflicts:
db/schema.rb
2012-02-13 21:48:40 +04:00
2350993120
Merge pull request #182 from warpc/171-build_list_tab_acl_fix
...
[fix #171 ] Added ACL calls to project navigation
2012-02-13 09:24:04 -08:00
c6f9995b98
Add GA code to layouts and invite pages. Do not track admins. Refs #183
2012-02-13 18:42:11 +02:00
50d27ad34d
[issue #171 ] Added ACL calls to project navigation.
2012-02-13 20:16:50 +04:00
8c0cd29f0e
[issue #133 ] Fixed bug with no acl on editing blobs
2012-02-13 19:21:00 +04:00
391716fee5
[refs #133 ] Fix syntax error into blob template
2012-02-13 14:43:57 +04:00
1356ffa437
[refs #178 ] Fix project create error with group owner
2012-02-13 14:23:20 +04:00
704c544cbc
Add more register_requests fields, change design. Apply invitation mail sending. Refactor. Refs #174
2012-02-10 18:33:16 +02:00
8417e8c16f
[issue #174 ] multiupdate in admin view.
2012-02-10 15:18:40 +04:00
a17f548168
[issue #174 ] Fixed bugs
2012-02-10 14:04:15 +04:00
e535ca2b64
Fix validations. Refs #174
2012-02-10 01:33:06 +02:00
d0fe7f55d5
[issue #174 ] added static pages and some changes
2012-02-10 02:57:43 +04:00
f9e7f3fb06
[issue #174 ] Devise hacks
2012-02-10 01:45:26 +04:00
edef21068d
[issue #174 ] Fixed bug with RegisterRequest
2012-02-10 01:44:47 +04:00
ce39cdd04f
[issue #174 ] A half of work to create invitations system
2012-02-09 21:46:23 +04:00
a4baf8b670
[issue #133 ] Editor JS moved to separate file
2012-02-09 04:35:07 +04:00
ffe2608c32
[issue #133 ] Some makeup and a lot of encodings magic
2012-02-09 04:27:26 +04:00
e23a02d357
[issue #133 ] Some fixes in Git::Repository#update_file
2012-02-09 04:03:40 +04:00
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
d44a274c77
[issue #133 ] Fixed bug and added comments
2012-02-09 00:56:18 +04:00
e9f3b79bd2
Merge pull request #176 from warpc/169-fix_create_build_list
...
[refs #169 ] fix creating build list for empty build version
2012-02-08 10:21:40 -08:00
74d401d087
[issue #133 ] Writed draft of web editing.
2012-02-08 21:51:30 +04:00
02217752af
[refs #169 ] fix creating build list on empty repository
2012-02-08 17:07:16 +06:00
c47db56270
[refs #168 ] can read repos in the open platform
2012-02-07 19:55:45 +06:00
325667dde0
[refs #168 ] removed wrong ability
2012-02-07 17:31:00 +06:00
ff6c855234
Merge pull request #170 from warpc/155-fix_render_event_logs
...
[refs #155 ] fix render event logs
2012-02-07 01:35:21 -08:00
86704bc39d
[refs #155 ] fix render event logs
2012-02-07 15:31:07 +06:00
a1fcc62768
Merge pull request #167 from warpc/143-fix-destroy-group
...
[Fixs #143 ] Group dooes not destroy personal platfrom when deleting
2012-02-07 00:02:13 -08:00
36f609ec7d
[refs #143 ] fix destroy
2012-02-07 01:47:39 +06:00
4e3d6b4056
Show xml-rpc error code in error message
2012-02-06 19:07:08 +04:00
c367fc818b
Merge branch 'master' of github.com:warpc/rosa-build
2012-02-06 19:05:50 +04:00
a83d64eaab
[refs #150 ] Fix collaborators cancan authorize
2012-02-06 19:04:56 +04:00
70346f0015
[refs #151 ] refactoring
2012-02-06 20:12:33 +06:00
a79a081fd1
Merge branch 'master' into 151-grit_encodings_problems
2012-02-06 19:55:59 +06:00
60ec9867bb
[refs #163 ] fix commits list
2012-02-06 18:58:45 +06:00
fde67a2c22
[refs #134 ] add post receive hook to repos
2012-02-06 15:31:22 +06:00
427fc670ac
Merge branch 'master' of github.com:warpc/rosa-build
2012-02-06 11:57:09 +04:00
f2bfcf8699
[issue #151 ] Probably fixed.
2012-02-05 00:12:37 +04:00
0591ba4378
[ fix #158 ] Fixed bug with render in BlobController#raw
2012-02-04 22:03:29 +04:00
28da24d020
Merge branch 'master' of github.com:warpc/rosa-build
2012-02-03 19:49:56 +04:00
87abfb4352
[refs #64 ] fixed forbidden redirection after signin
2012-02-03 21:28:19 +06:00
85c0d8b827
Change git branch for mass rebuild
2012-02-03 18:32:04 +04:00
b0d0b21ec4
[refs #144 ] fix template
2012-02-03 19:40:47 +06:00
549fc242d8
[issue #64 ] Fixed bug in _history partial
2012-02-03 04:23:29 +04:00
a2f07fad10
Merge branch '64-project_wiki' of github.com:warpc/rosa-build into 64-project_wiki
2012-02-03 04:05:18 +04:00
e05f391f8e
[issue #64 ] Write User.uname instead of User.name to commit
2012-02-03 04:04:20 +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
68c97b3a33
[refs #64 ] some template fixes
2012-02-03 00:46:33 +06:00
821062c150
Merge branch '64-project_wiki' of github.com:warpc/rosa-build into 64-project_wiki
2012-02-02 03:18:53 +04:00
4cd20934c4
[issue #64 ] Removed unused MathJax
2012-02-02 03:17:16 +04:00
0006bf3b63
Returned before_initialize to Group.
2012-02-02 01:20:10 +04:00
cb7a9fcc21
fix group autocomplete
2012-02-02 02:42:23 +06:00
20613ba2c3
[refs #64 ] All pages:
2012-02-02 01:36:56 +06:00
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
d0717c8f9e
[issue #64 ] Merge branch 'master' into 64-project_wiki
...
Conflicts:
Gemfile.lock
db/schema.rb
2012-02-01 22:39:04 +04:00
b117ec1331
[issue #64 ] Yet another hacks.
2012-02-01 22:33:53 +04:00
0559f1b678
[refs #127 ] Filter request refactor
2012-02-01 20:00:19 +04:00
8733c4dc34
[issue #64 ] Some dirty hacks.
...
Diff for file with russian name don't work yet.
2012-02-01 03:20:42 +04:00
34b105675a
Add 1 more mime type to product
2012-01-31 23:29:25 +02:00
fde298cc85
Rollback to redhillonrails_core instead of schema_plus to avoid some bugs. Add platform reference to project_imports, change indexes and validators. Adjust sync algoritm to use platform_id. Improve rsync params. Refs #112 , #138
2012-01-31 20:48:37 +02:00
6f78e5456c
[issue #64 ] Changes for ruby 1.9.3 compatibility.
2012-01-31 20:40:46 +04:00
f15cb90b87
Merge branch 'master' into 114-comment_notifications
...
Conflicts:
config/locales/ru.yml
2012-01-31 21:42:37 +06:00
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
07e71c2dfc
[issue #64 ] Changed find_by to where
2012-01-31 01:20:03 +04:00
13780a1b53
Add magic encodings. Refs #95
2012-01-30 22:39:34 +02:00
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
Pavel Chipiga
konstantin.grabar
George Vinogradov
Alexander Machehin
Vladimir Sharshov