e9ae923b60
[refs #195 ] Merge 3.2-master into 195-new_design_for_projects
2012-02-28 20:10:31 +04:00
99e3bbb762
[refs #194 ] update issue content
2012-02-28 21:41:47 +06:00
0abea8ff55
[refs #194 ] fix issues count
2012-02-28 20:28:11 +06:00
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
0d75a37451
[refs #194 ] show page beta version
2012-02-28 20:05:18 +06:00
66a08662c2
[refs #194 ] new styles; some changes
2012-02-28 15:23:27 +06: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
70963d0943
Merge branch 'master' into 3.2-master
2012-02-27 22:34:21 +02:00
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
ddda2b92ab
[Refs #221 ] Delete product build lists (only in web)
2012-02-28 00:00:33 +04:00
7508bb1339
Fix bugs to force new design work. Minor refactor and improvements. Refs #193
2012-02-27 20:58:37 +02:00
2c0e1b6314
Merge branch '3.2-master' into 194-tracker
...
Conflicts:
app/assets/stylesheets/custom.scss
2012-02-27 23:55:18 +06: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
1005fbd64f
Add link to product container. Refs #217
2012-02-27 18:21:56 +02:00
27c85d32df
[refs #194 ] create page; index pagination; some bugs
2012-02-27 22:10:12 +06:00
e1f7817624
Add local admin ability to build product. Fix template links. Refactor. Refs #217
2012-02-27 15:49:24 +02:00
72fec3b314
[refs #195 ] Add owner choose on project create
2012-02-27 13:03:28 +04:00
1dd20377cf
Fix layout. Refs #193
2012-02-24 23:54:44 +02:00
4d2459c60c
Refactor, fix and cleanup wiki templates and translations. Refs #193
2012-02-24 23:39:40 +02:00
3c83649627
[issue #96 ] Some fixes in layout and scripts.
2012-02-24 23:39:40 +02:00
3c5cdfd5e4
[refs #195 ] Add is_rpm field to projects. Continue set new design
2012-02-24 17:05:58 +04:00
027012d3e5
[refs #194 ] some refactotring
2012-02-23 21:57:51 +06:00
9e5e7cd5e4
[refs #194 ] labels manage
2012-02-23 20:48:46 +06: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
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
328cd17f46
[issue #195 ] Fixed bug in CommitPresenter
2012-02-21 19:51:48 +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
81393d7f5b
[refs #193 ] Disable more than 2 versions for wiki diff by js
2012-02-21 16:42:09 +04:00
9b610eb920
[refs #193 ] Fixed old commented code from old template versions. Fix diff page
2012-02-21 14:49:06 +04:00
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
5dcc4eabf8
[refs #194 ] tracker without tags manage
2012-02-20 22:54:45 +06:00
2bdcdb6fd3
[refs #193 ] Fix compare buttons and links design
2012-02-20 14:27:58 +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
c140c1b466
Merge branch '194-project_submenu' into 193-new_design_for_wiki
2012-02-16 12:23:41 +04:00
55379ed9c8
[refs #194 ] first steps
2012-02-16 00:53:58 +06: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
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
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
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
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
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
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
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
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
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
74d401d087
[issue #133 ] Writed draft of web editing.
2012-02-08 21:51:30 +04: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
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
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
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
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
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
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
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
5f40030e30
[issue #64 ] Fixed bug with cloning wiki repository
2012-01-30 18:17:00 +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
f7c58f6a77
[issue #64 ] Removed unnecessary files.
2012-01-30 13:12:18 +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
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
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
dc39eefe62
Revert "[refs #114 ] add js"
...
This reverts commit 48a9c4d50b9f11a11cc4f2c5831c4b5b25fdc4d1.
2012-01-30 12:16:09 +06:00
konstantin.grabar
Alexander Machehin
Pavel Chipiga
Vladimir Sharshov
George Vinogradov