Commit Graph

247 Commits

Author SHA1 Message Date
Alexander Machehin 3004074e2e downgrade simple_form because bootstrap 3 2015-03-12 19:33:15 +05:00
Vokhmin Alexey V 3ed742e39a Use only state_machines-activerecord gem 2015-03-05 03:01:52 +03:00
Vokhmin Alexey V 7f285fce5c added state_machines-activerecord gem 2015-03-05 02:39:16 +03:00
Vokhmin Alexey V 5e5d3905e4 Update rails to 4.1.9 2015-03-05 02:09:50 +03:00
Vokhmin Alexey V 2e053eff0a cleanup 2015-02-19 13:34:43 +03:00
Vokhmin Alexey V db4d1ba457 update rspec-rails gem 2015-02-19 04:12:08 +03:00
Vokhmin Alexey V 629867cee7 Update rails gem: 4.0.11 => 4.0.13 2015-02-19 02:04:42 +03:00
Vokhmin Alexey V 7c5e5906f5 Update ruby to 2.2.0, gems 2015-02-13 03:36:18 +03:00
Alexander Machehin a36e46a769 [#369] update bootstrap-sass 2015-02-06 18:52:01 +05:00
Alexander Machehin 2a5ec70a6b [#369] project collaborators page: in progress 2014-11-15 01:36:39 +05:00
Vokhmin Alexey V 90f6bca72d Merge branch 'master' into 369-bootstrap
Conflicts:
	Gemfile.lock
	app/models/concerns/feed/git.rb
	app/models/issue.rb
2014-11-08 01:09:32 +03:00
Alexander Machehin f1afd46453 update rails to 4.0.11 2014-10-31 00:10:57 +05:00
Vokhmin Alexey V 1be09ee042 #369: updated simple_form styles 2014-10-28 22:20:23 +03:00
Vokhmin Alexey V 2bf34994a5 #369: added simple_form, updated #new, #edit actions for platform 2014-10-25 02:43:46 +04:00
Vokhmin Alexey V 1ae14ecd86 #369: use bootstrap for Platforms#show page 2014-10-24 03:27:30 +04:00
Alexander Machehin 2b9434f346 Merge branch 'master' into 369-bootstrap
Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/javascripts/angular-new/models/build_list.js.erb
	app/assets/javascripts/extra/build_list.js
	app/controllers/projects/build_lists_controller.rb
	app/controllers/projects/projects_controller.rb
	app/models/platform.rb
	app/views/projects/base/_layout.html.haml
	app/views/projects/build_lists/_new_form.html.haml
	app/views/projects/build_lists/show.html.haml
	app/views/projects/git/base/_fork.html.haml
	app/views/projects/git/commits/_commits.html.haml
	config/locales/en.yml
	config/locales/ru.yml
2014-10-16 16:41:29 +06:00
Alexander Machehin d11fe17937 again update grit 2014-10-07 22:36:05 +06:00
Alexander Machehin 41d04ae56b Revert "update grit"
This reverts commit 134dac6083.
2014-10-07 20:28:05 +06:00
Alexander Machehin 134dac6083 update grit 2014-10-06 20:11:59 +06:00
Alexander Machehin 55c1962b78 Revert "use updated grit"
This reverts commit 3f6ed02b3a.
2014-10-02 22:08:01 +06:00
Alexander Machehin 3f6ed02b3a use updated grit 2014-09-30 17:18:49 +06:00
Vokhmin Alexey V b14a34d48f Remove logglier gem 2014-09-23 22:37:33 +04:00
Alexander Machehin 8ee384775b downgrade jquery-rails to 2.3 2014-09-12 10:12:33 +06:00
Alexander Machehin e532d63257 downgrade ohm to 1.3.2 2014-09-11 23:07:35 +06:00
Alexander Machehin 247a1d8657 remove requiring 'emoji/railtie' 2014-09-11 14:39:38 +06:00
Alexander Machehin d8f61aa423 update gems 2014-08-29 20:57:16 +06:00
Alexander Machehin 7c75cc7571 update rails to 4.0.9 2014-08-29 20:07:18 +06:00
Alexander Machehin 21d705610b update rails to 4.0.8 2014-07-04 09:16:47 +06:00
Alexander Machehin 554fd5003e update rails to 4.0.7 2014-07-03 07:20:17 +06:00
Alexander Machehin 33790f884c [#369] small improvements; project page 2014-07-01 20:52:52 +06:00
Vokhmin Alexey V 88b0d54f02 #403: added specs for FileStoreService::File 2014-06-21 00:12:19 +04:00
Alexander Machehin aa959496c9 Merge branch 'master' into 369-bootstrap
Conflicts:
	app/views/projects/build_lists/show.html.haml
	app/views/shared/_build_results.html.haml
2014-06-02 19:46:58 +06:00
Alexander Machehin 9795f3b5bc update rails to 4.0.5 2014-05-07 12:33:41 +06:00
Alexander Machehin a36457b5f3 [#369] add codemirror gem 2014-05-06 17:07:36 +06:00
Alexander Machehin 8d211e5a75 [#369] remove ngTable; update all issues table 2014-05-06 01:16:15 +06:00
Alexander Machehin 5075486405 [#369] remove codemirror highlighting 2014-04-29 13:19:08 +06:00
Alexander Machehin 2a8fa0e64b [#369] add ngTable 2014-04-28 14:36:12 +06:00
Vokhmin Alexey V eeb339ea43 #369: add ngmin-rails gem 2014-04-22 20:57:38 +04:00
Alexander Machehin a5a645ccbf Revert "[#369] use ngmin pre-minifier"
This reverts commit 08fe0f6832.
2014-04-22 18:32:50 +06:00
Alexander Machehin 08fe0f6832 [#369] use ngmin pre-minifier 2014-04-22 18:24:48 +06:00
Alexander Machehin 2a1ab0d77f [#369] update uglifier 2014-04-22 18:03:09 +06:00
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 dd41f41867 [#369] add codemirror editor 2014-04-16 21:56:24 +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 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 1a1838a363 [#369] add templates; add codemirror 2014-04-11 14:57:00 +06:00
Vokhmin Alexey V 773c1701ad Cleans ApiDefender statistics 2014-04-05 23:19:04 +04:00
Alexander Machehin 7644a0f4cc [#369] remove angular-busy; add loading-bar 2014-04-04 16:15:15 +06:00
Alexander Machehin c08fd6d569 [#369] add angular spinner; some fixes 2014-04-02 16:33:05 +06:00