ba1798fd71
[refs #195 ] Add design to form and edit page
2012-02-22 21:48:37 +04:00
85f3d956f5
[issue #195 ] Merge branch '203-feed_message' into 195-new_design_for_projects
...
Conflicts:
app/views/layouts/application.html.haml
2012-02-21 19:42:30 +04:00
b7b69a86d8
Minor gems update. Sync with newest styles, javascripts, images. Refactor assets. Merge and fix wiki assets, temporary disable buggy ones. Change subscribeable_id type from string to decimal to avoid bugs. Auto convert commit subscribe subscribeable_id from hex to decimal. Refactor commentable. Fix bugs and some specs. Refactor application.yml. Refs #96
2012-02-14 18:05:41 +02:00
02478f5451
Merge branch 'master' into 96-upgrade_rails
2012-02-14 14:05:27 +02:00
7bca61c58d
Fix cancan regsiter_requests specs. Temporary fix specs running bug through file rename. Refs #161
2012-02-14 13:50:01 +02:00
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
99c314fb11
[issue #133 ] Merge branch 'master' into 133-editing_from_web
...
Conflicts:
db/schema.rb
2012-02-13 21:48:40 +04:00
704c544cbc
Add more register_requests fields, change design. Apply invitation mail sending. Refactor. Refs #174
2012-02-10 18:33:16 +02:00
ce39cdd04f
[issue #174 ] A half of work to create invitations system
2012-02-09 21:46:23 +04:00
a4baf8b670
[issue #133 ] Editor JS moved to separate file
2012-02-09 04:35:07 +04:00
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
36f609ec7d
[refs #143 ] fix destroy
2012-02-07 01:47:39 +06:00
fde67a2c22
[refs #134 ] add post receive hook to repos
2012-02-06 15:31:22 +06:00
26923740ad
Hot fix for en yml
...
Add new schema.rb
2012-02-03 01:30:08 +04:00
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
8562b882da
Merge pull request #136 from warpc/114-comment_notifications
...
Notifications and subscribtions about new comments in commit [Refs #114 ]
2012-02-01 11:12:24 -08:00
d0717c8f9e
[issue #64 ] Merge branch 'master' into 64-project_wiki
...
Conflicts:
Gemfile.lock
db/schema.rb
2012-02-01 22:39:04 +04:00
aa9652409c
[refs #114 ] clean
2012-02-01 01:15:53 +06:00
fde298cc85
Rollback to redhillonrails_core instead of schema_plus to avoid some bugs. Add platform reference to project_imports, change indexes and validators. Adjust sync algoritm to use platform_id. Improve rsync params. Refs #112 , #138
2012-01-31 20:48:37 +02:00
6f78e5456c
[issue #64 ] Changes for ruby 1.9.3 compatibility.
2012-01-31 20:40:46 +04:00
f15cb90b87
Merge branch 'master' into 114-comment_notifications
...
Conflicts:
config/locales/ru.yml
2012-01-31 21:42:37 +06:00
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
13780a1b53
Add magic encodings. Refs #95
2012-01-30 22:39:34 +02:00
33dce21312
Upgrade to ruby 1.9.3 and fix bugs. Fix bug with commit_hash save during project build. Move some russian text to yml. Code cleanup. Fix templates, deploy and import scripts. Fix specs. Translate event_logs. Refs #95
2012-01-30 22:36:58 +02:00
5f40030e30
[issue #64 ] Fixed bug with cloning wiki repository
2012-01-30 18:17:00 +04:00
119c378149
[refs #114 ] change subsrcibe status to boolean
2012-01-30 17:59:57 +06:00
2f315f869d
[issue #64 ] Merge branch 'master' into 64-project_wiki
...
Conflicts:
Gemfile.lock
app/models/project.rb
db/schema.rb
2012-01-30 13:27:22 +04: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
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
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
39a4479fa3
[refs #114 ] fix emails uniqueness
2012-01-29 22:27:46 +06:00
98e1696fd2
[issue #64 ] Fixed mistake in schema.rb
2012-01-28 16:10:18 +04:00
a1d7ee10e9
Redo indexes to schema_plus. Refs #112
2012-01-28 04:29:33 +02:00
43a4aecc66
Change indexes to composite, unique, case insensitive. Redo sync logging. Verbose params for tasks. Refs #112
2012-01-28 04:05:31 +02:00
fab4aa6eb6
Refactor and fix projects by_name scope. Apply case insensitive projects, repositories and platforms name uniqness validation. Apply case insensitive project search fallback. Redirect import task outnput to log file. Rename all task. Refs #112
2012-01-28 03:04:11 +02:00
9caf496454
[issue #64 ] Added missing translations.
2012-01-27 20:48:48 +04: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
0cacdc9d4a
[issue #64 ] Fixed bug in migration
2012-01-27 18:38:33 +04:00
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
ba84d5f216
[issue #64 ] Added validation of own_projects count.
2012-01-27 03:37:19 +04:00
1498e937f6
[issue #64 ] Added own_projects counters to User & Group
2012-01-27 02:33:18 +04: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
3f4bf65825
Upgrade paperclip. Apply srpm_import script and UI. Fix specs. Refs #31
2012-01-24 22:35:36 +02:00
6df1640485
[refs #114 ] fix logics
2012-01-24 18:18:39 +06:00
9127b6b689
[refs #114 ] changed logics
2012-01-24 01:42:54 +06:00
71447a29e3
[refs #114 ] add settings for commits notifications
2012-01-19 00:20:08 +06:00
4ba268dd67
Merge pull request #109 from warpc/18-commit_comments
...
18 commit comments
2012-01-18 05:49:57 -08:00
eb6ec413da
Merge pull request #108 from warpc/105-internationalization
...
105 internationalization
2012-01-18 05:38:55 -08:00
f8be867aaf
Replace annotated tags to lightweight. Improve specs. Restore lost migrations. Refs #103
2012-01-17 19:37:41 +02:00
konstantin.grabar
George Vinogradov
Pavel Chipiga
Alexander Machehin
Vladimir Sharshov
Pasha