Commit Graph

84 Commits

Author SHA1 Message Date
Alexander Machehin 126cc30b02 [#369] update angularjs locale 2014-11-07 21:14:12 +05:00
Alexander Machehin c5ea3d7c66 [#369] remove moment.js deprecate warnings 2014-10-16 16:43:04 +06: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 344b009ca2 fix asset path 2014-06-19 14:56:50 +06:00
Alexander Machehin 7eb5b5e395 [#369] monitoring page; some fixes 2014-05-26 23:42:27 +06:00
Alexander Machehin 319200c2b6 [#369] fix angular minify 2014-04-22 18:58:02 +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 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 5a9623645f [#369] add default pygments styles 2014-04-15 15:54:23 +06:00
Alexander Machehin f23259775e [#369] remove codemirror; use pygments 2014-04-15 15:11:14 +06:00
Alexander Machehin 0d5aa59c64 [#369] move old bootstrap; remove unneeded files 2014-04-12 09:43:41 +06:00
Alexander Machehin 1a1838a363 [#369] add templates; add codemirror 2014-04-11 14:57:00 +06: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 d51d917fa4 [#345] remove deprecated live event 2014-03-13 16:09:00 +06:00
Alexander Machehin b05ecd23d4 [#345] fix Sass::SyntaxError - File to import not found or unreadable 2014-03-11 16:44:29 +06:00
Alexander Machehin a673f6ed56 add time ago 2013-09-01 18:06:42 +06:00
avm c0d717e4a5 Merge pull request #278 from abf/rosa-build:277-new_profile_design
#277 new profile title
2013-08-26 13:56:17 +04:00
Alexander Machehin 3e9ad8dd58 [#277] new title of the profile 2013-08-23 22:30:19 +06:00
Vokhmin Alexey V 36259776a1 #267: added sound notifications 2013-08-20 23:10:24 +04:00
Vokhmin Alexey V f6ec81bb35 #37: update UI for "Assignee" Issues and PullRequests 2013-03-20 19:06:25 +04:00
Vokhmin Alexey V dc5026f675 #26: small refactoring 2013-03-19 16:12:07 +04:00
Vokhmin Alexey V 6145f1753b #26: update styles for issues table 2013-03-18 23:27:15 +04:00
Vokhmin Alexey V c6bdb1fc44 #757: some refactoring, move "bootstrap" styles 2013-02-22 15:17:46 +04:00
Alexander Machehin ec25a2f275 [refs #921] remove timepicker addon && some fixes 2013-02-21 00:43:00 +06:00
Alexander Machehin e5db61197e [refs #921] add new filter to the build list monitoring 2013-02-20 21:07:11 +06:00
Alexander Machehin 421fa2880c [refs #765] add CodeMirror resizable ability 2013-01-28 14:15:01 +06:00
Alexander Machehin 9035bbb0ab restore syntax highlight 2012-12-11 22:57:00 +06:00
Alexander Machehin 80921e4237 [refs #762] remove collapse 2012-12-11 18:09:44 +06:00
Alexander Machehin ea542de6f1 [refs #762] change ui 2012-12-11 00:02:34 +06:00
Alexander Machehin dfbf8a8d58 Merge branch 'master' into 90-pull
Fucking conflicts:
	app/controllers/projects/issues_controller.rb
	app/models/ability.rb
	app/views/projects/issues/show.html.haml
	config/routes.rb
	db/schema.rb
	lib/tasks/import.rake
	spec/models/comment_for_commit_spec.rb
	vendor/assets/javascripts/bootstrap-tab.js
	vendor/assets/stylesheets/bootstrap.css
2012-09-25 17:55:30 +06:00
Alexander Machehin d775fa0d08 [refs #616] ugly md preview 2012-08-29 21:24:06 +06:00
Alexander Machehin b299a51610 Merge branch 'master' into 90-pull
Conflicts:
	db/schema.rb
2012-08-01 13:06:41 +06: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
Alexander Machehin 944c6fc0e2 Merge branch 'master' into 90-pull
Conflicts:
	app/assets/stylesheets/design/custom.scss
	app/controllers/projects/git/commits_controller.rb
	app/helpers/git_helper.rb
	app/models/project.rb
	app/views/projects/git/commits/_commit_diff.html.haml
	db/schema.rb
	lib/ext/core/string.rb
2012-07-27 18:37:25 +06:00
konstantin.grabar 15a86c2ecd [refs #576] Add flash notifies 2012-07-23 18:25:37 +04:00
Alexander Machehin 10b828c644 Merge branch 'master' into 90-pull
Conflicts:
	db/schema.rb
	vendor/assets/javascripts/vendor.js
2012-07-10 18:35:49 +06:00
George Vinogradov 094f25c049 [issue #428] Changed attaching advisory to BuildList.
Removed Chosen. Added text field with incremental search.
2012-07-04 02:52:13 +04:00
Alexander Machehin 9b41fd50af [refs #90] fixed translation of titles & headers 2012-06-26 15:40:37 +06:00
George Vinogradov ecd4498484 [issue #428] Changes in advisories.
*  Added Many2Many relation between advisories and projects.
*  Added autocompletion to build list's advisory
*  Bootstrap's JS moved to vendor/
2012-06-19 02:49:17 +04:00
Alexander Machehin fcffff4178 Merge branch 'master' into 90-pull
Conflicts:
	app/assets/stylesheets/design/custom.scss
	config/locales/title.en.yml
	config/locales/title.ru.yml
	config/routes.rb
	db/schema.rb
2012-05-17 22:58:29 +06:00
Pavel Chipiga 4a9f48a25c Fix assets compilation bug. Refs #443 2012-05-13 18:08:36 +03:00
Alexander Machehin 7a011606a5 [refs #443] add pirobox popup 2012-05-12 19:17:07 +06:00
Alexander Machehin 4ad39b05c0 [refs #90] model PullRequest, tests 2012-04-28 23:30:54 +06:00