b2ff7326d1
Merge branch 'master' into 90-pull
...
Conflicts:
config/locales/en.yml
config/locales/ru.yml
2012-08-13 15:01:43 +06:00
efa08933fd
[issue #590 ] Added average build time to :build_started BuildLists
2012-08-12 02:08:28 +04:00
45169faf2f
Merge pull request #609 from warpc/590-build_list_page_change
...
[refs #590 ] add time notification and periodic page update
2012-08-09 14:49:12 -07:00
e5e8cc7e7f
[issue #590 ] Changed time representation.
...
* Removed buggy jquery.countdown plugin
* Page reloads every minute
2012-08-09 20:39:01 +04:00
7961bd5fc1
[issue #590 ] Added missed style.
2012-08-09 01:19:43 +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
6a04f4ad7a
Merge again branch 'master' into 90-pull
...
Conflicts:
db/schema.rb
2012-08-06 11:19:06 +06:00
a1b7bcac32
[issue #565 ] Merge branch 'master' into 565-feedback_form
...
Conflicts:
app/assets/stylesheets/design/custom.scss
2012-08-03 23:36:14 +04:00
6e598ad5f9
[refs #565 ] fixed feedback image
2012-07-30 20:59:50 +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
931e7a22b4
[refs #576 ] Merge master into 576-flash_notifies
2012-07-24 14:08:34 +04:00
15a86c2ecd
[refs #576 ] Add flash notifies
2012-07-23 18:25:37 +04:00
6d046764ef
[issue #565 ] Merge branch 'master' into 565-feedback_form
...
Conflicts:
app/assets/stylesheets/design/custom.scss
2012-07-20 20:15:55 +04:00
d6c65a1626
[issue #565 ] Added feedback form.
...
* Added web pages to send request
* Added mailer to send feedback message.
2012-07-20 20:06:31 +04:00
d130409640
Merge branch 'master' into 90-pull
...
Conflicts:
app/assets/stylesheets/design/custom.scss
2012-07-20 15:33:11 +06:00
35b953ac11
[refs #90 ] add commit/pull lines ref
2012-07-19 22:42:37 +06:00
b24a4a35b2
[refs #90 ] modify pull tab urls
2012-07-19 00:02:27 +06:00
0ac1f52e31
[refs #569 ] fixed hr style
2012-07-17 23:43:13 +06:00
b9e1f44fe8
[refs #90 ] remove old code
2012-07-17 23:02:55 +06:00
dc521f5844
[refs #90 ] link to refs
2012-07-17 22:40:48 +06:00
08534810f6
[refs #569 ] tuning fork modal
2012-07-17 20:25:02 +06:00
cd681ab0ae
[refs #569 ] fixed fork modal
2012-07-17 19:49:13 +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
e00e88340b
[issue #428 ] Merge branch 'master' into 428-advisory
...
Conflicts:
app/assets/stylesheets/design/custom.scss
db/schema.rb
2012-07-04 03:31:51 +04:00
094f25c049
[issue #428 ] Changed attaching advisory to BuildList.
...
Removed Chosen. Added text field with incremental search.
2012-07-04 02:52:13 +04:00
89abd20c95
Merge branch 'master' into 90-pull
...
Conflicts:
db/schema.rb
2012-07-03 21:22:10 +06:00
10aed58bdd
[refs #442 ] Small refactor. Remove bootstrap collapse
2012-06-28 15:31:25 +04:00
b6d769ad66
[refs #442 ] Change mass builds table
2012-06-27 18:07:05 +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
bdb97b8891
[refs #442 ] Add statistics data to mass builds. Small refactor for report
2012-06-25 19:20:35 +04:00
baec8a1016
[refs #525 ] Fix clear action rights
2012-06-25 18:26:01 +04:00
e4f62ea592
[issue #428 ] Added filter by advisory_id to Advisories
2012-06-20 21:51:08 +04:00
904cfca5c9
[refs #529 ] Fix branch set for repository with dot in name
2012-06-19 18:52:29 +04:00
ecd4498484
[issue #428 ] Changes in advisories.
...
* Added Many2Many relation between advisories and projects.
* Added autocompletion to build list's advisory
* Bootstrap's JS moved to vendor/
2012-06-19 02:49:17 +04:00
89bc8954e2
[refs #90 ] smaller font for diff
2012-06-08 14:31:33 +06:00
e7c0eab736
[issue #428 ] Merge branch 'master' into 428-advisory
...
Conflicts:
app/assets/stylesheets/design/custom.scss
2012-06-04 23:59:00 +04:00
abe2b8a30d
[issue #428 ] Work with existing advisories.
...
* Added advisories page to platform
* Added attacing of existing advisories to BuildList.
2012-06-04 23:49:20 +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
c119ae0d20
Merge pull request #504 from warpc/442-mass_build
...
[refs #442 ] Add sidebar for mass rebuild page in platform
2012-05-28 05:45:48 -07:00
82b5999e32
[refs #442 ] Add sidebar
2012-05-28 14:28:19 +04:00
3ed195bb86
Merge pull request #502 from warpc/442-mass_build
...
[refs #442 ] Mass build refactor and fixes
2012-05-28 02:00:30 -07:00
a79d946b6b
[refs #442 ] Mass build refactor and fixes
2012-05-25 19:56:26 +04: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
4f1d23a2a4
[refs #90 ] branch, merge validation
2012-05-24 23:10:49 +06: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
9aefce6b68
[refs #442 ] Merge master into 442-mass_build
2012-05-21 18:33:12 +04:00
6b6887250b
Merge branch 'master' into 90-pull
...
Conflicts:
db/schema.rb
2012-05-21 17:31:49 +06:00
be2ab9154c
[refs #442 ] Fix checkboxes styles. Return delay for build all. Add mass build select and more fixes
2012-05-21 14:18:29 +04:00
241efb95b1
Merge pull request #486 from warpc/443-tour
...
[refs #443 ] fix dropmenu in tours pages for registered users
2012-05-18 03:17:01 -07:00
3a2dc965c9
[refs #443 ] fixed dropmenu
2012-05-18 15:51:26 +06:00
bea7ed26d6
Fix advisory template. Fix rosa tour. Refs #428 , #482
2012-05-18 01:38:43 +03: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
2892689807
Merge pull request #469 from warpc/443-tour
...
[refs #466 ] Add localization for system tour. Fix for auto detecting users language.
2012-05-16 05:19:59 -07:00
2651f0dc52
[refs #443 ] localize top image
2012-05-16 17:10:22 +06:00
05746ea449
[refs #466 ] add i18n
2012-05-15 21:35:48 +06:00
64d5600e6f
Merge pull request #447 from warpc/443-tour
...
[refs #443 ] Tour about the system
2012-05-12 10:11:16 -07:00
7a011606a5
[refs #443 ] add pirobox popup
2012-05-12 19:17:07 +06:00
0e5b2ba25d
[refs #443 ] compact styles
2012-05-12 15:54:24 +06:00
cada9f6e51
[issue #443 ] Changed tour routes. Fixed submenu position.
2012-05-12 01:05:48 +04:00
218904675d
[issue #443 ] Fixed styles. Removed whitespace between content and
...
footer.
2012-05-12 00:24:40 +04:00
5f5eb00c4f
[refs #443 ] abf tour
2012-05-12 00:15:20 +06:00
60fdf9e998
[refs #396 ] Add atom feed icon
2012-05-11 19:44:19 +04: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
05ef799fa4
[issue #428 ] Added advisories list. Added translations.
2012-05-05 21:18:29 +04:00
36b4ce2d99
Merge branch 'master' into 90-pull
...
Conflicts:
Gemfile
Gemfile.lock
app/controllers/projects/issues_controller.rb
app/models/project.rb
config/locales/menu.en.yml
config/routes.rb
db/schema.rb
2012-05-03 23:19:43 +06:00
72e3eaf1a1
Minor design fix. Refs #263
2012-05-03 18:56:33 +03:00
abb60a503a
Minor design fix. Refactor register requests. Refactor case insensitive search. Other minor fixes and code cleanup. Refacor and improve owner constraint. Refs #263
2012-05-03 17:08:02 +03:00
9e5db741d3
Merge branch 'master' into 90-pull
...
Conflicts:
app/models/project.rb
db/schema.rb
2012-05-02 23:08:24 +06:00
0c8f8e14a6
Merge pull request #419 from warpc/347-javascript_refactoring
...
[issue #347 ] Fixed artefacts in Add Collaborators form.
2012-04-23 12:21:00 -07:00
a8ccf454ee
[refs #90 ] first steps of pull rendering
2012-04-23 23:34:11 +06:00
628fed40ea
[refs #90 ] issue status -> state
2012-04-23 23:34:11 +06:00
89bfa8d0a9
[refs #415 ] Fix radio button click handler
2012-04-23 13:50:42 +04:00
af18f4404f
[issue #347 ] Fixed artefacts in Add Collaborators form.
2012-04-22 13:17:33 +04:00
678f7cc0ed
[issue #347 ] Changed search field.
2012-04-20 00:35:31 +04:00
510b0c0c50
[issue #347 ] Merge branch 'master' into 347-javascript_refactoring
...
Conflicts:
app/assets/stylesheets/design/custom.scss
app/models/group.rb
app/models/user.rb
2012-04-19 19:32:11 +04:00
f9d2baef5a
[issue #347 ] Added filter.
2012-04-19 19:27:16 +04:00
618d1ecb49
[issue #408 ] Fixed bug with selectbox
2012-04-18 21:31:11 +04:00
9566855110
[issue #347 ] Added missed lib
2012-04-18 16:17: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
8204196275
[issue #347 ] Removed comments. Added filter field to collaborators
...
table.
2012-04-17 17:39:14 +04:00
f31b243ae9
[refs #385 ] zip image
2012-04-17 18:06:04 +06:00
871c8ed1f4
[issue #347 ] Fixed bugs. Some changes.
2012-04-16 23:22:08 +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
5cfadcd723
[refs #385 ] add dropdown menu to choose archive format
2012-04-13 17:24:24 +06:00
a68d4a2926
[issue #347 ] Many changes.
...
Changes includes:
* Changed Collaborator model;
* Autocomplete now works through backbone;
* Changed autocomplete styles;
* Groups have their own avatar;
* Changed previous backbone scripts;
2012-04-13 02:01:24 +04:00
770030e180
[refs #385 ] zip archive
2012-04-12 00:29:08 +06:00
18bda07369
Merge master into 223-change_build_lists_new_js_handlers
2012-04-10 18:00:48 +04: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
Alexander Machehin
George Vinogradov
Vladimir Sharshov
konstantin.grabar
Pavel Chipiga
Pasha