Commit Graph

89 Commits

Author SHA1 Message Date
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
George Vinogradov 1e1dab369b [issue #64] Added some views, styles and scripts.
*  Added base gollum styles
*  Added base gollum javascripts (with minor changes)
*  Fixed some bugs in WikiController
*  Added some views (draft yet)
2012-01-17 01:48:38 +04:00
George Vinogradov 0751a94974 [update #76] Merge branch 'master' into 76-project_autocomplete
Conflicts:
	app/views/layouts/_stylesheets.html.haml
2012-01-12 20:43:32 +04:00
George Vinogradov 73b710ae4e [close #76] Changed styles. Fixed bug with pagination. 2012-01-12 20:37:50 +04:00
konstantin.grabar b48ffecc28 [refs #54] Add new styles to comments list to issue page 2011-12-27 17:52:48 +04:00
George Vinogradov 6c48e058be [close #70] Removed all & filter methods in BuildListsController
*  Removed methods
*  Changed abilities
*  Changed routes
*  Added specs
2011-12-21 05:30:34 +04:00
George Vinogradov 2f5ce7cebe Merge branch 'groups_reincarnation' into staging
Conflicts:
	app/models/ability.rb
	app/models/project.rb
	config/environments/production.rb
2011-12-05 17:16:32 +04:00
George Vinogradov 9cc820080b Groups base functional. 2011-12-05 16:32:18 +04:00
konstantin.grabar 96d4886f49 [refs #2249] Add new ACL relations 2011-12-01 18:20:24 +04:00
Pavel Chipiga 796ff75857 Great models refactoring. Refactor some cancan abilities and controllers authorization. Move some common parts to modules. Fix lots bugs. Remove unused files and code. Drop ACL tables. Add more can? helpers. Refs #2249 2011-11-24 23:48:58 +02:00
konstantin.grabar 140eaf6265 [refs #2249] Remove old roles managment system 2011-11-21 21:43:37 +04:00
konstantin.grabar e50959e205 [refs #2249] Add full rules, helpers and filters of CanCan 2011-11-19 15:41:11 +04:00
Pavel Chipiga c5fdfcd39d Fix sessions layout meta tags. Refs #2162 2011-11-10 01:50:51 +02:00
konstantin.grabar 9b80c09bfb [refs #2161] Remove groups from menu 2011-11-02 13:30:14 +04:00
konstantin.grabar 6fc522e6cc [refs #2161] Global header fix 2011-11-02 01:09:10 +04:00