Commit Graph

484 Commits

Author SHA1 Message Date
Alexander Machehin fab80d97eb [refs #194] project submenu partial 2012-02-15 22:32:26 +06:00
konstantin.grabar 00e2043f51 Change nginx log rotate period to 1 day 2012-02-15 14:37:27 +04:00
Pavel Chipiga 02478f5451 Merge branch 'master' into 96-upgrade_rails 2012-02-14 14:05:27 +02:00
Pavel Chipiga 7bca61c58d Fix cancan regsiter_requests specs. Temporary fix specs running bug through file rename. Refs #161 2012-02-14 13:50:01 +02: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
George Vinogradov 99c314fb11 [issue #133] Merge branch 'master' into 133-editing_from_web
Conflicts:
	db/schema.rb
2012-02-13 21:48:40 +04:00
Pavel Chipiga 704c544cbc Add more register_requests fields, change design. Apply invitation mail sending. Refactor. Refs #174 2012-02-10 18:33:16 +02:00
George Vinogradov d0fe7f55d5 [issue #174] added static pages and some changes 2012-02-10 02:57:43 +04:00
George Vinogradov ce39cdd04f [issue #174] A half of work to create invitations system 2012-02-09 21:46:23 +04:00
George Vinogradov 2160f3aa66 [issue #133] Added translations 2012-02-09 04:28:39 +04: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 74d401d087 [issue #133] Writed draft of web editing. 2012-02-08 21:51:30 +04:00
Alexander Machehin 70346f0015 [refs #151] refactoring 2012-02-06 20:12:33 +06:00
George Vinogradov f2bfcf8699 [issue #151] Probably fixed. 2012-02-05 00:12:37 +04:00
Vladimir Sharshov 72a6edd86b Fix missing localization[Refs #64, Refs #139] 2012-02-03 01:47:35 +04:00
Vladimir Sharshov 26923740ad Hot fix for en yml
Add new schema.rb
2012-02-03 01:30:08 +04:00
Vladimir Sharshov 06fa8f489f Return original translation 2012-02-03 01:14:41 +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 20613ba2c3 [refs #64] All pages: 2012-02-02 01:36:56 +06:00
Vladimir Sharshov 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
George Vinogradov d0717c8f9e [issue #64] Merge branch 'master' into 64-project_wiki
Conflicts:
	Gemfile.lock
	db/schema.rb
2012-02-01 22:39:04 +04:00
George Vinogradov b117ec1331 [issue #64] Yet another hacks. 2012-02-01 22:33:53 +04:00
Vladimir Sharshov 92a8e591de Merge pull request #142 from warpc/127-build-lists-filter-refactor
[Done #127] Reduced the query string for monitoring page
2012-02-01 10:18:11 -08:00
konstantin.grabar 502f06b65f [refs #127] Make route more short 2012-02-01 22:13:42 +04:00
konstantin.grabar 0559f1b678 [refs #127] Filter request refactor 2012-02-01 20:00:19 +04:00
Vladimir Sharshov 25bea5ae31 Update IP for iso build client 2012-02-01 14:54:58 +04:00
George Vinogradov 8733c4dc34 [issue #64] Some dirty hacks.
Diff for file with russian name don't work yet.
2012-02-01 03:20:42 +04:00
George Vinogradov 6f78e5456c [issue #64] Changes for ruby 1.9.3 compatibility. 2012-01-31 20:40:46 +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
Pavel Chipiga 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
George Vinogradov 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
Alexander Machehin 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
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
George Vinogradov 706c052a5e [issue #64] User names are clickable. 2012-01-29 22:03:42 +04:00
George Vinogradov 12ceace1f1 [issue #64] Fixed some localization typos. 2012-01-28 16:15:09 +04:00
George Vinogradov acdd1f22b6 [issue #64] Fixed bug with revert all wiki. 2012-01-28 16:10:43 +04:00
Pavel Chipiga 205320c200 Fix log path. Refs #112 2012-01-28 05:09:39 +02:00
Pavel Chipiga 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
Pavel Chipiga 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
Vladimir Sharshov 0c0e131c98 Add pid path for new relic monitoring service 2012-01-28 03:06:08 +04:00
Vladimir Sharshov 09e5a1e4d6 Add NewRelic monitoring to autostart and watching 2012-01-28 02:56:52 +04:00
George Vinogradov 9caf496454 [issue #64] Added missing translations. 2012-01-27 20:48:48 +04:00
Vladimir Sharshov e966e523e9 Merge pull request #132 from warpc/112-sync_projects
Auto sync for mandriva repo

* 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
2012-01-27 08:46:58 -08:00
Pavel Chipiga 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
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 eed3040944 [issue #64] Changed validation message and removed unnecessary
validation of projects owner.
2012-01-27 10:13:56 +04:00
George Vinogradov 2d1e36fb1a [issue #64] Changed own_projects validation. 2012-01-27 04:16:07 +04:00
Alexander Machehin e71a9e84cb [refs #114] emails control 2012-01-27 02:11:07 +06:00
Vladimir Sharshov c529e63c96 Merge pull request #122 from warpc/105-internationalization
[refs #105] Fix devise translations
2012-01-26 08:06:34 -08: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
Vladimir Sharshov 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
Vladimir Sharshov 9e8c8efc80 Merge pull request #125 from warpc/124-fix-device-locale
[refs #124] Add missing translation
2012-01-24 12:59:49 -08:00
George Vinogradov 45877e8b5c [issue #64] Bug fix & views refactoring
*  Fixed bug with history
*  Navigation moved to partial.
2012-01-25 00:47:55 +04:00
Pavel Chipiga bdb31b4e13 Fix locale. Refs #31 2012-01-24 22:42:16 +02:00
Pavel Chipiga 3f4bf65825 Upgrade paperclip. Apply srpm_import script and UI. Fix specs. Refs #31 2012-01-24 22:35:36 +02:00
Alexander Machehin 61be317b21 [refs #114] i18n 2012-01-25 01:00:51 +06:00
Alexander Machehin 0f06d4f627 [refs #124] Add missing translation 2012-01-25 00:18:16 +06:00
Vladimir Sharshov 2a20b51c19 Fix deploy: "DJ does not restart and create many new instances" 2012-01-24 02:24:12 +04:00
Alexander Machehin 9127b6b689 [refs #114] changed logics 2012-01-24 01:42:54 +06:00
Vladimir Sharshov c3f415e90c Add new build status for Item 2012-01-23 22:11:53 +04:00
George Vinogradov 230c25eefd [issue #64] Some changes.
*  WikiController#compare splitted into WikiController#compare
   and WikiController#compate_wiki
*  Show only last 30 versions in history.
2012-01-23 16:45:38 +04:00
Vladimir Sharshov 7d2d080af5 Fix localization [ Refs #105 ] 2012-01-23 16:11:17 +04:00
Alexander Machehin 06a977ea21 Merge branch 'master' into 114-comment_notifications 2012-01-20 22:03:04 +06:00
George Vinogradov 23573a1a07 [issue #64] Added creation wiki to project. 2012-01-20 19:10:30 +04:00
George Vinogradov 011efb0c4b [issue #64] Added git access to Wiki. 2012-01-20 19:01:59 +04:00
konstantin.grabar e3a716b7db [refs #105] Fix some translations 2012-01-20 15:29:32 +04:00
George Vinogradov 364f2e40c0 [issue #64] Added Wiki history, compare, revert. 2012-01-20 03:25:15 +04:00
Vladimir Sharshov 59c7faf5c1 Fix localization file (here was dragons!) 2012-01-20 02:07:42 +04:00
Vladimir Sharshov 25bd2cd13d Fix for localization files 2012-01-20 00:33:28 +04:00
Vladimir Sharshov 3206258f7b Change default locale to English 2012-01-20 00:06:43 +04:00
Vladimir Sharshov a5c2bcdd85 Fix email host address 2012-01-20 00:06:09 +04:00
Pavel Chipiga b5f0124f91 Add pids symlink generation task. Refs #110 2012-01-19 21:21:15 +02:00
Alexander Machehin 800b02f544 [refs #18] Add project subsribe, tests 2012-01-20 00:20:03 +06:00
Vladimir Sharshov 5a6f5b51c0 Upgrade capistrano receipts:
* add application env files;
* remove unused ui deploy;
* clear main deploy config.
2012-01-19 20:20:30 +04:00
George Vinogradov 54bc26d960 [issue #64] Added translations. 2012-01-19 18:37:36 +04:00
George Vinogradov 0c527af291 [issue #64] Added revisions comparsion. 2012-01-19 17:49:32 +04:00
George Vinogradov 538e3da8c8 [issue #64] Added search through wiki 2012-01-19 16:10:50 +04:00
George Vinogradov 022a013b79 [issue #64] Added Wiki seeding on create. 2012-01-19 16:06:27 +04:00
Alexander Machehin 3994abd6ed [refs #105] fix 2012-01-19 15:53:19 +06:00
Vladimir Sharshov 14fdc35eb9 Add english localization. Refs #105 2012-01-19 13:34:05 +04:00
Alexander Machehin 71447a29e3 [refs #114] add settings for commits notifications 2012-01-19 00:20:08 +06:00
George Vinogradov 2af0135fb5 [issue #64] Added All Pages representation. 2012-01-18 19:09:25 +04:00
George Vinogradov 8a1486664f [issue #64] Fixed typo 2012-01-18 18:19:52 +04:00
Pasha 4ba268dd67 Merge pull request #109 from warpc/18-commit_comments
18 commit comments
2012-01-18 05:49:57 -08:00
George Vinogradov 2522dd3c63 [issue #64] Added page history views. 2012-01-18 03:30:54 +04:00
George Vinogradov 51e9b5d1f6 [issue #64] Some changes in views and routes. 2012-01-18 02:28:59 +04:00
konstantin.grabar bbbf17c2b4 [refs #105] Merge master with 105-internationalization 2012-01-17 17:58:49 +04:00
konstantin.grabar 726eddc40e [refs #105] Add internationalization support to project 2012-01-17 15:48:40 +04:00
Pavel Chipiga fab62c548f Hide container_path if build_list published. Cleanup translations. Refs #100 2012-01-17 13:04:50 +02:00
Alexander Machehin 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
George Vinogradov 62922c30a3 [issue #64] Added search partial. 2012-01-17 04:05:07 +04: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
konstantin.grabar 52696791f2 [refs #54, #94] Merge master into issues 2012-01-16 13:42:44 +04:00
Alexander Machehin 794c55a030 Merge branch 'master' of github.com:warpc/rosa-build into 18-commit_comments 2012-01-13 22:01:30 +06:00