Commit Graph

76 Commits

Author SHA1 Message Date
Pavel Chipiga 7d112d0524 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-01 19:33:46 +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 159ef26b38 Merge branch 'master' into 3.2-master
Conflicts:
	app/views/wiki/_compare.html.haml
	app/views/wiki/_diff_data.html.haml
	db/schema.rb
2012-02-27 22:32:57 +02:00
Pavel Chipiga ed60751dfa Delegate all repo abilities to platform. Remove repository owner and relations. Fix templates and specs. Refactor and code cleanup. Refs #205 2012-02-21 01:13:05 +02:00
Alexander Machehin 76beb6a277 [refs #194] add creator to issue 2012-02-19 23:28:43 +06:00
Alexander Machehin da0d791f74 [refs #96] fixed commentable & subscribeable ids 2012-02-15 02:28:01 +06:00
George Vinogradov ce39cdd04f [issue #174] A half of work to create invitations system 2012-02-09 21:46:23 +04:00
Vladimir Sharshov 4165b188eb Merge branch 'master' into 64-project_wiki
Conflicts:
	app/models/project.rb
	config/locales/en.yml
2012-02-03 00:55:16 +04:00
Alexander Machehin f15cb90b87 Merge branch 'master' into 114-comment_notifications
Conflicts:
	config/locales/ru.yml
2012-01-31 21:42:37 +06:00
George Vinogradov 24124766f4 [issue #64] Merge branch 'master' into 64-project_wiki
Conflicts:
	Gemfile.lock
	config/locales/en.yml
	db/schema.rb
2012-01-31 02:07:11 +04:00
Pavel Chipiga 13780a1b53 Add magic encodings. Refs #95 2012-01-30 22:39:34 +02:00
Alexander Machehin 8962e85b2d [refs #114] fix reverting 2012-01-30 12:38:31 +06:00
Alexander Machehin e0b7699ffd Revert "Merge branch '114-comment_notifications' into user-emails-list"
This reverts commit 2179cbbf40334cbe5d4fa9ba3a7f297d8f543a0a, reversing
changes made to 9bf06e5e1a595f320dc4527ebd44f14be05fcd64.

Conflicts:

	app/models/user.rb
2012-01-30 12:22:54 +06:00
Alexander Machehin f6b6bbfb54 Revert "[refs #114] emails control"
This reverts commit 26fb1fcbfb843163231d8b8f0caf582bafccbe57.

Conflicts:

	app/models/subscribe.rb
	app/models/user.rb
	spec/models/comment_for_commit_spec.rb
2012-01-30 12:19:54 +06:00
Alexander Machehin dc39eefe62 Revert "[refs #114] add js"
This reverts commit 48a9c4d50b9f11a11cc4f2c5831c4b5b25fdc4d1.
2012-01-30 12:16:09 +06:00
Alexander Machehin ea7cbe1908 Revert "[refs #114] fix emails uniqueness"
This reverts commit bc9649561f5b8ac58f9b27d31d66365f16d0cce0.

Conflicts:

	app/models/subscribe.rb
	app/models/user_email.rb
2012-01-30 12:15:33 +06:00
Alexander Machehin 2e2e7e43d3 [refs #114] some refactoring 2012-01-30 02:18:14 +06:00
Alexander Machehin 39a4479fa3 [refs #114] fix emails uniqueness 2012-01-29 22:27:46 +06:00
George Vinogradov 549f0a55e8 [issue #64] Merge branch 'master' into 64-project_wiki
Conflicts:
	Gemfile.lock
	app/models/project.rb
	app/models/user.rb
	app/views/projects/_form.html.haml
	config/locales/ru.yml
	db/schema.rb
2012-01-27 18:27:23 +04:00
Alexander Machehin 06ab99a1d0 [refs #114] add js 2012-01-27 18:20:07 +06:00
George Vinogradov 2d1e36fb1a [issue #64] Changed own_projects validation. 2012-01-27 04:16:07 +04:00
George Vinogradov ba84d5f216 [issue #64] Added validation of own_projects count. 2012-01-27 03:37:19 +04:00
George Vinogradov 1498e937f6 [issue #64] Added own_projects counters to User & Group 2012-01-27 02:33:18 +04:00
Alexander Machehin e71a9e84cb [refs #114] emails control 2012-01-27 02:11:07 +06:00
Alexander Machehin e04b2eb59b Merge branch '114-comment_notifications' into user-emails-list
Conflicts:
	app/models/subscribe.rb
	config/locales/en.yml
2012-01-26 14:55:16 +06:00
Alexander Machehin 77420d2a8f [refs #114] user emails 2012-01-26 14:53:40 +06:00
Alexander Machehin 4cca8f7bb1 [refs #114] some refactoring 2012-01-25 23:33:26 +06:00
konstantin.grabar 01d8cd8dcc [refs #105] Change LANGUAGE constant into User 2012-01-18 17:06:18 +04:00
konstantin.grabar d205eb2dd9 [refs #105] Add language check on user save 2012-01-17 15:57:46 +04:00
konstantin.grabar 726eddc40e [refs #105] Add internationalization support to project 2012-01-17 15:48:40 +04:00
konstantin.grabar 2b8aca5f09 [refs #54] Add settings notifier 2012-01-11 17:58:13 +04:00
Pavel Chipiga 2c67843c34 Refactor and cleanup build_lists controller and routes. Rename methods. Allow deffis in platform and repository name. Add missing relation and migration to force work user assign in build_lists. Fix and simplify links. Abstract sidebar. Refs #65 2011-12-21 23:42:06 +02:00
George Vinogradov 39dade9945 [closed #63] Added user column to build_list. 2011-12-20 21:09:29 +04:00
Pavel Chipiga 7448d74416 Allow to add only own projects to personal repository. Fix tests. Remove deprected relation. Refs #47 2011-12-15 23:52:45 +02:00
Pavel Chipiga 814a0a46fe Fix OpenID init. Refs #2261 2011-12-06 21:57:03 +02: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
Pavel Chipiga 9daf08a36c Minor fix 2011-11-21 15:26:32 +02:00
konstantin.grabar 98a3493f41 [refs #2249] Add user role validation correction 2011-11-21 17:17:35 +04:00
Pavel Chipiga ce60f7b057 Generate files for easy_urpmi during platform mount. Improve nd refactor auth module for grack, apply cancan. Adapt project import script to new source file. Fix bugs. Refactor. Refs #2261, #2243 2011-11-21 14:59:23 +02:00
George Vinogradov 82433c0909 Fixed ROLES array and returned add_default_role method in User model. 2011-11-21 03:03:51 +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 d49880f24e Merge branch 'smart_http' into staging
Conflicts:
	app/models/relation.rb
	app/models/user.rb
2011-11-18 20:35:12 +02:00
Pavel Chipiga 3b36943b91 Remove gitolite and it callbacks. Add git repo create, destroy callbacks. Improve grack wrappers: separate read/write requests, ask password for push even for public repo, prepare for cancan, apply hooks, refactor. Fix auto_build_lists order. Refactor auto_build - move to model. Redo git_repo_url. Improve and test project import script. Fix bugs, refactor and cleanup. Refs #2243 2011-11-17 23:57:30 +02:00
konstantin.grabar 4d4f5deed4 [refs #2249] Remove bitmask. Add new rules. Add some authorize filters. Add some template can? helpers 2011-11-16 22:45:01 +04:00
Pavel Chipiga b2be92e4d1 Integrate grack into rails stack. Implement basic http auth for grack. Allow only downcase for uname and unixname. Refactor and code cleanup. Refs #2243 2011-11-15 23:58:27 +02:00
konstantin.grabar 827936a06c Remove custom ACL calls. Add CanCan and some rules. Add bitmask_attribute 2011-11-16 00:05:08 +04:00
George Vinogradov 3b72efcffd Removing projects, platforms and repositorits when owner removed.
Removing Relations joined with projects, platforms and repositories.
2011-11-02 02:33:20 +04:00
Pavel Chipiga 5c97e89829 Fix gitolito update_key bug. Push project colaborators git. Fix key update. Hide colaborators groups. Improve RPC XML tests. Refactor and code cleanup. Refs #2162 2011-11-01 02:52:24 +02:00
George Vinogradov 5fb704d3c5 Fixed bug with user registration and changed hardcoded 'mandriva2011' 2011-10-31 04:33:47 +04:00