Commit Graph

4049 Commits

Author SHA1 Message Date
Alexander Machehin ae7de6776d Merge branch '369-remove_codemirror' into 369-bootstrap
Conflicts:
	config/environments/production.rb
2014-04-17 13:15:10 +06:00
Alexander Machehin 1fa17cf789 [#369] small refactoring 2014-04-16 22:09:23 +06:00
Alexander Machehin dd41f41867 [#369] add codemirror editor 2014-04-16 21:56:24 +06:00
Alexander Machehin fe96da0eea [#369] add resize 2014-04-15 22:36:40 +06:00
Alexander Machehin 1aa0ffccfc [#369] remove old js 2014-04-15 22:34:13 +06:00
Alexander Machehin d66d9accaf Merge branch '369-remove_codemirror' into 369-bootstrap
Conflicts:
	Gemfile
	Gemfile.lock
	vendor/assets/javascripts/old-codemirror.js
	vendor/assets/javascripts/old-codemirror/keymaps/emacs.js
	vendor/assets/javascripts/old-codemirror/keymaps/vim.js
	vendor/assets/javascripts/old-codemirror/modes/clike.js
	vendor/assets/javascripts/old-codemirror/modes/clojure.js
	vendor/assets/javascripts/old-codemirror/modes/coffeescript.js
	vendor/assets/javascripts/old-codemirror/modes/css.js
	vendor/assets/javascripts/old-codemirror/modes/diff.js
	vendor/assets/javascripts/old-codemirror/modes/gfm.js
	vendor/assets/javascripts/old-codemirror/modes/go.js
	vendor/assets/javascripts/old-codemirror/modes/groovy.js
	vendor/assets/javascripts/old-codemirror/modes/haskell.js
	vendor/assets/javascripts/old-codemirror/modes/htmlembedded.js
	vendor/assets/javascripts/old-codemirror/modes/htmlmixed.js
	vendor/assets/javascripts/old-codemirror/modes/javascript.js
	vendor/assets/javascripts/old-codemirror/modes/jinja2.js
	vendor/assets/javascripts/old-codemirror/modes/less.js
	vendor/assets/javascripts/old-codemirror/modes/lua.js
	vendor/assets/javascripts/old-codemirror/modes/markdown.js
	vendor/assets/javascripts/old-codemirror/modes/mysql.js
	vendor/assets/javascripts/old-codemirror/modes/ntriples.js
	vendor/assets/javascripts/old-codemirror/modes/pascal.js
	vendor/assets/javascripts/old-codemirror/modes/perl.js
	vendor/assets/javascripts/old-codemirror/modes/php.js
	vendor/assets/javascripts/old-codemirror/modes/plsql.js
	vendor/assets/javascripts/old-codemirror/modes/python.js
	vendor/assets/javascripts/old-codemirror/modes/r.js
	vendor/assets/javascripts/old-codemirror/modes/rpm-changes.js
	vendor/assets/javascripts/old-codemirror/modes/rpm-spec.js
	vendor/assets/javascripts/old-codemirror/modes/rst.js
	vendor/assets/javascripts/old-codemirror/modes/ruby.js
	vendor/assets/javascripts/old-codemirror/modes/rust.js
	vendor/assets/javascripts/old-codemirror/modes/scheme.js
	vendor/assets/javascripts/old-codemirror/modes/shell.js
	vendor/assets/javascripts/old-codemirror/modes/smalltalk.js
	vendor/assets/javascripts/old-codemirror/modes/sparql.js
	vendor/assets/javascripts/old-codemirror/modes/stex.js
	vendor/assets/javascripts/old-codemirror/modes/tiddlywiki.js
	vendor/assets/javascripts/old-codemirror/modes/velocity.js
	vendor/assets/javascripts/old-codemirror/modes/verilog.js
	vendor/assets/javascripts/old-codemirror/modes/xml.js
	vendor/assets/javascripts/old-codemirror/modes/xmlpure.js
	vendor/assets/javascripts/old-codemirror/modes/yaml.js
	vendor/assets/javascripts/old-codemirror/overlay.js
	vendor/assets/javascripts/old-codemirror/runmode.js
	vendor/assets/javascripts/vendor.js
	vendor/assets/stylesheets/old-codemirror.scss
	vendor/assets/stylesheets/old-codemirror/modes/diff.scss
	vendor/assets/stylesheets/old-codemirror/modes/rpm-spec.scss
	vendor/assets/stylesheets/old-codemirror/modes/tiddlywiki.scss
	vendor/assets/stylesheets/old-codemirror/themes/cobalt.scss
	vendor/assets/stylesheets/old-codemirror/themes/eclipse.scss
	vendor/assets/stylesheets/old-codemirror/themes/elegant.scss
	vendor/assets/stylesheets/old-codemirror/themes/monokai.scss
	vendor/assets/stylesheets/old-codemirror/themes/neat.scss
	vendor/assets/stylesheets/old-codemirror/themes/night.scss
	vendor/assets/stylesheets/old-codemirror/themes/rubyblue.scss
	vendor/assets/stylesheets/vendor.scss
2014-04-15 19:04:27 +06:00
Alexander Machehin 4872ba549f [#369] add pygments to the product build list log 2014-04-15 16:39:35 +06:00
Alexander Machehin c005d9ca1a [#369] remove comment 2014-04-15 16:27:00 +06:00
Alexander Machehin 176266622a [#369] remove old code 2014-04-15 15:36:36 +06:00
Alexander Machehin f23259775e [#369] remove codemirror; use pygments 2014-04-15 15:11:14 +06:00
Vokhmin Alexey V cf479a144d ActiveAdmin integration 2014-04-12 00:29:43 +04:00
Alexander Machehin 0a47f28235 [#369] remove unneeded file 2014-04-11 16:12:57 +06:00
Alexander Machehin 1a1838a363 [#369] add templates; add codemirror 2014-04-11 14:57:00 +06:00
Vokhmin Alexey V 43fc57ec37 refactoring according to Alexander's comments 2014-04-11 00:09:02 +04:00
Vokhmin Alexey V fd13427794 Optimize query for /projects page 2014-04-10 20:59:15 +04:00
Vokhmin Alexey V be6bd727a6 Fixed: Assign container 2014-04-10 01:20:39 +04:00
Vokhmin Alexey V 4d0453b738 #373: cleanup 2014-04-10 00:07:36 +04:00
Vokhmin Alexey V c65853e072 #373: added ability to destroy ProductBuildList 2014-04-09 22:44:19 +04:00
Vokhmin Alexey V 63b82433af Merge branch '373-cached-chroot' of abf.rosalinux.ru:abf/rosa-build into 373-cached-chroot 2014-04-09 12:54:09 +04:00
Vokhmin Alexey V 2ecf2c1d91 #373: rollback ability.rb 2014-04-09 12:53:53 +04:00
Alexander Machehin 659f13684b Merge branch '373-cached-chroot' of abf.rosalinux.ru:abf/rosa-build into 373-cached-chroot 2014-04-09 14:53:38 +06:00
Alexander Machehin a7bcb64968 Merge branch 'master' into 373-cached-chroot 2014-04-09 14:53:01 +06:00
Alexander Machehin 2aec96d989 Revert "fix authenticate_user method"
This reverts commit 0000487cf8.
2014-04-09 14:52:42 +06:00
Vokhmin Alexey V 8a2aa1f666 #373: remove validation for use_cached_chroot 2014-04-09 12:46:09 +04:00
Alexander Machehin ae889047ac Merge branch 'master' into 373-cached-chroot 2014-04-09 14:42:28 +06:00
Alexander Machehin 0000487cf8 fix authenticate_user method 2014-04-09 14:41:56 +06:00
Alexander Machehin 02a488a2f2 Merge branch 'master' into 373-cached-chroot 2014-04-09 12:43:33 +06:00
Alexander Machehin 80cd7bcd52 fix mistype with reset password token 2014-04-09 12:43:12 +06:00
Alexander Machehin 32b61dcf5d Merge branch 'master' into 373-cached-chroot 2014-04-09 12:28:32 +06:00
Alexander Machehin 09f14687ad fix edit password url 2014-04-09 12:28:02 +06:00
Vokhmin Alexey V 4a3068ce42 #373: misprint 2014-04-09 01:16:36 +04:00
Vokhmin Alexey V 35a2be81cf #373: rollback changes 2014-04-09 01:07:50 +04:00
Vokhmin Alexey V 55e8345b66 Merge branch 'master' into 373-cached-chroot 2014-04-09 00:29:05 +04:00
Alexander Machehin 09b75e4110 [#369] add new comment & new push notifications 2014-04-08 19:11:34 +06:00
Alexander Machehin 5cf413139d [#369] increase truncate length activity commit messages 2014-04-08 19:08:22 +06:00
Alexander Machehin 3ad56a80ff [#369] fix error with truncate method 2014-04-08 19:04:25 +06:00
Vokhmin Alexey V 7842f72eb3 Fixed: Access violation to this page 2014-04-08 17:00:39 +04:00
Alexander Machehin cb45fe6aed [#369] truncate activity comment body 2014-04-08 18:59:59 +06:00
Alexander Machehin 54ce497e61 [#369] truncate activity commit messages 2014-04-08 18:59:16 +06:00
Vokhmin Alexey V afb3b183c8 #373: rollback changes 2014-04-08 02:12:22 +04:00
Vokhmin Alexey V 6e584e1ec9 #373: cleanup 2014-04-08 01:56:13 +04:00
Vokhmin Alexey V 0bae4d30f8 #373: rollback changes 2014-04-08 01:54:12 +04:00
Vokhmin Alexey V 02d291a032 #373: send token to product_build_list 2014-04-08 01:51:21 +04:00
Vokhmin Alexey V 81c3f6aaa6 #373: rollback changes 2014-04-08 01:37:11 +04:00
Vokhmin Alexey V 7d0b2998dc #373: refactoring, added specs 2014-04-08 01:30:01 +04:00
Vokhmin Alexey V c41fc4d0bb #373: added use_cached_chroot field 2014-04-07 23:00:42 +04:00
Vokhmin Alexey V 37be95b9ae Updated comments 2014-04-05 23:20:44 +04:00
Vokhmin Alexey V 773c1701ad Cleans ApiDefender statistics 2014-04-05 23:19:04 +04:00
Vokhmin Alexey V 3ad56638b7 Added specs for MassBuild 2014-04-05 22:37:27 +04:00
Alexander Machehin 7644a0f4cc [#369] remove angular-busy; add loading-bar 2014-04-04 16:15:15 +06:00