a807a22230
[refs #579 ] remove debug code
2012-10-16 14:07:26 +06:00
1ee9e3f00e
[refs #579 ] fixed updating comment
2012-10-15 18:30:34 +06:00
bb47567628
[refs #579 ] small improvements of the discussion
2012-10-13 00:12:04 +06:00
548f698526
[refs #579 ] add a line comment button
2012-10-08 20:42:38 +06:00
e085784d51
Merge branch 'master' into 579-code_line_comments
...
Conflicts:
app/assets/stylesheets/design/custom.scss
app/helpers/diff_helper.rb
app/models/ability.rb
app/views/projects/comments/_list.html.haml
app/views/projects/git/commits/_commit_diff.html.haml
lib/ext/git/inline_callback.rb
2012-10-05 15:32:29 +06:00
527dd210bf
[refs #579 ] alpha version of inline comments for commit
2012-10-05 00:40:12 +06:00
94029c3cda
[refs #90 ] base -> to, head -> from
2012-10-03 17:58:34 +06:00
eaf29713cc
[refs #90 ] autoload refs
2012-10-01 22:03:08 +06: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
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
06e15cf3fa
[refs #616 ] remove unneeded code
2012-09-25 15:47:12 +06:00
9be978eb68
#648 : updated models, JS, controller according to comments and discussions
2012-09-24 22:04:53 +04:00
2c6d4bae9e
[refs #616 ] add error messages to ajax
2012-09-24 23:34:14 +06:00
c14f2851e3
#648 : revert changes
2012-09-21 22:04:58 +04:00
2406423483
#648 : added filters to Projects page
2012-09-21 21:57:22 +04:00
b65ca14131
[refs #616 ] small js refactoring
2012-09-21 16:31:55 +06:00
378fe5847e
[refs #616 ] ugly replaces
2012-09-20 23:10:50 +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
7bb0ced8cb
#645 : fixed.
2012-09-14 18:49:08 +04:00
6bdaf06d86
#633 : removed unnecessary code
2012-09-14 02:30:54 +04:00
bdb3eb288c
#633 : removed checkbox from name of platform
2012-09-14 02:22:10 +04:00
ba6805598f
#633 : small refactoring
2012-09-13 20:16:13 +04:00
a99bfee4a6
#633 : UI has been updated
2012-09-13 20:08:41 +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
6bcff5ad6f
Merge pull request #623 from warpc/616-issues_and_comments
...
[refs #616 ] Refactoring and fixed bugs with issue:
* could not remove all labels from issue;
* after update issue body now no need reload page to view changes;
* refactoring issues controller.
2012-08-27 03:46:27 -07:00
2c0826a77d
[refs #616 ] fixed showing body after update
2012-08-25 23:40:51 +06:00
edd7bcdb6d
[issue #590 ] JS hack to force SelectBox to render.
2012-08-21 01:33:54 +04:00
ec7d132a3f
[refs #90 ] fixed update commits button
2012-08-08 23:57:03 +06:00
910aac939e
[refs #90 ] fixed changing tabs & anchors
2012-08-08 21:47:58 +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
c0036a1bb5
[refs #576 ] Fix should_show? method and template offsets
2012-07-25 16:41:12 +04:00
15a86c2ecd
[refs #576 ] Add flash notifies
2012-07-23 18:25:37 +04:00
b24a4a35b2
[refs #90 ] modify pull tab urls
2012-07-19 00:02:27 +06:00
b9e1f44fe8
[refs #90 ] remove old code
2012-07-17 23:02:55 +06:00
77a67975b1
[refs #90 ] hide create pull button after change project or refs
2012-07-10 22:07:51 +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
07e02d9a17
[refs #90 ] modified Update commits button
2012-07-10 00:41:39 +06:00
3c8b77027e
[issue #428 ] Allowed any update_types when build for released platform.
2012-07-06 03:05:47 +04: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
904cfca5c9
[refs #529 ] Fix branch set for repository with dot in name
2012-06-19 18:52:29 +04:00
60aba754ae
[refs #90 ] pull title/body update
2012-05-31 22:57:52 +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
2d1001f1c1
[refs #478 ] Fix js handler
2012-05-25 14:49:37 +04:00
e38bf98d54
[refs #478 ] Move js logic to another handler
2012-05-25 11:26:42 +04:00
0958299f51
[refs #478 ] Change js handler logic
2012-05-24 16:51:39 +04:00
3d2bcdd019
[refs #478 ] Add js handler to disable frozen platforms and their reps
2012-05-24 14:21:57 +04: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
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
628fed40ea
[refs #90 ] issue status -> state
2012-04-23 23:34:11 +06:00
618d1ecb49
[issue #408 ] Fixed bug with selectbox
2012-04-18 21:31:11 +04:00
9d96b2b565
[issue #408 ] Removed comment.
2012-04-18 14:46:34 +04:00
6c64125787
[issue #408 ] Changed behavior of build list for released platform
2012-04-17 22:18:39 +04:00
c339f2aee0
Merge pull request #403 from warpc/223-change_build_lists_new_js_handlers
...
[refs #223 ] Add platform branch auto select if this branch exist
2012-04-16 10:00:53 -07:00
d24422f757
[refs #223 ] Add branch auto select
2012-04-16 20:06:34 +04:00
2dedbd92d0
[refs #194 ] assignee & user
2012-04-14 01:44:04 +06:00
f7e09c993d
[refs #223 ] Optimise code by jQuery chains
2012-04-10 17:15:48 +04:00
d6dc51ba93
[refs #223 ] Choosen rep auto set
2012-04-10 13:05:42 +04:00
6ccf7e8456
[refs #223 ] Change js handlers and some inputs logics
2012-04-09 18:33:51 +04:00
9e31ae75b1
[issue #195 ] Added groups support to project.
2012-03-22 04:44:05 +04:00
5abf64e353
[refs #200 ] Fix chbx behaviour for repos and their platforms
2012-03-21 19:04:01 +04:00
f9850c6885
[refs #200 ] Fix checkbox checking on build list form
2012-03-21 15:34:11 +04:00
31e0c9191c
[refs #200 ] Fix build list form interface and include_repos logic
2012-03-20 14:36:31 +04:00
f0645be9c5
[refs #200 ] Change build list repos and platforms interface
2012-03-19 23:52:46 +04:00
e49551756c
Merge pull request #276 from warpc/194-issue_page
...
[Refs #194 ] Fix for manage labels and executor
2012-03-07 11:26:11 -08:00
8df4fdfa5c
[refs #194 ] remove labels search from js
2012-03-07 22:26:43 +06:00
c657efc338
[refs #194 ] show all project labels without searching
2012-03-07 19:36:17 +06:00
9a6beef2da
[refs #194 ] fix issue managing labels
2012-03-07 16:50:45 +06:00
4b173932e5
[refs #194 ] fix managing issue executor
2012-03-07 16:44:42 +06:00
82d26b08b9
[refs #223 ] fix selector
2012-03-07 16:27:29 +06:00
1791160b09
[refs #194 ] fix manage issue executor
2012-03-06 22:31:07 +06:00
b9de81f4df
[refs #194 ] managing labels in the issue
2012-03-06 21:21:13 +06:00
9e6d06f1c9
[refs #194 ] manage issue executer
2012-03-06 00:28:55 +06:00
e66f0110fc
Merge branch '3.2-master' into 195-new_design_for_projects
...
Conflicts:
app/assets/javascripts/extra/syntax.highlighter-init.js
app/assets/stylesheets/design/common.scss
vendor/assets/stylesheets/vendor.scss
2012-03-02 02:12:11 +02: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
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
Alexander Machehin
Vokhmin Alexey V
Vladimir Sharshov
George Vinogradov
konstantin.grabar
Pavel Chipiga