a0b7f243d6
[refs #263 ] changed and fixed comment tests; some refactoring
2012-03-27 21:09:04 +06:00
115c90f03b
Merge pull request #331 from warpc/263-refactoring
...
[Refs #263 ] Fix broken tests
2012-03-23 13:49:20 -07:00
1680b949f5
[refs #263 ] Fix personal repositories and CanCan platform tests
2012-03-23 15:29:25 +04:00
4553affa56
Add missing magic_encodings. Fix blame commit select, hide blank blame. Fix git repo hooks - redo branch parse to support non-ascii branches. Refs #190 , #134
2012-03-22 19:11:12 +02:00
16c9e6aa24
[refs #263 ] Fix most of the failed tests
2012-03-22 19:48:28 +04:00
6d330d9164
[refs #265 ] fixed tests to issue comments
2012-03-22 16:16:31 +06:00
72c02282aa
[refs #232 ] Add mass-assignment fixes. Add create and mass-assig tests.
2012-03-21 17:52:35 +04:00
aa4bd2c1bc
[refs #232 ] Add groups tests
2012-03-20 19:40:49 +04:00
56a12dc9ea
Merge branch 'master' into 3.2-master
...
Conflicts:
app/models/comment.rb
app/models/issue.rb
config/locales/en.yml
2012-03-03 01:38:43 +02:00
bc75b318ce
[refs #195 ] Merge 3.2-master into 195-new_design_for_projects
2012-02-29 21:37:28 +04:00
fe46e53ad8
[issue #195 ] Many changes.
...
* Base presenter moved to lib
* Added diff display
* Changes in some views
TODO Add translations.
TODO Change commit page layout.
TODO Change representation of commit on commit page.
TODO Fix bug with tree/branch select.
2012-02-29 06:02:07 +04:00
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
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
5e58ec9e59
Delegate all repo abilities to platform. Remove repository owner and relations. Fix templates and specs. Refactor and code cleanup. Refs #205
2012-02-24 19:27:58 +04:00
027012d3e5
[refs #194 ] some refactotring
2012-02-23 21:57:51 +06:00
9e5e7cd5e4
[refs #194 ] labels manage
2012-02-23 20:48:46 +06:00
ecb29d1762
[refs #194 ] tags -> labels
2012-02-22 02:28:04 +06:00
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
0ce76207af
[refs #194 ] Add issue tags
2012-02-21 00:41:40 +06:00
da0d791f74
[refs #96 ] fixed commentable & subscribeable ids
2012-02-15 02:28:01 +06:00
5039907431
Merge branch 'master' into 123-activity-feed
2012-02-14 14:30:27 +04:00
ce39cdd04f
[issue #174 ] A half of work to create invitations system
2012-02-09 21:46:23 +04:00
96d3b35bdf
[refs #123 ] Merge master into 123-activity-feed
2012-02-06 19:46:32 +04:00
aa9652409c
[refs #114 ] clean
2012-02-01 01:15:53 +06:00
f15cb90b87
Merge branch 'master' into 114-comment_notifications
...
Conflicts:
config/locales/ru.yml
2012-01-31 21:42:37 +06:00
13780a1b53
Add magic encodings. Refs #95
2012-01-30 22:39:34 +02:00
119c378149
[refs #114 ] change subsrcibe status to boolean
2012-01-30 17:59:57 +06:00
5efaca77cf
Merge branch 'master' into 114-comment_notifications
...
Conflicts:
app/models/project.rb
app/views/user_mailer/new_comment_notification.en.haml
app/views/user_mailer/new_comment_notification.ru.haml
app/views/user_mailer/new_comment_reply_notification.ru.haml
config/locales/devise.en.yml
config/locales/en.yml
config/locales/ru.yml
db/schema.rb
2012-01-30 13:06:06 +06:00
8962e85b2d
[refs #114 ] fix reverting
2012-01-30 12:38:31 +06:00
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
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
dc39eefe62
Revert "[refs #114 ] add js"
...
This reverts commit 48a9c4d50b9f11a11cc4f2c5831c4b5b25fdc4d1.
2012-01-30 12:16:09 +06:00
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
2e2e7e43d3
[refs #114 ] some refactoring
2012-01-30 02:18:14 +06:00
39a4479fa3
[refs #114 ] fix emails uniqueness
2012-01-29 22:27:46 +06:00
74f891fc83
Apply rsync for mandriva repo. Parse and import changes from official repo. Fix attachment types. Redo srpm upload wrapper to use it without paperclip. Add cron task through whenever. Refs #112
2012-01-27 17:35:18 +02:00
06ab99a1d0
[refs #114 ] add js
2012-01-27 18:20:07 +06:00
e71a9e84cb
[refs #114 ] emails control
2012-01-27 02:11:07 +06:00
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
77420d2a8f
[refs #114 ] user emails
2012-01-26 14:53:40 +06:00
4cca8f7bb1
[refs #114 ] some refactoring
2012-01-25 23:33:26 +06:00
990a46018c
[refs #123 ] Add base logic for activity feed
2012-01-25 12:31:49 +04:00
3f4bf65825
Upgrade paperclip. Apply srpm_import script and UI. Fix specs. Refs #31
2012-01-24 22:35:36 +02:00
61be317b21
[refs #114 ] i18n
2012-01-25 01:00:51 +06:00
6582a9afa5
[refs #114 ] fix tests
2012-01-24 18:15:56 +06:00
651c5637ed
[refs #114 ] fix committer notification
2012-01-22 23:49:41 +06:00
36a895385c
[refs #114 ] changed rules
2012-01-22 01:13:33 +06:00
d8df6c6279
[refs #114 ] committer subscribe + some tests
2012-01-21 00:22:25 +06:00
3a00a66b86
[refs #114 ] polish controller tests
2012-01-20 22:48:21 +06:00
371abac031
[refs #114 ] fix controller tests
2012-01-20 21:17:05 +06:00
876351edb5
[refs #114 ] Fixed tests
2012-01-20 12:27:13 +06:00
800b02f544
[refs #18 ] Add project subsribe, tests
2012-01-20 00:20:03 +06:00
dba11f4662
[refs #114 ] FIXME subscribers
2012-01-19 01:12:52 +06:00
bf4e4f02ed
Right merge branch 'master' into 18-commit_comments
...
Conflicts:
app/controllers/comments_controller.rb
app/views/comments/edit.html.haml
app/views/issues/show.html.haml
db/schema.rb
2012-01-17 15:52:46 +06:00
ee58a8e789
[refs #54 ] Fix comments failed specs
2012-01-17 12:20:06 +04:00
69debdd83e
fix tests for shared elements
2012-01-16 19:43:23 +06:00
674d5f8e56
[refs #18 ] model tests
2012-01-14 18:36:00 +06:00
2b8aca5f09
[refs #54 ] Add settings notifier
2012-01-11 17:58:13 +04:00
dda40d9e9d
[refs #54 ] Mailer specs for comments and issues
2012-01-11 11:12:23 +04:00
60a7f3e87f
[refs #54 ] Fix comments specs
2012-01-10 15:24:43 +04:00
3f72082e0e
[refs #54 ] Add comments, subscribes models specs. Finish subscribes controller specs. Some ability.rb fixes
2011-12-30 18:21:08 +04:00
a783b460bd
Merge issues with master
2011-12-28 13:22:57 +04:00
5e3addd5d2
Great refactor for cancan abilities. Remove product relations. Fix git abilities. Fix and refactor specs. Refs #85 . Refactor issues controller to avoid serial_id problem. Fix links and routes. Fix minor bugs and translations. Fix specs. Refs #54
2011-12-28 04:59:05 +02:00
ce6746f7a9
[refs #54 ] Add subscribes and notifications
2011-12-26 19:48:57 +04:00
7d3dd5eaf1
[ #82 ] Merge branch 'master' into 65-build_repo
...
Conflicts:
spec/models/cancan_spec.rb
2011-12-26 14:51:30 +02:00
5237939f49
Merge issues with master
2011-12-26 13:26:13 +04:00
3b300f2ca4
[issue #79 ] Removed comments
2011-12-23 21:17:02 +04:00
7d8d77a386
[issue #79 ] Added validation to ProjectToRepository
2011-12-23 21:06:47 +04:00
894bc0c077
[refs #54 ] Add issues tests. Fix some CanCan rights. Make some fixes to logic
2011-12-23 14:56:46 +04:00
8c3291d237
Fix and redo specs after great build_lists refactoring and improvement. Fix minor bugs. Code cleanup. Refs #65
2011-12-23 04:14:28 +02:00
d20d43eb2b
[refs #54 ] Base logic and templates for issues and comments to them
2011-12-19 19:30:14 +04:00
4d42fb67e1
Fix collaborators controller broken tests
...
Fix members controller broken tests
Add platforms controllers test
Fix mistake in cancan model test
2011-12-15 00:49:33 +04:00
2c88c76876
[refs #8 ] Refactore some shared examples. Stubed rsync and sudo calls. Fix some specs.
2011-12-12 11:51:39 +04:00
3e41e6fb42
Issue #4 fixed duplication of Relations when creating personal
...
repository
2011-12-08 18:03:56 +04:00
02a813a474
Upgrade rails, devise and other gems. Refactor controllers. Fix application.yml config - remove unused keys and setup correct values for tests. Add product build lists status_build callback auth. Allow platform and project unixname uppercase. Write tests and fix bugs for ProductBuildList controller. Fix all unresolved test problems. Refs #2262
2011-11-26 02:54:40 +02:00
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
97e4a7d26d
[refs #2249 ] Finished CanCan models tests. Add new factories
2011-11-23 22:12:55 +04:00
fc3c6a05c9
[refs #2249 ] CanCan tests
2011-11-22 23:21:31 +04:00
140eaf6265
[refs #2249 ] Remove old roles managment system
2011-11-21 21:43:37 +04:00
7996740ae7
Improve build_lists time. Apply product build lists basic functionality. Move product build functionality to separate controller. Apply event logging for product build. Fix logging for project build list publishing. Code refactor and cleanup. Refs #2161
2011-11-11 19:13:09 +02:00
30564e8e17
[refs #2161 ] Add auto build lists functional
2011-10-29 23:09:50 +04:00
644d57b420
Merge branch 'catalog'
...
Conflicts:
Gemfile
Gemfile.lock
app/views/layouts/application.html.haml
app/views/repositories/show.html.haml
config/locales/ru.yml
config/routes.rb
db/schema.rb
2011-10-21 17:55:41 +03:00
505cb74c34
Merge branch 'itima_web_refactoring'
...
Conflicts:
app/models/user.rb
2011-10-20 20:00:52 +04:00
a92282de1e
Merge branch 'chipiga'
...
Conflicts:
app/controllers/application_controller.rb
app/views/layouts/application.html.haml
config/locales/ru.yml
db/schema.rb
2011-10-20 19:55:03 +04:00
1659ad5805
Merge branch 'private_repos'
...
Conflicts:
config/application.yml.sample
config/locales/ru.yml
config/routes.rb
db/schema.rb
2011-10-20 19:49:35 +04:00
2dd99d32f9
Merge branch 'downloads'
...
First turn of merging.
Conflicts:
.gitignore
Gemfile
Gemfile.lock
config/locales/ru.yml
config/routes.rb
db/schema.rb
2011-10-20 19:22:11 +04:00
5291752419
Add categories and apply basic CRUD actions. Add category link and description to project. Apply category assign to project. Apply categorization with platforms. Integrate to common design and layout. Import basic categories structure. Refs #1858
2011-10-19 23:58:31 +03:00
b84ab42d00
add extension actions, model role_relations
2011-10-20 00:19:45 +04:00
5f17928423
[refs #1923 ] Add private repositories to project
2011-10-18 17:47:17 +04:00
5f705cdd0d
Develop and apply event logging mechanism without source code modification and with localization. Apply events log display with pagination. Apply XML RPC requests stub for local test. Refactor. Refs #1828
2011-10-17 11:04:36 +03:00
8103b14e15
[refs #1861 ] Add downloads statistics
2011-10-14 10:35:25 +04:00
229b4bb3f4
Created new models and provided relationships between them.
2011-10-13 19:55:03 +04:00
cd6e7ade15
Product Builder xml-rpc and Product model
2011-04-11 12:35:08 +04:00
3b51d53225
freeze + spec
2011-03-17 17:47:16 +03:00
002dc417b5
Container/Arch/Rpm
2011-03-16 00:52:27 +03:00
80304ef7f2
Trying to add repositories to my hierarchy
2011-03-11 19:08:41 +03:00
0218f5dfd0
Platform and Project core models
2011-03-09 20:38:21 +03:00
d3fd18a700
Device users
2011-03-09 19:16:48 +03:00
Alexander Machehin
Vladimir Sharshov
konstantin.grabar
Pavel Chipiga
George Vinogradov
Toljio
Alexey Nayden
Timothy N. Tsvetkov