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
Pavel Chipiga
konstantin.grabar
Alexander Machehin
Vladimir Sharshov
George Vinogradov
Pasha