Alexander Machehin
|
12e766aa82
|
[#369] temporaly remove js compression
|
2014-04-22 17:14:52 +06:00 |
|
Alexander Machehin
|
83c2321200
|
[#369] try to fix Error: [$injector:unpr] Unknown provider: t
|
2014-04-21 21:50:23 +06:00 |
|
Alexander Machehin
|
9ea2677319
|
[#369] add activity tabs
|
2014-04-21 21:04:28 +06:00 |
|
Alexander Machehin
|
67031c06f8
|
Merge branch 'master' into 369-bootstrap
Conflicts:
config/environments/production.rb
|
2014-04-21 15:16:30 +06:00 |
Vokhmin Alexey V
|
559e41d94b
|
Fixed: undefined method admin?
|
2014-04-18 21:17:17 +04:00 |
|
avm
|
9e55a362d9
|
Merge pull request #379 from abf/rosa-build:376-add-monitoring-tool
#376: Monitoring tool
|
2014-04-18 12:58:34 +04:00 |
|
Alexander Machehin
|
5b895bbb25
|
[#369] fix assets precompile list
|
2014-04-18 14:52:54 +06:00 |
|
Alexander Machehin
|
628b69e22b
|
[#369] small highlighting changes
|
2014-04-18 14:51:24 +06:00 |
|
Vokhmin Alexey V
|
93a0beb0d2
|
#376: updated output
|
2014-04-18 02:18:00 +04:00 |
|
Vokhmin Alexey V
|
8c2175d890
|
#376: save output
|
2014-04-18 01:55:37 +04:00 |
|
Vokhmin Alexey V
|
721bd49868
|
#376: updated application.yml.travis
|
2014-04-18 01:07:32 +04:00 |
|
Vokhmin Alexey V
|
8cbfdcc12f
|
Merge branch 'master' into 376-add-monitoring-tool
|
2014-04-18 00:34:02 +04:00 |
|
avokhmin
|
e9156baa25
|
Merge pull request #382 from abf/rosa-build:369-remove_codemirror
#369 use pygments highlighting
|
2014-04-18 00:33:23 +04:00 |
|
Vokhmin Alexey V
|
602df4e57a
|
#376: added specs
|
2014-04-18 00:18:24 +04:00 |
|
Vokhmin Alexey V
|
16f2bbb246
|
#376: refactoring according to Alexander's comments
|
2014-04-17 23:15:35 +04:00 |
|
Vokhmin Alexey V
|
aea5c94219
|
#376: updated logic, UI
|
2014-04-17 23:08:22 +04:00 |
|
Alexander Machehin
|
836139c54b
|
[#369] activity filters
|
2014-04-17 22:49:51 +06:00 |
|
Alexander Machehin
|
1aceaff1b8
|
fix wiki creating notification
|
2014-04-17 17:25:02 +06:00 |
|
Alexander Machehin
|
92e5617745
|
[#369] add other activity templates
|
2014-04-17 17:24:24 +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
|
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 |
|
Vokhmin Alexey V
|
b37ada2ecd
|
#376: some fixes
|
2014-04-16 01:26:12 +04:00 |
|
Vokhmin Alexey V
|
aa73cb361f
|
#376: added ability to restart node
|
2014-04-15 23:15:52 +04:00 |
|
Vokhmin Alexey V
|
44ac1056ab
|
#376: updated priority of queues
|
2014-04-15 22:41:06 +04:00 |
|
Vokhmin Alexey V
|
552e36cf72
|
#376: added monitoring tool
|
2014-04-15 22:08:43 +04: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
|
0d0c03105a
|
[#369] update Gemfile.lock
|
2014-04-15 19:06:52 +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
|
205905e0dd
|
Merge branch 'master' into 369-remove_codemirror
|
2014-04-15 16:02:32 +06:00 |
|
avokhmin
|
3afcb46e8c
|
Merge pull request #381 from abf/rosa-build:345-fix_compress_assets
#345 fix assets compressing
|
2014-04-15 13:54:58 +04:00 |
|
Alexander Machehin
|
5a9623645f
|
[#369] add default pygments styles
|
2014-04-15 15:54:23 +06:00 |
|
Alexander Machehin
|
1aadcf02b9
|
[#345] fix compressing css & js
|
2014-04-15 15:40:07 +06:00 |
|
Alexander Machehin
|
176266622a
|
[#369] remove old code
|
2014-04-15 15:36:36 +06:00 |
|
avokhmin
|
be903e4f75
|
Merge pull request #380 from abf/rosa-build:345-fix_update_commit
#345 fix update commit
|
2014-04-15 13:19:13 +04:00 |
|
Alexander Machehin
|
015518d89c
|
[#345] fix update commit
|
2014-04-15 15:14:58 +06:00 |
|
Alexander Machehin
|
f23259775e
|
[#369] remove codemirror; use pygments
|
2014-04-15 15:11:14 +06:00 |
|
Vokhmin Alexey V
|
5b734e3006
|
#376: added NodeInstruction
|
2014-04-15 01:32:25 +04:00 |
|
Vokhmin Alexey V
|
b577cd2b60
|
Update puma 2.8.1 => 2.8.2
|
2014-04-14 14:09:08 +04:00 |
|
avokhmin
|
fcffae475b
|
Merge pull request #378 from abf/rosa-build:369-move_old_bootstrap
move old bootstrap
|
2014-04-14 13:09:10 +04:00 |
|
Vokhmin Alexey V
|
93c82fd873
|
Merge branch 'master' into 369-move_old_bootstrap
|
2014-04-14 12:23:16 +04:00 |
|
avokhmin
|
9266d5b917
|
Merge pull request #377 from abf/rosa-build:use-active-admin
ActiveAdmin integration
|
2014-04-14 12:16:54 +04:00 |
|
Alexander Machehin
|
0d5aa59c64
|
[#369] move old bootstrap; remove unneeded files
|
2014-04-12 09:43:41 +06:00 |
|
Alexander Machehin
|
0dbc69db50
|
add site title link to the root page
|
2014-04-12 09:18:04 +06:00 |
|
Vokhmin Alexey V
|
f175505c43
|
Fixed: logout_link
|
2014-04-12 00:46:00 +04: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 |