Commit Graph

164 Commits

Author SHA1 Message Date
Alexander Machehin ea930308df [refs #90] small pull helper refactoring 2012-08-07 23:02:58 +06:00
Alexander Machehin 7a16bac06a [refs #90] fixed error after merging with master 2012-08-07 22:35:15 +06:00
Alexander Machehin 6a04f4ad7a Merge again branch 'master' into 90-pull
Conflicts:
	db/schema.rb
2012-08-06 11:19:06 +06:00
George Vinogradov 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
Alexander Machehin b299a51610 Merge branch 'master' into 90-pull
Conflicts:
	db/schema.rb
2012-08-01 13:06:41 +06:00
Pavel Chipiga 01a3572de0 Minor update. Fix helper bug. Minor refactor. Refs #263 2012-07-31 17:35:18 +03:00
Alexander Machehin 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
Pavel Chipiga 35e673d44e Minor gems update. Fix string length, refactor git helper and module, add branches_and_tags method, refactor build_list filter, cleanup and refactor templates. Take back test. Filter incorrect symbols during git encoding fix. Fix git http level bug. Refs #263 2012-07-27 00:15:57 +03:00
George Vinogradov 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
Alexander Machehin 35b953ac11 [refs #90] add commit/pull lines ref 2012-07-19 22:42:37 +06:00
Alexander Machehin b24a4a35b2 [refs #90] modify pull tab urls 2012-07-19 00:02:27 +06:00
Alexander Machehin 28329bbe5b [refs #90] fixed ref link 2012-07-18 17:17:15 +06:00
Alexander Machehin dc521f5844 [refs #90] link to refs 2012-07-17 22:40:48 +06:00
Pavel Chipiga 611b22baa5 Update gems, fix conflicts. Raise 404 error instead of redirect. Refactor git controllers. Refactor git methods, move to modules. Cleanup git helpers, refactor and remove unused variables from views, refactor git templates. Refactor project load. Refactor git routes and links, refactor constraints. Fix branches with slashes and dots. Apply github linguist and libmagic for binary file detection. Other refactor and code cleanup. Fix specs and deprecations. Refs #263 2012-07-17 11:02:56 +03:00
Alexander Machehin b903969aa6 [refs #90] changed displaying status message 2012-07-16 23:02:04 +06:00
Alexander Machehin 34e97510cd [refs #90] modify pull headers 2012-07-16 22:27:41 +06:00
Alexander Machehin 3290adb0b1 [refs #90] fixed merge ability 2012-07-10 22:58:39 +06:00
Alexander Machehin 10b828c644 Merge branch 'master' into 90-pull
Conflicts:
	db/schema.rb
	vendor/assets/javascripts/vendor.js
2012-07-10 18:35:49 +06:00
George Vinogradov 7b3c74e97d [issue #561] Changed BuildList pages
*  Removed mass_build, cancel and updated_at fields from list
*  Added link to commit in list (instead of version)
*  Added platform field in list
*  Added filter by main platforms
*  Added cancel button and mass_build field to BuildList#show
2012-07-10 01:09:27 +04:00
George Vinogradov 3c8b77027e [issue #428] Allowed any update_types when build for released platform. 2012-07-06 03:05:47 +04:00
George Vinogradov 094f25c049 [issue #428] Changed attaching advisory to BuildList.
Removed Chosen. Added text field with incremental search.
2012-07-04 02:52:13 +04:00
Alexander Machehin 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
Alexander Machehin 6aa9cfaa50 [refs #90] view pull status 2012-06-25 22:04:43 +06:00
Alexander Machehin 5f50bacbe6 [refs #90] some refactoring with rtruncate method 2012-06-08 13:38:24 +06:00
Alexander Machehin 62128d2c72 [refs #90] change diff anchors to digits 2012-06-08 01:20:06 +06:00
Alexander Machehin afc8572b35 [refs #90] remove redirection to pull 2012-06-06 00:08:32 +06:00
George Vinogradov e7c0eab736 [issue #428] Merge branch 'master' into 428-advisory
Conflicts:
	app/assets/stylesheets/design/custom.scss
2012-06-04 23:59:00 +04:00
George Vinogradov 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
Alexander Machehin 26baf999f4 [refs #90] diff stats 2012-05-29 23:09:43 +06:00
konstantin.grabar 82b5999e32 [refs #442] Add sidebar 2012-05-28 14:28:19 +04:00
konstantin.grabar a79d946b6b [refs #442] Mass build refactor and fixes 2012-05-25 19:56:26 +04:00
Alexander Machehin df610931d7 [refs #90] commits tab 2012-05-25 16:48:44 +06:00
konstantin.grabar c74de8b84d [refs #442] Add new page for mass rebuild, new fields and new functional 2012-05-23 18:08:11 +04:00
konstantin.grabar 7c45263799 [refs #442] Add mass build select to monitoring. Remove build lists from build_all action 2012-05-22 17:40:27 +04:00
George Vinogradov 9a0f582a16 [issue #428] Fixed typo in PlatformsHelper 2012-05-10 20:04:48 +04:00
George Vinogradov f8d32495b8 [issue #428] Added title. Changed BuildListsController#update 2012-05-10 19:15:50 +04:00
George Vinogradov 26a643eed1 [issue #428] Merge branch 'master' into 428-advisory
Conflicts:
	app/controllers/projects/build_lists_controller.rb
	db/schema.rb
2012-05-05 21:33:39 +04:00
George Vinogradov 05ef799fa4 [issue #428] Added advisories list. Added translations. 2012-05-05 21:18:29 +04:00
Pavel Chipiga 614f8cd5f9 Refactor active menu detection. Refs #433 2012-05-05 19:15:49 +03:00
Pavel Chipiga 2539ef4795 Great controllers and routes refactor - separate them to namespaces. Add user/group routes in github style, refactor. Implement templates inheritance. Refactor and cleanup views. Fix specs. Other minor fixes. Refs #263 2012-05-02 12:18:07 +03:00
George Vinogradov de093d7065 [issue #425] Changed object to actor in Relation and to eventable in
EventLog
2012-04-26 05:38:33 +04:00
George Vinogradov 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
Vladimir Sharshov 5b5aec490a Merge pull request #409 from warpc/396-rss_atom_feed
[refs #396] Add atom feed for activity feed
2012-04-19 07:08:59 -07:00
George Vinogradov 6c64125787 [issue #408] Changed behavior of build list for released platform 2012-04-17 22:18:39 +04:00
konstantin.grabar 8d723ee0be [refs #396] Fix title truncate and strip. Add feed main title. 2012-04-17 19:38:02 +04:00
George Vinogradov 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
George Vinogradov 71c8efabf9 [issue #347] Added backbone. Changed collaborators page. 2012-04-09 21:11:39 +04:00
Pavel Chipiga 20e5936d0c Fix and refactor build lists, comments and other specs. Refactor comments controller, models and views. Code cleanup. Refs #263 2012-04-05 00:43:06 +03:00
Vladimir Sharshov fef3affc07 [Refs #263] Refactoring platforms, add platform tests and software license, showing warning for errors in update project action 2012-04-01 19:19:54 +04:00
Vladimir Sharshov 0c2850b455 [Refs #367] Fix hardcoded protocol for git repo urls 2012-03-31 20:36:32 +04:00