Commit Graph

152 Commits

Author SHA1 Message Date
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
Vokhmin Alexey V cf479a144d ActiveAdmin integration 2014-04-12 00:29:43 +04:00
Alexander Machehin 09b75e4110 [#369] add new comment & new push notifications 2014-04-08 19:11:34 +06: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
Alexander Machehin a0f3225dad [#369] top menu & footer 2014-03-30 19:50:57 +06:00
Alexander Machehin 718c8bb08c [#345] remove url_for hack 2014-03-13 22:35:00 +06:00
Alexander Machehin 0e39aae1bf [#343] use new ruby hash syntax 2014-01-21 10:51:49 +06:00
avokhmin 8b57f38c59 Merge pull request #294 from abf/rosa-build:time_ago
time ago
2013-09-02 19:03:44 +04:00
Alexander Machehin b60a2e4a09 [#247] dont load counters 2013-09-01 18:18:58 +06:00
Alexander Machehin 77a2a50dcc Merge branch 'master' into time_ago
Conflicts:
	app/views/projects/build_lists/index.json.jbuilder
2013-09-01 18:09:45 +06:00
Alexander Machehin a673f6ed56 add time ago 2013-09-01 18:06:42 +06:00
Alexander Machehin 5c6220a46d try to stop bots (part2) 2013-08-28 21:15:28 +06:00
Vokhmin Alexey V 75d98a75bc #267: added sound_notifications to User 2013-08-21 00:10:25 +04:00
Vokhmin Alexey V c44b4ffda2 #214: added "angular-i18n" gem, some refactoring 2013-07-19 16:34:55 +04:00
Vokhmin Alexey V d747ffd070 #214: updated #branches page, integrated AngularJS 2013-07-11 14:34:44 +04:00
Alexander Machehin 8135f69438 [#135] fix expire date of the flash notify message 2013-06-10 21:07:19 +06:00
Alexander Machehin 89261bf034 [#132] add html support in flash notifies 2013-05-17 17:24:18 +06:00
Alexander Machehin 4a807903ff [#122] Add flash block for guest main page 2013-05-15 18:18:44 +06:00
Vokhmin Alexey V e0662cc7bd #96: added sign_up link to every pages 2013-04-11 15:48:26 +04:00
Vokhmin Alexey V d6a31e9fe1 #975: update title on pages 2013-02-28 17:48:26 +04:00
Vokhmin Alexey V 904b9f4470 #934: add link to ABF-blog 2013-02-15 18:52:28 +04:00
Vokhmin Alexey V ffbd4d4f63 #873: update year in copyright message 2013-02-04 20:33:47 +04:00
Alexander Machehin 4ae3a24e33 add ideas to bottom menu 2012-12-12 18:50:23 +06:00
Alexander Machehin abafbc6ef5 Merge again-and-again branch 'master' into 90-pull
Conflicts:
	db/schema.rb
2012-09-28 00:09:34 +06:00
Vladimir Sharshov 223aa33604 [refs #374] Add info about API doc site 2012-09-27 17:55:16 +04:00
Vokhmin Alexey V 07b27b934f #90: updated #index page for pull-requests 2012-09-26 15:46:23 +04:00
konstantin.grabar 0607eedb15 [refs #626] Set invites redirect add register link to top menu 2012-08-30 14:30:07 +04:00
George Vinogradov a1b7bcac32 [issue #565] Merge branch 'master' into 565-feedback_form
Conflicts:
	app/assets/stylesheets/design/custom.scss
2012-08-03 23:36:14 +04:00
Pavel Chipiga e3ee41294d Use current locale for message body display. Refs #576 2012-07-25 21:21:52 +03:00
Pavel Chipiga e09a9467e2 Fix flash notifies display bug. Add admin section link. Move controller to admin namspace. Refactor and fix notifies controller. Refs #576 2012-07-25 21:05:25 +03:00
konstantin.grabar c0036a1bb5 [refs #576] Fix should_show? method and template offsets 2012-07-25 16:41:12 +04:00
konstantin.grabar 931e7a22b4 [refs #576] Merge master into 576-flash_notifies 2012-07-24 14:08:34 +04:00
konstantin.grabar 15a86c2ecd [refs #576] Add flash notifies 2012-07-23 18:25:37 +04:00
George Vinogradov f61e9db5c6 [issue #565] Added Support link to bottom menu 2012-07-20 20:23:51 +04:00
Alexander Machehin 3c4975ddf0 [refs #183] do not track dev 2012-07-18 16:11:24 +06:00
Pavel Chipiga ec21c042dd Fix and refactor active menu. Refs #207 2012-06-09 19:04:06 +03:00
konstantin.grabar 26299c234b [refs #510] Add resque to the admin submenu 2012-06-08 19:02:45 +04:00
Alexander Machehin aad7a3a547 [refs #443] invite localization 2012-05-18 22:54:57 +06:00
Alexander Machehin 2651f0dc52 [refs #443] localize top image 2012-05-16 17:10:22 +06:00
Alexander Machehin 7a011606a5 [refs #443] add pirobox popup 2012-05-12 19:17:07 +06:00
Alexander Machehin 0e5b2ba25d [refs #443] compact styles 2012-05-12 15:54:24 +06:00
George Vinogradov 218904675d [issue #443] Fixed styles. Removed whitespace between content and
footer.
2012-05-12 00:24:40 +04:00
Alexander Machehin 5f5eb00c4f [refs #443] abf tour 2012-05-12 00:15:20 +06:00
Pavel Chipiga 614f8cd5f9 Refactor active menu detection. Refs #433 2012-05-05 19:15:49 +03:00
Pavel Chipiga 2539ef4795 Great controllers and routes refactor - separate them to namespaces. Add user/group routes in github style, refactor. Implement templates inheritance. Refactor and cleanup views. Fix specs. Other minor fixes. Refs #263 2012-05-02 12:18:07 +03:00
Vladimir Sharshov 29750da420 [Refs #396] Change name to nickname in Atom feed title 2012-04-24 15:11:03 +04:00
konstantin.grabar 90c615d373 [refs #420] Add Yandex Metrika counter 2012-04-24 13:57:03 +04:00
Pavel Chipiga 5efabc9d4e Fix atom feed urls. Refs #396 2012-04-19 20:35:35 +03:00
konstantin.grabar 714fe34883 [refs #396] Hide atom feed link from anonymus users 2012-04-19 18:37:20 +04:00