Commit Graph

203 Commits

Author SHA1 Message Date
Vokhmin Alexey V e28696735f Updated Yandex.Metrika counter 2014-05-13 01:29:57 +04: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
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
konstantin.grabar be3daca1e6 [refs #396] Fix atom feed link tag 2012-04-19 18:06:54 +04:00
konstantin.grabar 799ba33766 [refs #396] Add token to atom feed link tag 2012-04-19 17:57:22 +04:00
konstantin.grabar 2fc4e2db61 [refs #396] Fix token migration. Fix atom link tag title 2012-04-19 14:50:43 +04:00
konstantin.grabar cd153375dd [refs #396] Devise token auth update for atom feed. Some atom feed fixes. 2012-04-18 19:15:04 +04:00
konstantin.grabar b36e0c284f [refs #130] Add ssl to html5 script into sessions layout 2012-04-02 15:26:00 +04:00
konstantin.grabar 23cdfa102c [refs #130] Add ssl to jQuery and html5 scripts 2012-04-02 15:01:16 +04:00
George Vinogradov 1e8021fe35 [issue #369] Added TOS page. 2012-03-31 17:18:22 +04:00
Pavel Chipiga d6e6959f46 Write basic robots.txt. Apply configurable anonymous access, hide some functionality from guests. Apply basic design for main page. Autoconfirm manually created users. Code refactor and cleanup. Remove unused code, routes, containers, rpms, personal_repositories. Redo product_build_lists monitoring and filtering. Fix add_project to repo bug. Add links to bottom menu. Switch off deploy assets sppedup. Refs #349, #263 2012-03-31 02:37:54 +03:00
Alexander Machehin d18e55f180 [refs #340] titles - part2 2012-03-30 22:37:54 +06:00
Alexander Machehin e14e2db6c3 [refs #340] first part of titles 2012-03-30 22:36:20 +06:00
Pavel Chipiga 1f57d88957 Fix IE design. Refs #263 2012-03-30 01:52:34 +03:00
Alexander Machehin b08b1f7528 [refs #270] changed translation to Admin 2012-03-23 17:11:15 +06:00
Alexander Machehin a6a5b722d2 [refs #270] use devise lockable to ban 2012-03-21 23:45:51 +06:00
Vladimir Sharshov 4393e8b30f [Refs #263] Fix activity feed menu display 2012-03-21 14:48:06 +04:00
Vladimir Sharshov 7bf107f287 [Refs #263] Fix styles (layout and menu) 2012-03-21 03:11:58 +04:00
Alexander Machehin 1066307fbb [refs #270] created admins menu aside 2012-03-19 23:32:02 +06:00
Alexander Machehin 4addff059b [refs #265] added activity feed tabs 2012-03-15 23:52:54 +06:00
Alexander Machehin f6dd072a24 Merge branch '3.2-master' into 257-new_design_for_profiles
Conflicts:
	config/locales/users.en.yml
	config/locales/users.ru.yml
2012-03-12 23:04:31 +06:00
Alexander Machehin 24639b8684 [refs 257] renamed to profile 2012-03-12 21:03:25 +06:00
Alexander Machehin 37f4676bfb [refs #265] fuuu fix logo 2012-03-11 22:40:09 +06:00
Alexander Machehin 849cbce913 [refs #265] add link to root 2012-03-11 21:30:45 +06:00
Pavel Chipiga 7308c4a0d2 Merge branch '3.2-master' into 255-search
Refactor avatars. Fix user bugs. Remove ssh_key delete migration

Conflicts:
	app/assets/stylesheets/design/custom.scss
	app/models/user.rb
2012-03-06 20:59:29 +02:00
Pavel Chipiga d6f9b2c3e9 Minor gems update. Apply search design and controller. Add and refactor search scopes. Fix relations. Separate and refactor search translations. Refactor search form. Refs #255 2012-03-06 17:53:04 +02:00
konstantin.grabar 73296059eb [refs #257] Merge 3.2-master into 257-new_design_for_profiles 2012-03-05 13:42:39 +04:00
konstantin.grabar 9b68752ffd [refs #257] Change avatar helper and logic. Add paperclip avatar to users 2012-03-03 22:05:02 +04:00
Pavel Chipiga 159fbe65dc Re-add compass. Add flash messages design. Refactor and fix bugs after merge. Remove duplicates, sync and separate locales . Fix some specs. Refs #263 2012-03-03 02:28:27 +02:00
Alexander Machehin 7164dd580e [refs #230] fix error messages + some refactoring 2012-03-02 18:27:38 +06:00
George Vinogradov 6cfb5d0c3d [issue #195] Fixed bug with encodings. Added avatar. Stubbed blame. 2012-03-02 04:39:43 +04:00
Alexander Machehin d7dbe79357 [refs #230] edit password page 2012-03-02 02:04:06 +02:00
Pavel Chipiga 036dfb6dd5 Fix build_lists bugs. Add build list display and new build list pages design, apply compass. Refactor and cleanup assets. Refactor abilities. Refactor build_list search. Improve layout_class helper. Change defaul build_lists index filter and fix specs. Fix assets path. Refs #223 2012-03-02 02:04:04 +02:00
Alexander Machehin cadd1995d1 [refs #230] fix forgot password SignUp style 2012-03-01 01:50:08 +06:00
Alexander Machehin fd03f3deab [refs #230] remove wrong js 2012-03-01 00:45:37 +06:00
Alexander Machehin aea631824f [refs #230] remove debug messages 2012-03-01 00:39:12 +06:00
Alexander Machehin ba4fae071f [refs #230] error messages 2012-02-29 23:01:30 +06:00
Alexander Machehin 3136159777 [refs #230] add red borders to invalid attributes 2012-02-29 22:59:09 +06:00
Alexander Machehin a1bfe66791 [refs #228] sign_in page 2012-02-29 22:59:08 +06:00
Pavel Chipiga cefaa902b1 Apply new design for projects build monitoring page. Improve and refactor filters. Improve abilities. Switch off old statuses. Separate build_lists translations. Refactor and remove duplicate translations. Refactor and code cleanup. Fix specs. Apply layout class helper. Refs #223 2012-02-29 16:04:38 +02:00
Alexander Machehin bc4a157703 Merge branch '3.2-master' into 194-tracker
Conflicts:
	app/assets/stylesheets/application.scss
	app/views/issues/_form.html.haml
	app/views/platforms/show.html.haml
2012-02-28 20:13:08 +06:00
Pavel Chipiga 7508bb1339 Fix bugs to force new design work. Minor refactor and improvements. Refs #193 2012-02-27 20:58:37 +02:00
Alexander Machehin 2c0e1b6314 Merge branch '3.2-master' into 194-tracker
Conflicts:
	app/assets/stylesheets/custom.scss
2012-02-27 23:55:18 +06:00
Alexander Machehin 27c85d32df [refs #194] create page; index pagination; some bugs 2012-02-27 22:10:12 +06:00
Pavel Chipiga 1dd20377cf Fix layout. Refs #193 2012-02-24 23:54:44 +02:00
George Vinogradov 3c83649627 [issue #96] Some fixes in layout and scripts. 2012-02-24 23:39:40 +02:00
Alexander Machehin 5dcc4eabf8 [refs #194] tracker without tags manage 2012-02-20 22:54:45 +06:00
George Vinogradov 608faf3564 [issue #96] Some fixes in layout and scripts. 2012-02-17 03:07:22 +04:00
Alexander Machehin fab80d97eb [refs #194] project submenu partial 2012-02-15 22:32:26 +06:00
Pavel Chipiga 7d74b0af13 Merge branch 'master' into 96-upgrade_rails
Conflicts:
	Gemfile
	Gemfile.lock
	app/models/group.rb
	app/views/layouts/application.html.haml
	db/schema.rb
	public/stylesheets/git/style.css
2012-02-14 02:14:03 +02:00
Pavel Chipiga c6f9995b98 Add GA code to layouts and invite pages. Do not track admins. Refs #183 2012-02-13 18:42:11 +02:00
Pavel Chipiga 7223b7deb9 Upgrade rails, devise, delayed_jobs and other gems. Fix dependencies. Apply assets pipeline, add to deploy. Refactor and cleanup Gemfile. Fix after upgrade bugs. Redo commentable_id from string to decimal. Refactor and code cleanup. Apply basic new design. Refactor main template. Automate menus. Improve translations. Refs #96 2012-02-09 01:46:25 +02:00