Commit Graph

83 Commits

Author SHA1 Message Date
Alexander Machehin 32bbd69a58 [#369] change assets precompile array 2014-05-06 17:31:49 +06:00
Alexander Machehin 72e58a7af3 Revert "[#369] add options for uglifier"
This reverts commit b04eb83192.
2014-04-23 00:02:44 +06:00
Alexander Machehin b04eb83192 [#369] add options for uglifier 2014-04-22 19:21:57 +06:00
Alexander Machehin 0c74e80346 [#369] enable js compressor 2014-04-22 18:03:44 +06:00
Alexander Machehin 7a291887df [#369] temporaly remove js compression 2014-04-22 17:28:28 +06:00
Alexander Machehin 12e766aa82 [#369] temporaly remove js compression 2014-04-22 17:14:52 +06:00
Alexander Machehin 67031c06f8 Merge branch 'master' into 369-bootstrap
Conflicts:
	config/environments/production.rb
2014-04-21 15:16:30 +06: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
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 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 1aadcf02b9 [#345] fix compressing css & js 2014-04-15 15:40:07 +06:00
Alexander Machehin a0f3225dad [#369] top menu & footer 2014-03-30 19:50:57 +06:00
Vokhmin Alexey V d7a449904b #345: fixed build_lists_publish_task_manager_spec.rb 2014-03-20 00:23:30 +04:00
Alexander Machehin b4cf625971 [#345] small update config files; remove warning with secret_key_base 2014-03-19 15:47:35 +06:00
Vokhmin Alexey V ebe07ba00c #345: use Redis.current instead of all other 2014-03-19 01:52:40 +04:00
Alexander Machehin 7250b1ae81 [#345] remove a deprecated option 2014-03-11 18:53:08 +06:00
Alexander Machehin 0a80306095 [#345] update gems 2014-03-06 13:44:14 +06:00
Alexander Machehin 0e39aae1bf [#343] use new ruby hash syntax 2014-01-21 10:51:49 +06:00
Alexander Machehin b0da168621 [#29] remove encode strings 2014-01-10 08:59:33 +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
Vokhmin Alexey V 13d2a701d0 #327: switched to abf.io 2013-11-25 20:35:36 +04:00
Alexander Machehin c2a609236b fix moment/ru.js isn't precompiled 2013-09-02 17:33:23 +06:00
Vokhmin Alexey V 8795a46774 Merge branch 'master' into 219-use-caching 2013-07-18 20:26:31 +04:00
Vokhmin Alexey V 4bb163a71d Added staging environment 2013-07-18 17:20:23 +04:00
Vokhmin Alexey V d0fae38e17 #219: some refactoring 2013-07-16 16:02:13 +04:00
Vokhmin Alexey V 7586f5ee1b #219: use redis_store as Rails cache_store 2013-07-16 16:00:32 +04:00
Alexander Machehin 37003f8f0c add source url 2013-06-17 23:29:13 +06:00
Alexander Machehin 0e273d8efc quiet assets in dev 2013-06-17 22:21:25 +06:00
Vokhmin Alexey V e055d0080b #29: removed hack for encoding 2013-03-18 15:36:16 +04:00
Alexander Machehin 0d9c095cbd [refs #847] remove old core code 2013-01-24 12:33:16 +06:00
Vokhmin Alexey V 9a12de95bb #778: remove SymlinkStub module 2012-12-17 16:43:57 +04:00
Vokhmin Alexey V 8757724acc #778: update rails gem, update destroy Platform and Reposytory 2012-12-17 16:28:17 +04:00
Vladimir Sharshov 4f21f0cb88 Add new school adress; change email send method to sendmail; add google check page 2012-10-12 00:16:51 +04:00
Pavel Chipiga 8e91159b5b Improve and refacror huge blob display. Fix wiki create and display. Fix build_lists test. Refs #263 2012-07-31 20:32:49 +03:00
konstantin.grabar 9920802006 [refs #438] Fix symlink stubbing 2012-05-18 13:03:42 +04:00
Alexander Machehin 398cec4806 [refs #443] add js to precompile 2012-05-12 21:23:33 +06:00
Alexander Machehin 5f5eb00c4f [refs #443] abf tour 2012-05-12 00:15:20 +06:00
George Vinogradov 71c8efabf9 [issue #347] Added backbone. Changed collaborators page. 2012-04-09 21:11:39 +04:00
Alexander Machehin d18e55f180 [refs #340] titles - part2 2012-03-30 22:37:54 +06:00
Vladimir Sharshov 9a45353ccb Merge pull request #342 from warpc/128-account-activation
[Refs #128] account activation
2012-03-29 09:09:03 -07:00
konstantin.grabar f33ef75666 [refs #128] Add email confirmation on email change. Remove email confirmation after registration. 2012-03-27 17:45:09 +04:00
George Vinogradov dd8e3b0497 [issue #195] Added JQuery datatables to /projects 2012-03-25 01:36:56 +04:00
Alexander Machehin cadd1995d1 [refs #230] fix forgot password SignUp style 2012-03-01 01:50:08 +06:00
Vladimir Sharshov d9ca8ff8b6 Merge pull request #231 from warpc/195-new_design_for_projects
[Refs #195] new design for projects
2012-02-29 09:54:42 -08:00
konstantin.grabar bc75b318ce [refs #195] Merge 3.2-master into 195-new_design_for_projects 2012-02-29 21:37:28 +04:00
Alexander Machehin 322e68212f [refs #230] add registration to precompile list 2012-02-29 22:59:09 +06:00
Alexander Machehin 632e908442 [refs #228] add logins to precompile array 2012-02-29 22:59:09 +06:00