4b26eebeca
[refs #223 ] Add new design to build list task page
2012-03-18 12:20:31 +04:00
86871ab32d
Merge branch '3.2-master' into 265-activity_feed_messages
...
Conflicts:
config/locales/menu.en.yml
config/locales/menu.ru.yml
2012-03-17 01:09:04 +06:00
dd5f51de71
[refs #265 ] added build tasks feed
2012-03-16 21:37:58 +06:00
3d9f9b5c73
[issue #279 ] Fixed permissions and moved some buttons.
...
Removed Freeze/Unfreeze actions from Platform.
2012-03-16 17:25:34 +04:00
cc68163238
[issue #279 ] Fixed some bugs:
...
* Redirect to repositroies page when remove repository.
* Fixed sorting background in Datatables styles.
* Fixed save button translation in platforms form.
* Fixed platform save & create flashes.
* Fixed cancel buttons in platform, product & repository forms.
* Redirect to created product on creation.
* Redirect to platform's products page after product destruction.
* Fixed permissions to Build button on product page.
* Fixed permissions to Add button on repository page.
* Fixed forbidden redirect when trying to acces
RepositoriesController#projects_list by unprivilleged user.
2012-03-16 02:56:12 +04:00
dce26c79e0
[refs #265 ] fixed en locale
2012-03-16 00:25:05 +06:00
4addff059b
[refs #265 ] added activity feed tabs
2012-03-15 23:52:54 +06:00
3c60347a23
[issue #279 ] Fixes.
...
* Almost finished permissions fixes
* Removed is_template from product
* Some fixes in crontab_generator partial
2012-03-15 03:34:09 +04:00
747edb73a5
[issue #279 ] Merge branch '3.2-master' into 279-new_design_for_platforms
...
Conflicts:
db/schema.rb
2012-03-14 21:43:08 +04:00
5a77b17a43
[issue #279 ] Almost finished design for platforms
...
TODO:
* Add design for crontab generator
* Fix path generation
2012-03-14 21:22:47 +04:00
3642163fd7
[refs #265 ] changed feed messages
2012-03-14 23:00:26 +06:00
ba437f7703
[refs #265 ] changed activity feed messages
2012-03-14 00:47:37 +06:00
304141b1ba
[issue #279 ] Added views and removed datatables plugin
...
* Datatables plugin moved to lib.
* Added views to platform and repositories.
2012-03-13 19:12:06 +04:00
61b8c70f4b
[Refs #257 ] Fix edit profile labels
2012-03-12 22:13:10 +04:00
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
4fd91e2bfe
[refs #257 ] force convert avatar to jpg
2012-03-12 22:28:56 +06:00
24639b8684
[refs 257] renamed to profile
2012-03-12 21:03:25 +06:00
a800b4364d
[refs #257 ] fixed translation
2012-03-12 18:52:32 +06:00
5f6ca140d9
[refs #257 ] add ability to destroy avatar
2012-03-12 18:51:07 +06:00
04622790fc
Merge pull request #289 from warpc/265-new_design_for_activity_feed
...
[refs #265 ] Work today builds statistics
2012-03-12 02:15:26 -07:00
ecfb4f81a0
[refs #265 ] fixed today builds
2012-03-12 14:52:38 +06:00
535c075d3e
[issue #279 ] Added platform main page, menu & sidebar
2012-03-12 03:08:50 +04:00
6f56a7787d
Merge pull request #267 from warpc/265-new_design_for_activity_feed
...
[Refs #265 ] Add first version of new design to activity feed
2012-03-11 10:33:47 -07:00
35d1323549
[refs #265 ] fixed message format
2012-03-11 23:30:14 +06:00
d86653e172
Split code and tracker options in notification center
2012-03-11 21:21:31 +04:00
6d5120e5cc
Merge branch '3.2-master' into 265-new_design_for_activity_feed
2012-03-11 22:44:25 +06:00
11434ff423
[Refs #285 ] Fix css style, rename button
2012-03-11 20:38:28 +04:00
41cd1ddaf3
Redo cusel assign to avoid side effects. Refactor and cleanup projects controller, routes, views. Apply new design and functionality for projcts list page. Add fork button and fix fork. Apply gap repo during repo fork. Apply attr_accessible for projects. Cleanup locales. Fix new_build link ability check. Refs #195
2012-03-07 23:34:49 +02:00
7588a318da
Merge branch '3.2-master' into 265-new_design_for_activity_feed
...
Conflicts:
app/models/user.rb
2012-03-07 03:58:35 +06:00
4b9d0616d6
Merge branch '3.2-master' into 194-issue_page
...
Conflicts:
app/views/issues/_create_sidebar.html.haml
2012-03-07 01:19:34 +06:00
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
8ae7ebee2b
Merge branch '3.2-master' into 194-issue_page
2012-03-06 22:51:13 +06:00
9565d58e8f
[refs #257 ] Merge 3.2-master into 257-new_design_for_profiles
2012-03-06 20:13:53 +04:00
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
f54d889f74
[refs #265 ] Fix activity partials messages and locales. Fix observer.
2012-03-06 18:04:05 +04:00
de6490346b
[refs #257 ] Change error messages logic. Fix avatar ru translation
2012-03-06 15:24:42 +04:00
9e6d06f1c9
[refs #194 ] manage issue executer
2012-03-06 00:28:55 +06:00
637edabb4c
[refs #257 ] Fix some locales and headers
2012-03-05 22:00:44 +04:00
9d8eb8a3f2
Merge pull request #269 from warpc/195-new_design_for_projects
...
[Refs #195 ] Add blane functions. Fixed syntax highlighting. Stub for rpm-specs.
2012-03-05 09:07:36 -08:00
8845ec17ff
[issue #195 ] Added translations.
2012-03-05 20:31:09 +04:00
73296059eb
[refs #257 ] Merge 3.2-master into 257-new_design_for_profiles
2012-03-05 13:42:39 +04:00
c176304088
Add first version of new design to activity feed. Add new scope to BuildList model. Fix one moment into observer.
2012-03-05 13:11:50 +04:00
9b68752ffd
[refs #257 ] Change avatar helper and logic. Add paperclip avatar to users
2012-03-03 22:05:02 +04:00
ecff8d2d41
[refs #257 ] Add new design to notifier settings. Fix sidebar. Add edit btn to user profile
2012-03-03 13:23:30 +04:00
0dc22bae82
[refs #257 ] Add new design for users edit and private settings edit. Add new fields and action.
2012-03-03 12:01:32 +04:00
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
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
6522650c5a
[issue #195 ] Merge branch '3.2-master' into 195-new_design_for_projects
...
Conflicts:
app/views/git/blobs/_show.html.haml
2012-03-02 20:58:28 +04:00
b3750f8644
[issue #195 ] Fixed branch selector.
2012-03-02 20:48:19 +04:00
6bb3d36c81
Merge pull request #258 from warpc/230-error_messages
...
[refs #230 ] Fix error messages + some refactoring
2012-03-02 04:55:55 -08:00
7164dd580e
[refs #230 ] fix error messages + some refactoring
2012-03-02 18:27:38 +06:00
e147c2d6c5
[refs #257 ] Add new design for user public page. New field. Move locales to another file
2012-03-02 16:14:59 +04:00
1700588b97
[refs #232 ] Merge 3.2-master into 232-new_groups_design
2012-03-02 13:44:54 +04:00
d376b55a57
[refs #232 ] Move groups locales to another files. Remove unsused commented code. On small sidebar fix
2012-03-02 12:47:16 +04:00
f79c8d6f16
[refs #230 ] shorter error messages
2012-03-02 02:04:06 +02:00
d7dbe79357
[refs #230 ] edit password page
2012-03-02 02:04:06 +02:00
3aae663811
[refs #194 ] add comments to issues
2012-03-02 02:04:05 +02:00
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
4b024d1728
[issue #195 ] Fixes.
...
* Fixed translations
* Fixed blob display
* Fixed routes
2012-03-01 21:37:24 +04:00
157f9a1a68
[refs #232 ] Add sidebar and group edit page
2012-03-01 16:28:38 +04:00
2a4e978857
[issue #195 ] Merge branch '3.2-master' into 195-new_design_for_projects
...
Conflicts:
app/assets/stylesheets/custom.scss
2012-03-01 14:22:39 +04:00
fe5ad9ebf3
[issue #195 ] Added missed js. Some changes.
2012-03-01 05:07:31 +04:00
bc96fcdcc3
[issue #195 ] Added missed translation.
2012-03-01 03:34:36 +04:00
d3231b5faa
Merge pull request #243 from warpc/230-registration_page
...
[Refs #230 ] Fix I18n and remove wrong js for registration page
2012-02-29 11:23:35 -08:00
ceae6730d8
[refs #230 ] fix I18n
2012-03-01 01:14:46 +06:00
d9ca8ff8b6
Merge pull request #231 from warpc/195-new_design_for_projects
...
[Refs #195 ] new design for projects
2012-02-29 09:54:42 -08:00
bc75b318ce
[refs #195 ] Merge 3.2-master into 195-new_design_for_projects
2012-02-29 21:37:28 +04:00
12d8f5e7b8
[refs #232 ] Add new design to some group pages
2012-02-29 21:12:06 +04:00
ba4fae071f
[refs #230 ] error messages
2012-02-29 23:01:30 +06:00
3136159777
[refs #230 ] add red borders to invalid attributes
2012-02-29 22:59:09 +06:00
ee84ac84cf
[refs #228 ] fix I18n
2012-02-29 22:59:08 +06:00
a1bfe66791
[refs #228 ] sign_in page
2012-02-29 22:59:08 +06:00
5b9d20154b
[issue #195 ] Added translations and maybe missed partials
2012-02-29 20:27:32 +04:00
662ea4018c
[issue #195 ] Changed commit header on commit page.
2012-02-29 19:08:21 +04:00
c5d8041296
[refs #195 ] Add global fixes to projects and collaborators logic
2012-02-29 18:45:04 +04:00
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
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
c4719f12da
[refs #194 ] some change in the issue managing
2012-02-28 22:33:38 +06:00
e9ae923b60
[refs #195 ] Merge 3.2-master into 195-new_design_for_projects
2012-02-28 20:10:31 +04:00
529d8d3708
Merge pull request #192 from warpc/123-activity-feed
...
[Refs #123 ] activity feed (commits notifcation not work)
2012-02-28 07:46:55 -08: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
0d75a37451
[refs #194 ] show page beta version
2012-02-28 20:05:18 +06:00
03663a8ed7
[refs #195 ] Add sections page and method to projects
2012-02-28 12:00:56 +04:00
70963d0943
Merge branch 'master' into 3.2-master
2012-02-27 22:34:21 +02: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
ddda2b92ab
[Refs #221 ] Delete product build lists (only in web)
2012-02-28 00:00:33 +04:00
b6a52fb840
Merge branch '195-new_design_for_projects' of github.com:warpc/rosa-build into 195-new_design_for_projects
2012-02-27 21:47:05 +04:00
582063d066
[issue #195 ] Commits history, editing, showing...
2012-02-27 21:40:46 +04:00
1005fbd64f
Add link to product container. Refs #217
2012-02-27 18:21:56 +02:00
27c85d32df
[refs #194 ] create page; index pagination; some bugs
2012-02-27 22:10:12 +06:00
72fec3b314
[refs #195 ] Add owner choose on project create
2012-02-27 13:03:28 +04:00
4d2459c60c
Refactor, fix and cleanup wiki templates and translations. Refs #193
2012-02-24 23:39:40 +02:00
dde81b5554
[refs #123 ] fix activity feed for commit comments; remove reply notification
2012-02-25 00:25:35 +06:00
63c89edfda
Isolated localization for activity feed
2012-02-24 19:28:01 +04:00
e93d5c08b0
[Refs#196] Update text message for empty text[en]
2012-02-24 19:27:57 +04:00
f4f542811d
[Refs#196] Update text message for empty text[ru]
2012-02-24 19:27:57 +04:00
4daf50b34e
Change blank repo message. Refs #196
2012-02-24 19:27:57 +04:00
aedfc0df8c
Change nginx log rotate period to 1 day
2012-02-24 19:27:55 +04:00
45905babd8
[refs #123 ] Add lost notification locales
2012-02-24 15:51:30 +04:00
395fb812a6
[refs #123 ] Move notifications locales into another file
2012-02-24 15:34:23 +04:00
9e5e7cd5e4
[refs #194 ] labels manage
2012-02-23 20:48:46 +06:00
ba1798fd71
[refs #195 ] Add design to form and edit page
2012-02-22 21:48:37 +04:00
b99a7d5aa9
[refs #193 ] Move wiki locales to another file
2012-02-22 16:11:40 +04:00
ecb29d1762
[refs #194 ] tags -> labels
2012-02-22 02:28:04 +06: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
0ce76207af
[refs #194 ] Add issue tags
2012-02-21 00:41:40 +06:00
5dcc4eabf8
[refs #194 ] tracker without tags manage
2012-02-20 22:54:45 +06:00
edc8774387
[issue #203 ] Some layout changes & presenters.
...
* Fixed bugs in layout
* Fixed typos
* Fixed bugs in JS
* Added universal partial _feed_message.html.haml
* Added presenters
* Added CommitAsMessage presenter, that prepares Grit::Commit
to be shown as message.
2012-02-19 02:47:57 +04:00
3d7b6ea9d6
[Refs#196] Update text message for empty text[en]
2012-02-16 23:10:58 +04:00
6a08704866
[Refs#196] Update text message for empty text[ru]
2012-02-16 23:08:54 +04:00
689d15f9fd
Change blank repo message. Refs #196
2012-02-16 20:23:49 +02:00
55379ed9c8
[refs #194 ] first steps
2012-02-16 00:53:58 +06:00
fab80d97eb
[refs #194 ] project submenu partial
2012-02-15 22:32:26 +06:00
00e2043f51
Change nginx log rotate period to 1 day
2012-02-15 14:37:27 +04:00
5039907431
Merge branch 'master' into 123-activity-feed
2012-02-14 14:30:27 +04: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
2160f3aa66
[issue #133 ] Added translations
2012-02-09 04:28:39 +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
96d3b35bdf
[refs #123 ] Merge master into 123-activity-feed
2012-02-06 19:46:32 +04:00
72a6edd86b
Fix missing localization[Refs #64 , Refs #139 ]
2012-02-03 01:47:35 +04:00
26923740ad
Hot fix for en yml
...
Add new schema.rb
2012-02-03 01:30:08 +04:00
06fa8f489f
Return original translation
2012-02-03 01:14:41 +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
20613ba2c3
[refs #64 ] All pages:
2012-02-02 01:36:56 +06: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
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
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
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
706c052a5e
[issue #64 ] User names are clickable.
2012-01-29 22:03:42 +04:00
12ceace1f1
[issue #64 ] Fixed some localization typos.
2012-01-28 16:15:09 +04:00
acdd1f22b6
[issue #64 ] Fixed bug with revert all wiki.
2012-01-28 16:10:43 +04:00
9caf496454
[issue #64 ] Added missing translations.
2012-01-27 20:48:48 +04:00
e01fe571b4
[refs #123 ] Add activity feed en translation fixes
2012-01-27 18:59:28 +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
06ab99a1d0
[refs #114 ] add js
2012-01-27 18:20:07 +06:00
72fd821bc8
[refs #123 ] Add fixes for activity feed
2012-01-27 16:06:04 +04:00
eed3040944
[issue #64 ] Changed validation message and removed unnecessary
...
validation of projects owner.
2012-01-27 10:13:56 +04:00
2d1e36fb1a
[issue #64 ] Changed own_projects validation.
2012-01-27 04:16:07 +04:00
e71a9e84cb
[refs #114 ] emails control
2012-01-27 02:11:07 +06:00
0eb0eb9713
[refs #123 ] Activity Feed logic global refactoring.
2012-01-26 21:04:58 +04:00
c529e63c96
Merge pull request #122 from warpc/105-internationalization
...
[refs #105 ] Fix devise translations
2012-01-26 08:06:34 -08: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
dd1493d677
[refs #123 ] Add activity feed page. Remove some unnessary code. Some logic fixes.
2012-01-25 17:05:39 +04:00
11f5305bec
Merge pull request #126 from warpc/112-sync_projects
...
Add feature #126 : import SRPM package in web
2012-01-24 13:39:46 -08:00
9e8c8efc80
Merge pull request #125 from warpc/124-fix-device-locale
...
[refs #124 ] Add missing translation
2012-01-24 12:59:49 -08:00
bdb31b4e13
Fix locale. Refs #31
2012-01-24 22:42:16 +02: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
0f06d4f627
[refs #124 ] Add missing translation
2012-01-25 00:18:16 +06:00
c3f415e90c
Add new build status for Item
2012-01-23 22:11:53 +04:00
7d2d080af5
Fix localization [ Refs #105 ]
2012-01-23 16:11:17 +04:00
06a977ea21
Merge branch 'master' into 114-comment_notifications
2012-01-20 22:03:04 +06:00
23573a1a07
[issue #64 ] Added creation wiki to project.
2012-01-20 19:10:30 +04:00
011efb0c4b
[issue #64 ] Added git access to Wiki.
2012-01-20 19:01:59 +04:00
e3a716b7db
[refs #105 ] Fix some translations
2012-01-20 15:29:32 +04:00
59c7faf5c1
Fix localization file (here was dragons!)
2012-01-20 02:07:42 +04:00
25bd2cd13d
Fix for localization files
2012-01-20 00:33:28 +04:00
54bc26d960
[issue #64 ] Added translations.
2012-01-19 18:37:36 +04:00
0c527af291
[issue #64 ] Added revisions comparsion.
2012-01-19 17:49:32 +04:00
538e3da8c8
[issue #64 ] Added search through wiki
2012-01-19 16:10:50 +04:00
022a013b79
[issue #64 ] Added Wiki seeding on create.
2012-01-19 16:06:27 +04:00
3994abd6ed
[refs #105 ] fix
2012-01-19 15:53:19 +06:00
14fdc35eb9
Add english localization. Refs #105
2012-01-19 13:34:05 +04:00
71447a29e3
[refs #114 ] add settings for commits notifications
2012-01-19 00:20:08 +06:00
2af0135fb5
[issue #64 ] Added All Pages representation.
2012-01-18 19:09:25 +04:00
8a1486664f
[issue #64 ] Fixed typo
2012-01-18 18:19:52 +04:00
4ba268dd67
Merge pull request #109 from warpc/18-commit_comments
...
18 commit comments
2012-01-18 05:49:57 -08:00
2522dd3c63
[issue #64 ] Added page history views.
2012-01-18 03:30:54 +04:00
51e9b5d1f6
[issue #64 ] Some changes in views and routes.
2012-01-18 02:28:59 +04:00
bbbf17c2b4
[refs #105 ] Merge master with 105-internationalization
2012-01-17 17:58:49 +04:00
726eddc40e
[refs #105 ] Add internationalization support to project
2012-01-17 15:48:40 +04:00
fab62c548f
Hide container_path if build_list published. Cleanup translations. Refs #100
2012-01-17 13:04:50 +02: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
62922c30a3
[issue #64 ] Added search partial.
2012-01-17 04:05:07 +04:00
52696791f2
[refs #54 , #94 ] Merge master into issues
2012-01-16 13:42:44 +04:00
794c55a030
Merge branch 'master' of github.com:warpc/rosa-build into 18-commit_comments
2012-01-13 22:01:30 +06:00
db0a66846b
[refs #94 ] Add new notifier rules. Fix some issues and comments bugs
2012-01-13 19:07:01 +04:00
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
73b710ae4e
[ close #76 ] Changed styles. Fixed bug with pagination.
2012-01-12 20:37:50 +04:00
636c90e6e4
[refs #18 ] add some I18n
2012-01-12 20:27:45 +06:00
2b8aca5f09
[refs #54 ] Add settings notifier
2012-01-11 17:58:13 +04:00
e8977a7d95
Merger issues with master
2011-12-30 18:23:16 +04:00
acb970686c
Apply auto_publish for build_lists. Apply publish build_list error status. Remove circle build info. Display auto_publish info. Fix bugs. Refactor. Apply specs for all build_lists core callbacks. Refs #72
2011-12-29 04:37:34 +02: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
d3ba83135e
[refs #54 ] Add some locales and interface fixes for issues
2011-12-27 17:18:25 +04:00
8face9208e
[refs #54 ] Add fixes and locales to subscribes
2011-12-27 16:35:31 +04:00
ce6746f7a9
[refs #54 ] Add subscribes and notifications
2011-12-26 19:48:57 +04:00
5237939f49
Merge issues with master
2011-12-26 13:26:13 +04:00
bf2f3d1bc7
[refs #54 ] Add issue statuses filters
2011-12-23 18:34:32 +04:00
a82f59f35a
Add route, action and statuses for publish_build. Apply status assign and check. Localize statuses. Convert tabs to spaces. Refs #80
2011-12-22 02:53:55 +02:00
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
a61d211862
Fix bugs. Change included_repos format. Refs #65
2011-12-21 20:59:19 +02:00
e588482f32
[ #74 ] Merge branch 'master' into 65-build_repo
...
Conflicts:
app/controllers/build_lists_controller.rb
app/controllers/projects_controller.rb
db/schema.rb
2011-12-21 20:13:57 +02:00
d901426b79
Move project build functinality to build_lists controller. Refactor downloads url - create model based methods for url genertion. Cleanup code. Add includeed_repos functionality. Display included_repos on build_list page. Refs #65
2011-12-21 16:01:50 +02:00
39dade9945
[ closed #63 ] Added user column to build_list.
2011-12-20 21:09:29 +04:00
375c98366f
[ref #54 ] Add has_issue settings to projec edit. Fix routes and friendly_id bug. Fix some moments
2011-12-20 20:57:34 +04:00
446cdac8e6
[refs #54 ] Add new locales. Fix routes. Fix issues and comments update
2011-12-20 14:20:00 +04:00
58cfe07124
[refs #56 ] Change project build page title
2011-12-16 11:59:34 +04:00
b3f422e713
[refs #32 ] Add user filter
2011-12-15 20:15:25 +04:00
1b3e473b94
[ closed #20 ] Changed adding collaborators to project
...
Changed collaborators page of project:
* Added form to input group and/or project nickname.
* In tables show only projects/groups that already added to project
2011-12-14 19:52:47 +04:00
2edf0ad172
Merge pull request #44 from warpc/tuning_monitoring_view
...
Tuning monitring view
2011-12-14 05:34:34 -08:00
7614d027a6
Reordered search by id and name;
...
Change localization for project_name_search.
Fix wrong label for field
2011-12-14 17:11:40 +04:00
9ab07c1675
Merge pull request #36 from warpc/platform_edit
...
Edit platform;
Added callback updates with new owner.
Added a button for call edit action;
Removed unnecessary to edit platform form field when you upgrade.
2011-12-14 03:15:41 -08:00
1d55e8758e
Merge pull request #26 from warpc/platform_admin_fixes
...
Fix autocomplete. Rsync stubs for development env. Blocked problematic validation for development env
2011-12-14 02:00:01 -08:00
4a723369a2
[refs #12 ] Add platform update options
2011-12-13 17:27:27 +04:00
24766d2383
Merge pull request #14 from warpc/group_members_change
...
Changed adding members to group.
2011-12-13 02:16:37 -08:00
842a74d000
#24 . Fix translation missing: ru.layout.build_lists.items.statuses.build_started
2011-12-12 21:03:13 +04:00
5815ef46ec
Merge pull request #25 from warpc/24-update_build_status
...
24 update build status
2011-12-12 07:54:33 -08:00
6a364b73a6
[refs #12 ] Fix platform admin relations. Locales correction. Add validationa and rsync stubs.
2011-12-12 18:10:39 +04:00
55c41ca306
Fix mistake in dependency_test_failed
2011-12-12 16:49:15 +04:00
cf18550cfb
#24 . Add new statuses and remove repetition
2011-12-12 16:34:20 +04:00
5c07046dac
[updated #16 ] Fixed localization fauldnames.
2011-12-11 22:50:55 +04:00
d2831da4b8
Issue #11 updated. Added check if user already added.
2011-12-10 21:26:57 +04:00
168e110169
[ close #11 ] Changed adding members to group.
2011-12-10 03:40:13 +04:00
5e3711505c
Merge pull request #5 from warpc/build_lists_filter
...
New build lists filter (search by name and bs_id)
2011-12-08 14:17:03 -08:00
0f855356ac
[refs #6 ] Add sudo mount fixes. Rename ID Admin fields into platform form
2011-12-09 00:41:01 +04:00
0ca7c5d451
Rename bs_id label and key. Stub XML RPC to raise exception and fix spec. Write specs for build_lists filters. Refs #2
2011-12-08 20:51:25 +02:00
8e97f4e23d
fixed #3 . Changed locale for Group.uname and User.uname
2011-12-08 20:13:11 +04:00
b89416e125
Add project name and bs_id filters for the build_lists list. Refactor and code cleanup to close #2
2011-12-08 00:46:01 +02:00
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
9cc820080b
Groups base functional.
2011-12-05 16:32:18 +04:00
96d4886f49
[refs #2249 ] Add new ACL relations
2011-12-01 18:20:24 +04:00
438bedd226
Add build all btn to platforms
2011-11-30 18:48:50 +04:00
4f46b82914
Fix bugs after renaming unixname to name. Refs #2261
2011-11-30 15:55:59 +02:00
3bc2ff894c
Improve and fix project fork functionality. Fix project create and validation. Add user role display. Add user role at user edit form. Refs #2261
2011-11-30 15:55:59 +02:00
0134f4adf9
Fix bugs after renaming unixname to name. Refs #2261
2011-11-30 01:41:12 +02:00
c4a31e3d29
Improve and fix project fork functionality. Fix project create and validation. Add user role display. Add user role at user edit form. Refs #2261
2011-11-29 23:42:58 +02:00
141fe7677f
Apply project fork button. Refactor and cleanup code. Refs #2243
2011-11-23 17:52:33 +02:00
ba77244b02
[refs #2249 ] Some rules and roles fixes
2011-11-22 23:21:31 +04:00
366ca320e0
Change and fix role assign logic and abilities. Other minor fixes. Refs #2261
2011-11-21 21:06:34 +02:00
44191926f7
[refs #2249 ] Some CanCan fixes. Add ru exception message
2011-11-19 15:49:14 +04:00
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
e7f9d8251a
Rename product field build to build_script. Change links. Refs #2161
2011-11-11 21:12:15 +02: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
8449b5b826
Add BuildList status validation. Change publish logic and btn icon
2011-11-11 14:38:17 +04:00
3e2e01deb6
Changed My Projects block
2011-11-03 01:39:50 +04:00
f5ba1b34f2
Fix repository and personal_repository - add_project add remove_project actions. Fix links. Refactor. Refs #2162
2011-11-02 23:37:19 +02:00
f8c0a3a8df
Update description to tar.bz2
2011-11-02 23:38:04 +04:00
1a0e235167
Add auto_build_lists destroy action. Fix auto_build process. Improve auto_build relations. Refs #2162
2011-11-02 21:18:43 +02:00
b048c54004
Added own projects sidebar
2011-11-02 20:22:42 +04:00
4341155771
[refs #2161 ] Change private users and personal repos menus
2011-11-02 16:43:41 +04:00
7b8df283eb
[refs #2161 ] Change regenerate logic for private_users
2011-11-02 14:42:08 +04:00
103cb16f27
Added form to set name of platfroms clone
2011-11-02 02:00:44 +04:00
4bda937075
[refs #2161 ] Catalogs fixes
2011-11-02 01:07:32 +04:00
8bec7d6a6b
[refs #2161 ] Change catalogs translate
2011-11-02 00:26:24 +04:00
9c06e35842
[refs #2161 ] Fix downloads message
2011-11-02 00:19:28 +04:00
92011e493b
[refs #2161 ] Add new titles to application
2011-11-02 00:18:52 +04:00
ee02bc7a4a
Fix category projects counter. Fix git blame links. Stub error when git commit diff is too big. Refs #2162
2011-11-01 20:13:08 +02:00
8b23d76a08
Added confirm_clone translation
2011-11-01 20:42:27 +04:00
e03d711d1b
[refs #2161 ] Global private users and repos fixes
2011-11-01 17:32:50 +04:00
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
de959bb527
[refs #2161 ] Add refresh option to statistics
2011-10-31 19:58:04 +04:00
afc1d492a8
Add events logging for platform change_visibility action. Improve autobuild events logging. Add events log for private access to hidden repositories. Change owner assign for platform and repository. Improve gitolite doc. Refactor. Refs #2162
2011-10-31 02:13:22 +02:00
b9ee6e365b
Added collaborators management.
2011-10-31 02:59:03 +04:00
4e9e418c66
[refs #2161 ] Fix some links and save method into personal repos
2011-10-31 00:03:41 +04:00
f54fc40cd9
Merge branch 'master' of github.com:warpc/rosa-build
2011-10-30 20:57:13 +04:00
0c3a044f81
Fix REXML Exception when using Unicorn or Passenger with XmlRPC. Add XML RPC events logging. Refactor. Improve after_rollback callback. Refs #2162
2011-10-30 18:46:52 +02:00
8f742b8b19
Fix missing: ru.activerecord.models.auto_build_list
2011-10-30 18:41:09 +04:00
bc23b9d44e
Add support build_canceled status
2011-10-30 17:47:18 +04:00
61408e74ef
[refs #2161 ] Small fixes of translates
2011-10-30 16:58:27 +04:00
12727a2149
[refs #2161 ] Add more roles. Fix visibility bug on personal repo page
2011-10-30 14:51:05 +04:00
30564e8e17
[refs #2161 ] Add auto build lists functional
2011-10-29 23:09:50 +04:00
b82320a4cd
Merge branch 'master' of github.com:warpc/rosa-build
2011-10-29 21:51:53 +04:00
3e12402245
Update status code for XML-RCP kernel
2011-10-29 21:50:47 +04:00
411e40267a
Added stub for add_collaborators action.
2011-10-29 19:56:44 +04:00
2a7a13000f
Added some translations.
2011-10-29 18:28:20 +04:00
8f3ffbe827
Merge branch 'master' of github.com:warpc/rosa-build
2011-10-29 18:06:22 +04:00
8c7b196764
Update BuildListItems for new requirement
2011-10-29 18:05:40 +04:00
512364be32
[refs #2161 ] Add get_status call
2011-10-29 17:38:17 +04:00
33ebe192c5
[refs #2161 ] Fix bpl and pl translates
2011-10-29 16:29:47 +04:00
3cb8d5c4c7
Fix group creation bug. Add builds_list to layout menu. Change login error notification. Refs #2162
2011-10-29 13:56:26 +03:00
b55a99adfa
Added showing of global_role to user list
2011-10-29 02:36:02 +04:00
5910c8c29b
Apply event logs for build list create, cancel, publish. Refs #2136
2011-10-29 01:31:47 +03:00
78f784cf1b
Remove visibility from Repository. Refs #2136
2011-10-29 00:03:30 +03:00
cdedcee801
Skip ACL for some actions. Log git hook to system events log. Fix build_list version format. Fix sidebar for build list display. Translate for ACL. Doc for project bootstrap. Refs #2136
2011-10-28 22:59:07 +03:00
87cdb88731
Added use_default and use_default_for_owner to roles
2011-10-27 22:09:22 +04:00
37c37f5cbd
Merge branch 'master' of github.com:warpc/rosa-build
2011-10-27 18:49:14 +04:00
89312375fd
Merge master and personal_repos
2011-10-27 17:13:53 +04:00
3114eb1ecc
[refs #2106 ] Add personal repos to project. Some changes of private repos controller and logic
2011-10-27 17:04:03 +04:00
d932999b8c
Fixed bug in determining visibility of object
2011-10-27 01:14:16 +04:00
0171a0a42a
Apply basic git repo functionality operation: add, change, destroy user ssh_key. Create, destroy, open/close project git repos. Calc project owner. Improve UI for users, groups and projects: fix links and routes, add actions refactor. Other minor fixes and refactoring. Add ssh_key uniqness check. Add uname uniqness check between User and Group. Check project owner ssh_key existance before project creation. Temporary disable uname and unixname change due to gitolite stranges. Refs #2136
2011-10-26 23:57:51 +03:00
02a8a62f36
Added dump to yml and load from yml abilities for roles.
2011-10-26 04:35:01 +04:00
9c182f0bda
Merge master and build_lists_queue
2011-10-24 14:40:36 +04:00
82d72a851c
ACL for testing.
2011-10-24 01:39:44 +04:00
5a5529ba3e
[refs #1832 ] Build list process fixes
2011-10-23 15:24:46 +04:00
d047e3f2b2
[refs #1832 ] Replace branches to tags in the project
2011-10-23 14:34:42 +04:00
c24a9fae1b
[refs #1832 ] Build Lists updates. Project updates and fixes.
2011-10-22 19:28:41 +04:00
310f588621
Resolve conflict with User nickname and uname
2011-10-21 20:17:49 +03: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
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
ff36b1fdd3
Merge branch 'itima_web_refactoring'
...
Conflicts:
Gemfile
Gemfile.lock
app/models/user.rb
app/views/layouts/application.html.haml
config/locales/ru.yml
config/routes.rb
db/schema.rb
2011-10-19 18:09:58 +04:00
ee9af32fa6
Adding projects to repositories.
2011-10-19 17:16:29 +04:00
5f17928423
[refs #1923 ] Add private repositories to project
2011-10-18 17:47:17 +04:00
6d065ea01c
Changed routes and added some translations
2011-10-17 18:24:45 +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
e672c20d3f
Some new translations
2011-10-17 00:49:55 +04:00
8103b14e15
[refs #1861 ] Add downloads statistics
2011-10-14 10:35:25 +04:00
0efa8c83a2
Fix nickname format check. Apply readonly nickname field. Show flash notice during registration through OpenID. Fix email read from OpenID response. Refs #1954
2011-10-13 13:19:42 +03:00
77e03df70b
Refactor gemfile and upgrade rails, devise and other gems, fix conflicts, remove deprecations. Implement user classic registration and registration through omniauth OpenId. Allow user enter correct nickname and change other info during registration through OpenId. Make login through nickname or email. Apply profile edit form. Dont ask current password for profile update. Fix layout and devise links. Refs #1954
2011-10-11 23:56:51 +03:00
02a9a46b60
Add publish function for BuildList
2011-09-15 21:56:20 +04:00
b25a174613
Clone confirm translation
2011-06-01 15:08:16 +04:00
3a7258ccdb
crontab generator: weekdays and months translations
2011-04-28 19:55:22 +04:00
e8b3769669
spacing in the locales file
2011-04-28 19:38:44 +04:00
d999e6e438
minor in crontab generator + more translations in crontab generator
2011-04-28 19:36:28 +04:00
315ede490e
Projects filter
2011-04-28 15:01:58 +04:00
babed29a53
Product deletion
2011-04-28 14:23:52 +04:00
4f29a63296
dedebug + ui fix
2011-04-22 20:13:47 +04:00
38cef4d887
Minor product fixes
2011-04-15 13:23:12 +04:00
577cb2e126
added platform cloning and system_wide flag
2011-04-14 21:04:32 +04:00
856b93d3d8
Product management. Step 2
2011-04-14 11:23:08 +04:00
231771890e
Confilict resolve
2011-04-11 20:57:43 +04:00
dce4e76da1
Product management. Step 1
2011-04-11 20:55:52 +04:00
1a6330956b
build list creation
2011-04-11 20:37:09 +04:00
82869f57a7
build list items and more statuses
2011-04-11 14:47:57 +04:00
62d0985fcb
more methods fot build lists, added is_circle build flag
2011-04-07 18:56:28 +04:00
4ac5931f44
fixes + build lists
2011-04-07 17:20:21 +04:00
5135f048a5
some views for git
2011-04-01 04:36:34 +04:00
4ed5c11335
added flash notices on destroy
2011-03-31 06:00:21 +04:00
a65bf7a4f8
new views for project
2011-03-31 05:56:20 +04:00
e40cdbd9d3
translations for the menu
2011-03-31 05:25:33 +04:00
81745019cf
new views for repositories
2011-03-31 05:15:17 +04:00
6f9683c686
added scope :recent to repository and show repositories on the platform page
2011-03-31 04:25:18 +04:00
309b037acf
Paul Irish BUY BUY oMG, Using AWESOME web-app-theme
2011-03-31 03:10:23 +04:00
43a93a419a
Translation fix
2011-03-30 22:36:04 +04:00
7c12f699aa
Always translate ALL models and their attributes
2011-03-30 22:14:02 +04:00
3b51d53225
freeze + spec
2011-03-17 17:47:16 +03:00
c18abc3801
translations for flash messages in platforms controller
2011-03-17 15:35:42 +03:00
8f5f1aa91d
creating git-repo when creating new project, showing empty repo
2011-03-15 14:24:45 +03:00
7896c4e7d3
Container model
2011-03-12 16:35:00 +03:00
92b7d101e8
Devise l10n
2011-03-11 19:38:39 +03:00
31e6d56475
L10n fix
2011-03-11 19:32:27 +03:00
ba117737b7
Basic navigation
2011-03-11 12:39:34 +03:00
0ff80b3e16
User management
2011-03-11 00:48:15 +03:00
eccb4e0a6c
Project/platform management
2011-03-10 16:38:50 +03:00
0a7c0e4e9b
Platforms list + UI enchancements
2011-03-10 14:35:46 +03:00
eae3c46912
Initial commit
2011-03-09 16:13:36 +03:00
konstantin.grabar
Alexander Machehin
George Vinogradov
Vladimir Sharshov
Pavel Chipiga
konstantin.grabar
Pasha
George Vinogradov
Alexey Nayden
Timothy N. Tsvetkov