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 |
|
Vokhmin Alexey V
|
e367a5e0dd
|
#370: generate sitemap
|
2014-03-29 02:14:37 +04:00 |
|
Alexander Machehin
|
313056a8c6
|
[#345] add bootstrap-sass gem
|
2014-03-28 14:31:59 +06:00 |
|
Vokhmin Alexey V
|
4d7809ec14
|
#345: rollback changes, added test_after_commit gem
|
2014-03-20 02:35:59 +04:00 |
|
Vokhmin Alexey V
|
c672aaa0ec
|
#345: fixed some specs, etc
|
2014-03-18 00:18:46 +04:00 |
|
Vokhmin Alexey V
|
94e285e64f
|
#345: updated gems, views, fixed specs
|
2014-03-15 01:55:28 +04:00 |
|
Vokhmin Alexey V
|
e7f8fb6312
|
#345: Fixed JS
|
2014-03-14 03:00:52 +04:00 |
|
Vokhmin Alexey V
|
d1ea49c680
|
Merge branch 'master' into 345-update_to_rails4
Conflicts:
app/models/platform_arch_setting.rb
|
2014-03-13 23:56:15 +04:00 |
|
Alexander Machehin
|
b7e745d86e
|
[#345] remove observers gem; remove old redhillonrails gem
|
2014-03-12 21:07:57 +06:00 |
|
Alexander Machehin
|
50b7c8b92b
|
Temporaly fix deploy
|
2014-03-12 16:04:28 +06:00 |
|
Alexander Machehin
|
a4e2b6cfd1
|
[#345] downgrade jquery-rails version because Sprockets::FileNotFound - couldn't find file 'jquery-ui'
|
2014-03-11 17:34:06 +06:00 |
|
Alexander Machehin
|
d5f2e87f1c
|
[#345] remove assets group from the Gemfile; fix compass-rails version
|
2014-03-11 17:21:06 +06:00 |
|
Alexander Machehin
|
a81b5fc69e
|
Merge branch 'master' into 345-update_to_rails4
Conflicts:
Gemfile
Gemfile.lock
|
2014-03-07 16:25:32 +06:00 |
|
Alexander Machehin
|
2e4112e6a4
|
Add skype notifications
|
2014-03-06 21:45:33 +06:00 |
|
Alexander Machehin
|
0a80306095
|
[#345] update gems
|
2014-03-06 13:44:14 +06:00 |
|
Alexander Machehin
|
83689a94c4
|
[#345] update rails & other gems
|
2014-02-27 16:33:16 +06:00 |
|
Vokhmin Alexey V
|
c5e3c7121e
|
Updated therubyracer
|
2014-02-25 23:19:41 +04:00 |
|
Vokhmin Alexey V
|
4250e31cdc
|
Merge branch 'master' into 354-add-possibility-to-rebuild-projects-periodically
Conflicts:
Gemfile.lock
|
2014-02-19 13:16:27 +04:00 |
|
Alexander Machehin
|
782eef0664
|
update rails to 3.2.17
|
2014-02-19 02:54:57 +06:00 |
|
Vokhmin Alexey V
|
ea8bb0b42b
|
#354:added specs for autostart build_lists
|
2014-02-18 01:02:48 +04:00 |
|
Alexander Machehin
|
0451c1eaa6
|
Merge branch 'master' into 347-update_paperclip
Conflicts:
Gemfile.lock
|
2014-02-12 21:36:16 +06:00 |
|
Vokhmin Alexey V
|
e889f23660
|
Configure resque-scheduler gem
|
2014-02-10 23:36:10 +04:00 |
|
Alexander Machehin
|
2bcf8c39f3
|
[#347] update paperclip gem; change file validations
|
2014-02-10 21:50:22 +06:00 |
|
Alexander Machehin
|
0e39aae1bf
|
[#343] use new ruby hash syntax
|
2014-01-21 10:51:49 +06:00 |
|
Vokhmin Alexey V
|
00a630146f
|
#29: updated whenever gem
|
2014-01-17 20:26:48 +04:00 |
|
Alexander Machehin
|
e255c59261
|
[#29] remove iconv
|
2014-01-16 19:39:03 +06:00 |
|
Alexander Machehin
|
e9079a6357
|
add therubyracer
|
2014-01-14 20:10:55 +06:00 |
|
Alexander Machehin
|
90406d5000
|
[#29] update grit
|
2014-01-10 11:11:00 +06:00 |
|
Alexander Machehin
|
50735fc977
|
[#29] add iconv gem
|
2014-01-10 09:30:22 +06:00 |
|
Alexander Machehin
|
0cb585ef71
|
Merge branch 'master' into 29-migrate-to-ruby-2.1
Conflicts:
Gemfile
Gemfile.lock
app/controllers/activity_feeds_controller.rb
app/models/activity_feed_observer.rb
config/environments/development.rb
config/initializers/a_app_config.rb
config/initializers/airbrake.rb
lib/modules/models/git.rb
spec/controllers/activity_feeds_controller_spec.rb
spec/helpers/activity_feeds_helper_spec.rb
|
2014-01-10 08:31:31 +06:00 |
|
Alexander Machehin
|
9612ccdf19
|
Move git repository to rosa-abf
|
2013-12-06 14:21:20 +06:00 |
|
Alexander Machehin
|
9243d54a68
|
Merge branch 'master' into puma
|
2013-12-04 13:56:20 +06:00 |