dfa361f5c3
[refs #194 ] fix triggering change event for niceRadio buttons
2012-03-02 23:45:20 +06:00
c7b412c0e0
[refs #194 ] some refactoring
2012-03-02 23:38:00 +06: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
41c0d1e856
[refs #194 ] fix security and tests
2012-03-02 22:52:15 +06:00
b3750f8644
[issue #195 ] Fixed branch selector.
2012-03-02 20:48:19 +04:00
7b37846a54
[issue #195 ] Fixed line numbering with files contains <>
2012-03-02 19:50:17 +04:00
50fc094bce
[refs #228 ] fuuuuu...
2012-03-02 21:32:00 +06: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
8677fa7493
[refs #232 ] Remove name field
2012-03-02 14:39:48 +04:00
3369953b4c
[refs #232 ] Remove unused commented code from groups controller
2012-03-02 13:46:16 +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
4218006f47
[issue #195 ] Returned code highlighting.
2012-03-02 05:10:39 +04:00
6cfb5d0c3d
[issue #195 ] Fixed bug with encodings. Added avatar. Stubbed blame.
2012-03-02 04:39:43 +04:00
e66f0110fc
Merge branch '3.2-master' into 195-new_design_for_projects
...
Conflicts:
app/assets/javascripts/extra/syntax.highlighter-init.js
app/assets/stylesheets/design/common.scss
vendor/assets/stylesheets/vendor.scss
2012-03-02 02:12:11 +02:00
900c1fe2f5
[issue #195 ] Fixes.
...
* Fixed translations
* Fixed blob display
* Fixed routes
2012-03-02 02:07:04 +02:00
accf38a088
Fix build_list display width. Refs #223
2012-03-02 02:04:07 +02:00
b1ea9fe57f
Upgrade gems. Hide uncancelable and unpublishable lins. Add duplicate build_list search link. Fix build_list display. Refs #223
2012-03-02 02:04:07 +02:00
cea7bc79bb
[refs #194 ] fix notification line style
2012-03-02 02:04:06 +02: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
de177f1d03
[refs #194 ] add space between list and create form
2012-03-02 02:04:05 +02:00
c30cd83c33
[refs #194 ] add default scope for comments
2012-03-02 02:04:05 +02:00
3aae663811
[refs #194 ] add comments to issues
2012-03-02 02:04:05 +02:00
790ea38ba6
[refs 194] fix comments
2012-03-02 02:04:04 +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
84a7a9fe2d
Fix build_list display width. Refs #223
2012-03-02 01:37:05 +02:00
c177662e41
Upgrade gems. Hide uncancelable and unpublishable lins. Add duplicate build_list search link. Fix build_list display. Refs #223
2012-03-02 01:26:42 +02:00
318dc72d29
[issue #195 ] Fixes.
...
* Added border to gutter in file preview
* Added "empty repo" message
* Fixed one of bugs with tree/branch selector
2012-03-02 02:23:53 +04:00
43c10ee812
[issue #195 ] Fixed long comments displaying.
2012-03-02 00:33:48 +04:00
9e11a20f71
Merge pull request #249 from warpc/230-registration_page
...
[refs #230 ] Edit password page
2012-03-01 11:43:53 -08:00
2f0981c12f
[refs #194 ] fix notification line style
2012-03-02 01:33:22 +06:00
b0b53edf48
[refs #230 ] shorter error messages
2012-03-02 01:16:50 +06:00
4931dc773b
[refs #230 ] edit password page
2012-03-02 01:16:49 +06:00
b8b68e8ad2
[refs #194 ] add space between list and create form
2012-03-02 01:11:21 +06:00
56b9371ee2
[refs #194 ] add default scope for comments
2012-03-02 01:10:12 +06:00
ecc2e1f181
[refs #194 ] add comments to issues
2012-03-02 00:57:59 +06:00
20417241a8
[refs 194] fix comments
2012-03-02 00:57:59 +06:00
4b024d1728
[issue #195 ] Fixes.
...
* Fixed translations
* Fixed blob display
* Fixed routes
2012-03-01 21:37:24 +04:00
7d112d0524
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-01 19:33:46 +02:00
eb689b7f18
[refs #232 ] Add new design and logic refactor for group members action
2012-03-01 19:41:40 +04:00
fc3d4c0b6d
[refs #232 ] Add group members edit page design
2012-03-01 18:23:26 +04:00
6eb239385a
[issue #195 ] Fixed bug with creating project
2012-03-01 17:37:35 +04:00
71748ebddc
[refs #232 ] Add design to group new page
2012-03-01 17:19:58 +04:00
f4a50b509c
[refs #232 ] Add edit btn to group public page
2012-03-01 16:37:54 +04:00
157f9a1a68
[refs #232 ] Add sidebar and group edit page
2012-03-01 16:28:38 +04:00
55ff2c7f6b
[refs #195 ] Change new project route and some other changes
2012-03-01 16:10:12 +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
dedd64f976
[issue #195 ] Returned lost files.
2012-03-01 03:29:16 +04:00
bcef305228
[refs #230 ] change title style; remove unused js
2012-03-01 02:19:39 +06:00
cadd1995d1
[refs #230 ] fix forgot password SignUp style
2012-03-01 01:50:08 +06: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
4fd518ac86
Merge pull request #242 from warpc/195-new_design_for_projects
...
[Refs #195 ]
* Add default value to is_rpm field for projects
* Show tab for wiki, tracker or build only if they activate
2012-02-29 11:04:19 -08:00
5f71d430fc
[refs #230 ] remove wrong js
2012-03-01 00:48:13 +06:00
aea631824f
[refs #230 ] remove debug messages
2012-03-01 00:39:12 +06:00
3a10ed91b2
[refs #194 ] more uniq
2012-03-01 00:33:01 +06:00
5b25ea221b
[refs #195 ] Add default value to is_rpm field for projects
2012-02-29 22:27:57 +04:00
fe0eba8e61
[refs #194 ] fix index page
2012-03-01 00:23:19 +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
c3d7221f97
[issue #195 ] Fixed bugs
...
* Highlighting in submenu
* File history
2012-02-29 21:53:14 +04:00
bc75b318ce
[refs #195 ] Merge 3.2-master into 195-new_design_for_projects
2012-02-29 21:37:28 +04:00
3415c6eb9f
Merge branch '3.2-master' into 230-registration_page
2012-02-29 23:25:24 +06:00
6e8b48188e
Merge pull request #229 from warpc/228-sign_in
...
[Refs #228 ] sign in
2012-02-29 09:22:42 -08: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
f4954557b3
[refs #228 ] fix showing error
2012-02-29 22:59:08 +06:00
ee84ac84cf
[refs #228 ] fix I18n
2012-02-29 22:59:08 +06:00
71d9079003
[refs #228 ] fix registration link
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
05eac4918f
Fix NoMethodError: undefined method `default_order' for ActiveRecord::Relation
2012-02-29 19:10:01 +04:00
662ea4018c
[issue #195 ] Changed commit header on commit page.
2012-02-29 19:08:21 +04:00
19dd58800b
[issue #195 ] Added comments to commit.
2012-02-29 19:05:36 +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
b20c533e6b
[Refs #221 ] Fix xml-rpc call
2012-02-29 16:00:02 +04:00
2e16d3c4ee
Merge pull request #237 from warpc/221-delete_product_build_list
...
[Refs #221 ] delete product build list
2012-02-29 03:25:25 -08:00
02cbec8d86
[Refs #221 ] Add xml-rpc call for iso container destroy
2012-02-29 15:15:49 +04:00
062b5c71b1
[Refs #221 ] Fix right for platform local admin
2012-02-29 15:13:56 +04:00
97c9eab3be
[ Fix #236 ] Add application/octet-stream content type for tar.bz2 product attachment
2012-02-29 13:41:42 +04:00
89a5cf56b2
[refs #228 ] fix submit button style
2012-02-29 15:23:59 +06:00
952082f7a0
[ Fix #235 ] Remove wrong clone_platform_product_path url
2012-02-29 13:15:12 +04:00
ad7be07f2f
[refs #228 ] fix showing error
2012-02-29 12:51:10 +06:00
c9067da374
[refs #233 ] fix users menu toggle
2012-02-29 12:40:21 +06:00
8126b49567
[refs #228 ] fix I18n
2012-02-29 11:43:40 +06:00
c55d6d097e
[refs #228 ] fix registration link
2012-02-29 10:41:25 +06: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
b586c5ddf0
[refs #195 ] Add js hack for sections bigpadding div class
2012-02-29 01:17:04 +04:00
2ec2548390
[refs #195 ] Add base design and functional to project members page
2012-02-29 01:01:25 +04:00
91eb306560
[refs #228 ] sign_in page
2012-02-29 02:43:17 +06:00
577eadbc7c
[refs #195 ] Fix project form submit tag
2012-02-29 00:12:37 +04:00
fa69cd8ee4
[refs #195 ] Fix radio and checkboxes script. Fix project edit and new form
2012-02-28 23:11:08 +04:00
2cb085992b
[refs #194 ] fix submenu for issues
2012-02-28 22:41:03 +06:00
e83e19ea50
[refs #194 ] remove duplicates
2012-02-28 22:36:29 +06:00
c4719f12da
[refs #194 ] some change in the issue managing
2012-02-28 22:33:38 +06:00
895b095058
Merge branch '3.2-master' into 194-tracker
...
Conflicts:
app/assets/stylesheets/custom.scss
app/assets/stylesheets/main.scss
2012-02-28 22:31:00 +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
06795a56be
[refs #195 ] Add sections action ability for projects
2012-02-28 19:44:16 +04:00
2f39b050ae
Merge branch 'master' into 3.2-master
...
Conflicts:
config/deploy.rb
2012-02-28 17:44:11 +02:00
99e3bbb762
[refs #194 ] update issue content
2012-02-28 21:41:47 +06:00
07b081cc0d
Fresh up assets. Force production SSL. Refs #223
2012-02-28 17:40:22 +02:00
7a93239e35
Merge pull request #227 from warpc/193-new_design_for_wiki
...
[refs #193 ] Fix wrap gollum and wiki page styles
2012-02-28 07:25:28 -08:00
f9c834cf4d
Revert "[refs #194 ] return main.scss"
...
This reverts commit 0b8461a5df9f3d9bbca6e3b377164ff4aa4ac4e6.
2012-02-28 20:56:43 +06:00
5abdbd4486
[refs #194 ] return main.scss
2012-02-28 20:37:30 +06:00
39b0beb3ab
[refs #193 ] Fix wrap gollum and wiki page styles
2012-02-28 18:36:04 +04:00
0abea8ff55
[refs #194 ] fix issues count
2012-02-28 20:28:11 +06: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
7d56267e03
[ Fix #224 ] Alphabetic order category list
2012-02-28 14:35:17 +04:00
66a08662c2
[refs #194 ] new styles; some changes
2012-02-28 15:23:27 +06:00
03663a8ed7
[refs #195 ] Add sections page and method to projects
2012-02-28 12:00:56 +04:00
e004822bd3
Remove/replace old assets to avoid production bugs. Fix deploy settings.
2012-02-28 01:16:14 +02: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
7508bb1339
Fix bugs to force new design work. Minor refactor and improvements. Refs #193
2012-02-27 20:58:37 +02:00
2c0e1b6314
Merge branch '3.2-master' into 194-tracker
...
Conflicts:
app/assets/stylesheets/custom.scss
2012-02-27 23:55:18 +06: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
e1f7817624
Add local admin ability to build product. Fix template links. Refactor. Refs #217
2012-02-27 15:49:24 +02:00
72fec3b314
[refs #195 ] Add owner choose on project create
2012-02-27 13:03:28 +04:00
1dd20377cf
Fix layout. Refs #193
2012-02-24 23:54:44 +02:00
4d2459c60c
Refactor, fix and cleanup wiki templates and translations. Refs #193
2012-02-24 23:39:40 +02:00
3c83649627
[issue #96 ] Some fixes in layout and scripts.
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
46a5ab1c76
Merge branch 'master' into 123-activity-feed
...
Conflicts:
config/deploy.rb
db/schema.rb
2012-02-24 20:44:36 +04:00
586d4e0bea
Fixed bug with Windows line endings in blob editing.
2012-02-24 20:34:41 +04:00
3c8f1c062b
Fix ActivityFeed for user, remove info about password [Refs #207 ]
2012-02-24 20:33:00 +04:00
3685eafe57
Remove unused code [Refs #207 ]
2012-02-24 19:35:29 +04:00
51e2c85b0a
Fix build_for settings. Refs #207
2012-02-24 19:28:01 +04:00
165a8dd6f4
Build only main repo. Refs #207
2012-02-24 19:28:01 +04:00
15f78e30a0
Redo platform build_all with sleep and errors rescue. Refs #207
2012-02-24 19:28:00 +04:00
07093c0d1d
Create directory for platform before clone. Fix created directory permissions. Increase timeout during XML RPC clone. Switch off cascade XML RPC requests during platform destroy. Refs #207
2012-02-24 19:28:00 +04:00
9015b971aa
Redo clone logic. Split clone process for repositories. Optimize and refactor. Refs #207
2012-02-24 19:28:00 +04:00
069c226110
Place platform destroy to background. Redo clone process to 2 phases - base_clone and relations_clone. Place relations clone and XML RPC to background. Remove unneeded validations. Refactor xml_rpc_clone. Refs #207
2012-02-24 19:28:00 +04:00
7c273c022b
Remove raise. Refs #207
2012-02-24 19:27:59 +04:00
600df031f5
Refactor platform clone controller and routes. Refactor and fix clone process for platform, repository, product. Place XML RPC clone request to DJ. Refs #207
2012-02-24 19:27:59 +04: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
30f47a1748
[refs #134 ] lost env!
2012-02-24 19:27:57 +04:00
a809a4c116
[refs #134 ] fixed bug with new project
2012-02-24 19:27:57 +04:00
f7b496bb39
Some fixes:
...
* Changed default visibility to personal platforms to 'open'
* Changed 'Erase' button to simple link in comments partial
* Probably added domain name to links in mail notifications
* Fixed protocol in repo links form 'http' to 'https'
2012-02-24 19:27:56 +04:00
41861185c0
[refs #134 ] fixed git hook
2012-02-24 19:27:56 +04:00
5986cd6dde
[issue #64 ] Removed debug methods and unnecessary comments.
2012-02-24 19:27:55 +04:00
bab3a90155
Apply approved and rejected filters for register requests. Tune abilities. Link to user profile if user have already registered. Refs #174
2012-02-24 19:27:55 +04:00
43c896021e
[issue #64 ] Added possibility to diff and revert last commit
2012-02-24 19:27:55 +04:00
1bc4efcdc4
[issue #64 ] Fixed encodings bugs
2012-02-24 19:27:54 +04:00
bda978a306
Fix bug with group autocomplete. Do not delete during rsync
2012-02-24 17:27:49 +02:00
3c5cdfd5e4
[refs #195 ] Add is_rpm field to projects. Continue set new design
2012-02-24 17:05:58 +04:00
28e2494e14
[refs #123 ] Remove stubs controller
2012-02-24 15:26:50 +04:00
dde34cdffb
Fix build_for settings. Refs #207
2012-02-23 22:20:44 +02:00
86c717dee5
Build only main repo. Refs #207
2012-02-23 21:06:28 +02:00
66fc31e404
Redo platform build_all with sleep and errors rescue. Refs #207
2012-02-23 20:32:56 +02:00
a6a51225b8
[refs #194 ] some js refactoring
2012-02-23 22:16:04 +06: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
b192ebdcea
Create directory for platform before clone. Fix created directory permissions. Increase timeout during XML RPC clone. Switch off cascade XML RPC requests during platform destroy. Refs #207
2012-02-23 00:57:43 +02:00
6fe88ed69d
[issue #195 ] Merge branch '195-new_design_for_projects' of github.com:warpc/rosa-build into 195-new_design_for_projects
...
Conflicts:
app/presenters/git_presenters/commit_as_message_presenter.rb
2012-02-23 02:16:20 +04:00
43b7ccd3dc
[issue #195 ] Added blob show. Some changes.
2012-02-23 02:11:55 +04:00
9eb191da7b
Redo clone logic. Split clone process for repositories. Optimize and refactor. Refs #207
2012-02-22 22:24:29 +02:00
ba1798fd71
[refs #195 ] Add design to form and edit page
2012-02-22 21:48:37 +04:00
8f4c207545
Place platform destroy to background. Redo clone process to 2 phases - base_clone and relations_clone. Place relations clone and XML RPC to background. Remove unneeded validations. Refactor xml_rpc_clone. Refs #207
2012-02-22 14:35:40 +02:00
5829ab87e9
Remove raise. Refs #207
2012-02-21 23:43:06 +02:00
5b29de93af
Refactor platform clone controller and routes. Refactor and fix clone process for platform, repository, product. Place XML RPC clone request to DJ. Refs #207
2012-02-21 23:27:11 +02:00
ecb29d1762
[refs #194 ] tags -> labels
2012-02-22 02:28:04 +06:00
3a48f8dea9
[refs #193 ] Add lost file with wiki_history checkboxes script
2012-02-21 20:11:16 +04:00
328cd17f46
[issue #195 ] Fixed bug in CommitPresenter
2012-02-21 19:51:48 +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
81393d7f5b
[refs #193 ] Disable more than 2 versions for wiki diff by js
2012-02-21 16:42:09 +04:00
9b610eb920
[refs #193 ] Fixed old commented code from old template versions. Fix diff page
2012-02-21 14:49:06 +04: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
5dcc4eabf8
[refs #194 ] tracker without tags manage
2012-02-20 22:54:45 +06:00
2bdcdb6fd3
[refs #193 ] Fix compare buttons and links design
2012-02-20 14:27:58 +04:00
f22d9809ff
[refs #193 ] Remove debug puts from wiki controller
2012-02-20 14:02:04 +04:00
76beb6a277
[refs #194 ] add creator to issue
2012-02-19 23:28:43 +06:00
43a268371f
[issue #203 ] Some changes in ApplicationPresenter
2012-02-19 03:21:34 +04: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
d9025b093f
[refs #193 ] Compare routes repair and compare design
2012-02-17 18:12:05 +04:00
4bdc763ef0
Merge branch '3.2-master' into 195-new_design_for_projects
2012-02-17 18:02:43 +04:00
7863869a30
[refs# 193] Move some gollum style to docs/gollum. Add new styles to edit and new pages
2012-02-17 16:47:33 +04:00
d8a3983b07
[refs #193 ] Add new design to wiki
2012-02-17 15:13:54 +04:00
608faf3564
[issue #96 ] Some fixes in layout and scripts.
2012-02-17 03:07:22 +04:00
a5375c369c
[refs #134 ] lost env!
2012-02-16 22:29:41 +06:00
4888993c3f
[refs #134 ] fixed bug with new project
2012-02-16 21:08:08 +06:00
98059d6570
Merge pull request #191 from warpc/134-git-hook
...
[refs #134 ] Fixed git hook (hadr-coded desctionation and wrong rails env)
2012-02-16 05:52:09 -08:00
c140c1b466
Merge branch '194-project_submenu' into 193-new_design_for_wiki
2012-02-16 12:23:41 +04: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
5dac20bac5
Some fixes:
...
* Changed default visibility to personal platforms to 'open'
* Changed 'Erase' button to simple link in comments partial
* Probably added domain name to links in mail notifications
* Fixed protocol in repo links form 'http' to 'https'
2012-02-15 20:30:56 +04:00
0763936e38
[refs #193 ] Wiki navigation design
2012-02-15 19:01:49 +04:00
eaa6a46a43
[refs #96 ] fixed commit subscribing
2012-02-15 19:07:56 +06:00
20836e8864
[refs #134 ] fixed git hook
2012-02-15 17:12:49 +06:00
90c1250769
Merge pull request #186 from warpc/64-project_wiki
...
[Refs #64 ] - Fix diff for russians pages, add ability to revert last commit
2012-02-15 01:44:41 -08:00
5b7d1a79d0
[issue #64 ] Removed debug methods and unnecessary comments.
2012-02-15 02:13:52 +04:00
da0d791f74
[refs #96 ] fixed commentable & subscribeable ids
2012-02-15 02:28:01 +06:00
2c493cdbb7
Apply approved and rejected filters for register requests. Tune abilities. Link to user profile if user have already registered. Refs #174
2012-02-14 20:15:52 +02:00
101fa63514
Small ActivityFeed refactoring
2012-02-14 20:46:08 +04:00
08ffd8c25d
[refs #123 ] Add wiki to ActivityFeed
2012-02-14 20:09:41 +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
e9c5273136
[issue #64 ] Added possibility to diff and revert last commit
2012-02-14 18:54:44 +04:00
85723f7da6
[issue #64 ] Fixed encodings bugs
2012-02-14 18:54:18 +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
99ee490e94
[issue #64 ] Added callback for notifications + some minor changes
2012-02-14 03:30:17 +04:00
159bf21810
Merge branch 'master' into 64-project_wiki
2012-02-14 02:29:32 +04:00
141a078cce
Merge pull request #175 from warpc/133-editing_from_web
...
[Refs #133 ] Edit files in git-repo with web editor
2012-02-13 13:07:55 -08:00
4dcc39975d
[issue #133 ] Fixed redirection bugs
2012-02-13 23:04:41 +04:00
2ca69df1cd
Merge pull request #165 from warpc/150-acl-collaborators
...
[Fix #150 ] Disable edit and update action for non-admin collaborators in projects.
2012-02-13 10:49:01 -08:00
c26962c216
[issue #133 ] Added redirects if cannot find Blob object
2012-02-13 22:45:45 +04:00
e4da6057a5
[issue #64 ] Changed authorization filters
2012-02-13 22:28:43 +04:00
99c314fb11
[issue #133 ] Merge branch 'master' into 133-editing_from_web
...
Conflicts:
db/schema.rb
2012-02-13 21:48:40 +04:00
2350993120
Merge pull request #182 from warpc/171-build_list_tab_acl_fix
...
[fix #171 ] Added ACL calls to project navigation
2012-02-13 09:24:04 -08:00
c6f9995b98
Add GA code to layouts and invite pages. Do not track admins. Refs #183
2012-02-13 18:42:11 +02:00
50d27ad34d
[issue #171 ] Added ACL calls to project navigation.
2012-02-13 20:16:50 +04:00
8c0cd29f0e
[issue #133 ] Fixed bug with no acl on editing blobs
2012-02-13 19:21:00 +04:00
391716fee5
[refs #133 ] Fix syntax error into blob template
2012-02-13 14:43:57 +04:00
1356ffa437
[refs #178 ] Fix project create error with group owner
2012-02-13 14:23:20 +04:00
9271c15a5f
[refs #123 ] Add new commits support
2012-02-10 21:33:05 +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
8417e8c16f
[issue #174 ] multiupdate in admin view.
2012-02-10 15:18:40 +04:00
a17f548168
[issue #174 ] Fixed bugs
2012-02-10 14:04:15 +04:00
e535ca2b64
Fix validations. Refs #174
2012-02-10 01:33:06 +02:00
d0fe7f55d5
[issue #174 ] added static pages and some changes
2012-02-10 02:57:43 +04:00
f9e7f3fb06
[issue #174 ] Devise hacks
2012-02-10 01:45:26 +04:00
edef21068d
[issue #174 ] Fixed bug with RegisterRequest
2012-02-10 01:44:47 +04: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
ffe2608c32
[issue #133 ] Some makeup and a lot of encodings magic
2012-02-09 04:27:26 +04:00
e23a02d357
[issue #133 ] Some fixes in Git::Repository#update_file
2012-02-09 04:03:40 +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
d44a274c77
[issue #133 ] Fixed bug and added comments
2012-02-09 00:56:18 +04:00
e9f3b79bd2
Merge pull request #176 from warpc/169-fix_create_build_list
...
[refs #169 ] fix creating build list for empty build version
2012-02-08 10:21:40 -08:00
74d401d087
[issue #133 ] Writed draft of web editing.
2012-02-08 21:51:30 +04:00
02217752af
[refs #169 ] fix creating build list on empty repository
2012-02-08 17:07:16 +06:00
c47db56270
[refs #168 ] can read repos in the open platform
2012-02-07 19:55:45 +06:00
325667dde0
[refs #168 ] removed wrong ability
2012-02-07 17:31:00 +06:00
ff6c855234
Merge pull request #170 from warpc/155-fix_render_event_logs
...
[refs #155 ] fix render event logs
2012-02-07 01:35:21 -08:00
86704bc39d
[refs #155 ] fix render event logs
2012-02-07 15:31:07 +06:00
a1fcc62768
Merge pull request #167 from warpc/143-fix-destroy-group
...
[Fixs #143 ] Group dooes not destroy personal platfrom when deleting
2012-02-07 00:02:13 -08:00
36f609ec7d
[refs #143 ] fix destroy
2012-02-07 01:47:39 +06:00
96d3b35bdf
[refs #123 ] Merge master into 123-activity-feed
2012-02-06 19:46:32 +04:00
4e3d6b4056
Show xml-rpc error code in error message
2012-02-06 19:07:08 +04:00
c367fc818b
Merge branch 'master' of github.com:warpc/rosa-build
2012-02-06 19:05:50 +04:00
a83d64eaab
[refs #150 ] Fix collaborators cancan authorize
2012-02-06 19:04:56 +04:00
70346f0015
[refs #151 ] refactoring
2012-02-06 20:12:33 +06:00
a79a081fd1
Merge branch 'master' into 151-grit_encodings_problems
2012-02-06 19:55:59 +06:00
60ec9867bb
[refs #163 ] fix commits list
2012-02-06 18:58:45 +06:00
fde67a2c22
[refs #134 ] add post receive hook to repos
2012-02-06 15:31:22 +06:00
427fc670ac
Merge branch 'master' of github.com:warpc/rosa-build
2012-02-06 11:57:09 +04:00
f2bfcf8699
[issue #151 ] Probably fixed.
2012-02-05 00:12:37 +04:00
0591ba4378
[ fix #158 ] Fixed bug with render in BlobController#raw
2012-02-04 22:03:29 +04:00
28da24d020
Merge branch 'master' of github.com:warpc/rosa-build
2012-02-03 19:49:56 +04:00
87abfb4352
[refs #64 ] fixed forbidden redirection after signin
2012-02-03 21:28:19 +06:00
85c0d8b827
Change git branch for mass rebuild
2012-02-03 18:32:04 +04:00
b0d0b21ec4
[refs #144 ] fix template
2012-02-03 19:40:47 +06:00
549fc242d8
[issue #64 ] Fixed bug in _history partial
2012-02-03 04:23:29 +04:00
a2f07fad10
Merge branch '64-project_wiki' of github.com:warpc/rosa-build into 64-project_wiki
2012-02-03 04:05:18 +04:00
e05f391f8e
[issue #64 ] Write User.uname instead of User.name to commit
2012-02-03 04:04:20 +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
68c97b3a33
[refs #64 ] some template fixes
2012-02-03 00:46:33 +06:00
821062c150
Merge branch '64-project_wiki' of github.com:warpc/rosa-build into 64-project_wiki
2012-02-02 03:18:53 +04:00
4cd20934c4
[issue #64 ] Removed unused MathJax
2012-02-02 03:17:16 +04:00
0006bf3b63
Returned before_initialize to Group.
2012-02-02 01:20:10 +04:00
cb7a9fcc21
fix group autocomplete
2012-02-02 02:42:23 +06:00
20613ba2c3
[refs #64 ] All pages:
2012-02-02 01:36:56 +06: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
b117ec1331
[issue #64 ] Yet another hacks.
2012-02-01 22:33:53 +04:00
0559f1b678
[refs #127 ] Filter request refactor
2012-02-01 20:00:19 +04:00
8733c4dc34
[issue #64 ] Some dirty hacks.
...
Diff for file with russian name don't work yet.
2012-02-01 03:20:42 +04:00
34b105675a
Add 1 more mime type to product
2012-01-31 23:29:25 +02: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
07e71c2dfc
[issue #64 ] Changed find_by to where
2012-01-31 01:20:03 +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
2a27cd3662
[issue #64 ] Some fixes.
2012-01-30 19:27:54 +04: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
f7c58f6a77
[issue #64 ] Removed unnecessary files.
2012-01-30 13:12:18 +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
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
255c39ef5a
Revert "Merge branch 'fix-email-i18n' into 114-comment_notifications"
...
This reverts commit 9bf06e5e1a595f320dc4527ebd44f14be05fcd64, reversing
changes made to f2bc0e67a91e6283f4881e754e5da95c59cf341b.
2012-01-30 12:09:52 +06:00
2e2e7e43d3
[refs #114 ] some refactoring
2012-01-30 02:18:14 +06:00
706c052a5e
[issue #64 ] User names are clickable.
2012-01-29 22:03:42 +04:00
1ef2bc0f75
[issue #64 ] Actions authorization moved to filters
2012-01-29 22:02:18 +04:00
39a4479fa3
[refs #114 ] fix emails uniqueness
2012-01-29 22:27:46 +06:00
acdd1f22b6
[issue #64 ] Fixed bug with revert all wiki.
2012-01-28 16:10:43 +04:00
cd41980441
Merge pull request #135 from warpc/112-sync_projects
...
Доработки автоматической синхронизации
2012-01-27 18:38:31 -08: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
aa5641da2f
[issue #64 ] Fixed CanCan bugs.
2012-01-28 06:05:13 +04:00
2ab039cc62
[issue #64 ] Some fixes in view.
2012-01-28 05:56:27 +04: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
f9abc2d39c
Hide participate projects
2012-01-28 04:25:11 +04:00
a89db6f3a5
[issue #64 ] Fixed bug with multiword page names
2012-01-27 23:14:53 +04:00
324e9a294f
[issue #64 ] Fixed some bugs.
2012-01-27 22:30:45 +04:00
a4f95e3660
[issue #64 ] Changed editor toolbar.
2012-01-27 21:00:44 +04:00
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
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
e01fe571b4
[refs #123 ] Add activity feed en translation fixes
2012-01-27 18:59:28 +04:00
a5d6889999
[refs #128 ] Add devise confirmable and reconfirmable options
2012-01-27 18:58:38 +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
45c175942b
Temporary change arch for mass rebuild
2012-01-27 05:00:44 +04:00
2d1e36fb1a
[issue #64 ] Changed own_projects validation.
2012-01-27 04:16:07 +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
b04a9e0176
[issue #64 ] Removed duplicated authorization.
2012-01-27 00:51:11 +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
3cb426a508
[issue #64 ] Added cancan restrictions.
2012-01-26 20:26:21 +04:00
c529e63c96
Merge pull request #122 from warpc/105-internationalization
...
[refs #105 ] Fix devise translations
2012-01-26 08:06:34 -08:00
da88ac7df7
[issue #64 ] Some refactoring
2012-01-26 18:10:25 +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
374628a216
Render answer before publication trying to avoid bug. Refs #97
2012-01-26 00:28:11 +02:00
8f5951acb9
Merge branch 'fix-email-i18n' into 114-comment_notifications
2012-01-25 23:33:41 +06:00
4cca8f7bb1
[refs #114 ] some refactoring
2012-01-25 23:33:26 +06:00
dd1493d677
[refs #123 ] Add activity feed page. Remove some unnessary code. Some logic fixes.
2012-01-25 17:05:39 +04:00
990a46018c
[refs #123 ] Add base logic for activity feed
2012-01-25 12:31:49 +04:00
82339dcb34
send email in user's language
2012-01-25 14:28:00 +06:00
b7c2b4d35b
[refs #114 ] fix email bug
2012-01-25 13:21:41 +06:00
60c1153d49
Save with validation. Refs #31
2012-01-24 23:29:23 +02:00
45877e8b5c
[issue #64 ] Bug fix & views refactoring
...
* Fixed bug with history
* Navigation moved to partial.
2012-01-25 00:47:55 +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
6df1640485
[refs #114 ] fix logics
2012-01-24 18:18:39 +06:00
7e1a26000e
Fix for "undefined method `<<' for nil:NilClass"
2012-01-24 01:12:42 +04:00
9127b6b689
[refs #114 ] changed logics
2012-01-24 01:42:54 +06:00
c3f415e90c
Add new build status for Item
2012-01-23 22:11:53 +04:00
e1a4dd5ab5
Fix branch name for mass rebuild
...
Fix error in include_repos
2012-01-23 21:07:09 +04:00
733adaf111
Update build_for for new requirements
2012-01-23 20:19:10 +04:00
6140c0c0bc
[issue #64 ] Added some comments
2012-01-23 17:38:10 +04:00
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
651c5637ed
[refs #114 ] fix committer notification
2012-01-22 23:49:41 +06:00
f1f6d1b78b
[refs #114 ] email i18n
2012-01-22 22:19:00 +06:00
f0d7ed0d89
[refs #114 ] fix notification for committer
2012-01-22 22:17:08 +06:00
ab081d3c46
[refs #114 ] only new comment notification
2012-01-22 22:15:25 +06:00
36a895385c
[refs #114 ] changed rules
2012-01-22 01:13:33 +06:00
21d422c313
[refs #114 ] refactoring subscribe
2012-01-21 19:32:22 +06:00
d939edda8f
[issue #64 ] Fixed some bugs.
2012-01-21 02:11:46 +04:00
c6836e2978
Merge pull request #121 from warpc/113-file_mime_types
...
[Close #113 ] Images render and download href for binary data into blobs
2012-01-20 11:10:16 -08:00
f46b179486
[refs #113 ] Add json to mime types list
2012-01-20 22:40:00 +04:00
5d93d40693
[refs #113 ] Remove unused action from blobs controller
2012-01-20 22:33:22 +04:00
23ace52d90
[refs #113 ] Images render and download href for binary data into blobs
2012-01-20 22:31:01 +04:00
d8df6c6279
[refs #114 ] committer subscribe + some tests
2012-01-21 00:22:25 +06:00
06a977ea21
Merge branch 'master' into 114-comment_notifications
2012-01-20 22:03:04 +06:00
371abac031
[refs #114 ] fix controller tests
2012-01-20 21:17:05 +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
bae56741d0
Temporary disable AutoBuild functions for users (not working at now)
2012-01-20 12:24:57 +04:00
364f2e40c0
[issue #64 ] Added Wiki history, compare, revert.
2012-01-20 03:25:15 +04:00
800b02f544
[refs #18 ] Add project subsribe, tests
2012-01-20 00:20:03 +06: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
552aa0a58a
[issue #64 ] Fixed bug with sidebar and footer.
2012-01-19 17:48:29 +04:00
538e3da8c8
[issue #64 ] Added search through wiki
2012-01-19 16:10:50 +04:00
65e659ad49
[issue #64 ] Some changes in preview.
2012-01-19 16:09:55 +04:00
32b64d3462
[issue #64 ] Minor fixes in WikiController
2012-01-19 16:07:08 +04:00
022a013b79
[issue #64 ] Added Wiki seeding on create.
2012-01-19 16:06:27 +04:00
a03690a9f7
[issue #64 ] Some views restuct.
2012-01-19 01:14:12 +04:00
bd6abf2681
[refs #105 ] Add locale fixes
2012-01-19 00:58:38 +04:00
dba11f4662
[refs #114 ] FIXME subscribers
2012-01-19 01:12:52 +06: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
0386c34246
[issue #64 ] Added page deletion.
2012-01-18 18:33:35 +04:00
7afcc3a617
[issue #64 ] Some fixes.
2012-01-18 18:33:09 +04: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
01d8cd8dcc
[refs #105 ] Change LANGUAGE constant into User
2012-01-18 17:06:18 +04:00
931aef4db6
[issue #64 ] Fixed some bugs in templates.
2012-01-18 04:47:01 +04:00
a608ded8c4
[issue #76 ] Fixed potential bug in redirects
2012-01-18 04:44:42 +04:00
d3b32e4d6d
[issue #64 ] Fixed bug with preview page.
2012-01-18 04:43:36 +04:00
407130f3d7
[issue #64 ] Minor fix in WikiController#show.
2012-01-18 03:46:44 +04:00
2522dd3c63
[issue #64 ] Added page history views.
2012-01-18 03:30:54 +04:00
a9989f07fe
[issue #64 ] Fixed bug with update page
2012-01-18 03:30:04 +04:00
51e9b5d1f6
[issue #64 ] Some changes in views and routes.
2012-01-18 02:28:59 +04:00
310e11b666
[refs #18 ] Fix if blocking referer
2012-01-18 00:33:42 +06:00
f8be867aaf
Replace annotated tags to lightweight. Improve specs. Restore lost migrations. Refs #103
2012-01-17 19:37:41 +02:00
bbbf17c2b4
[refs #105 ] Merge master with 105-internationalization
2012-01-17 17:58:49 +04:00
62d0419bdd
Merge pull request #106 from warpc/103-bl_publish_new_params
...
Сохранение сборочного коммита, добавление неподписанного тега на сохраненный коммит после публикации
2012-01-17 04:34:15 -08:00
d205eb2dd9
[refs #105 ] Add language check on user save
2012-01-17 15:57:46 +04:00
726eddc40e
[refs #105 ] Add internationalization support to project
2012-01-17 15:48:40 +04:00
a0aad7103e
some fixes
2012-01-17 17:38:40 +06:00
fab62c548f
Hide container_path if build_list published. Cleanup translations. Refs #100
2012-01-17 13:04:50 +02:00
95b4e2557c
[refs #18 ] forgot comments order
2012-01-17 16:30:11 +06:00
d2c5df93a9
Merge branch '18-commit_comments' of github.com:warpc/rosa-build into 18-commit_comments
...
Conflicts:
app/models/comment.rb
app/models/issue.rb
app/views/comments/edit.html.haml
app/views/issues/show.html.haml
2012-01-17 15:57:12 +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
62922c30a3
[issue #64 ] Added search partial.
2012-01-17 04:05:07 +04:00
a687a6601b
Save commit_hash during build_list create. Tag git repo during build_list publish. Write and fix specs. Refs #103
2012-01-16 23:51:20 +02:00
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
80ba40f6ee
Merge branch 'master' into 18-commit_comments
...
rspec spec/ = 528 examples, 12 failures
2012-01-17 00:52:16 +06:00
52696791f2
[refs #54 , #94 ] Merge master into issues
2012-01-16 13:42:44 +04:00
e10dd56dff
[refs #18 ] refactoring
2012-01-16 13:28:30 +06:00
bdc3b3a3d1
[refs #18 ] controller tests
2012-01-14 18:16:42 +06:00
712ca8d95a
Save package_version during success build_list publish. Add specs. Refs #103
2012-01-13 18:45:13 +02:00
a1a92e9878
[refs #54 ] Fix comments serial_id routing and some logic
2012-01-13 20:07:46 +04:00
794c55a030
Merge branch 'master' of github.com:warpc/rosa-build into 18-commit_comments
2012-01-13 22:01:30 +06:00
8252367537
some fix
2012-01-13 21:58:48 +06:00
db0a66846b
[refs #94 ] Add new notifier rules. Fix some issues and comments bugs
2012-01-13 19:07:01 +04:00
729bd94045
[issue #64 ] Merge branch 'master' into 64-project_wiki
...
Conflicts:
config/routes.rb
db/schema.rb
2012-01-13 18:05:42 +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
caf7adef70
[refs #18 ] FIXME subscribe don't work
2012-01-12 20:50:27 +06:00
630346d2e3
[refs #18 ] fix cancel button
2012-01-12 20:48:08 +06:00
636c90e6e4
[refs #18 ] add some I18n
2012-01-12 20:27:45 +06:00
980e455b31
[refs #54 ] Fix comment deliver notification user check
2012-01-12 17:45:22 +04:00
f6e4de3b72
[refs #54 ] Fix issue assign user subscribe update filter
2012-01-12 17:07:54 +04:00
f8d00f5235
[refs #18 ] Fix cancan ability for commit comments
2012-01-12 18:04:16 +06:00
07dc7a4800
[refs #18 ] add comments to commit
2012-01-12 17:19:22 +06:00
49082c2a8d
[issue #76 ] Fixed bug with JSON generation.
2012-01-12 01:12:56 +04:00
c23312ad51
Research and fix problem with build_lists#auto_publish feature. Fix specs. Refs #97
2012-01-11 21:43:33 +02:00
c18b71bf0b
[refs #18 ] changed refs id to string
2012-01-12 00:10:23 +06:00
2b8aca5f09
[refs #54 ] Add settings notifier
2012-01-11 17:58:13 +04:00
4132c336d6
[refs #54 ] Fix comment update path
2011-12-31 14:55:49 +04:00
16c9d0ec15
[refs #54 ] Fix some bugs of issues and comments + add comment body to email
2011-12-31 14:51:47 +04:00
7c50b2c3f5
[issue #76 ] Added jQuery DataTable. But it doesn't work yet
2011-12-31 02:42:58 +04:00
e8977a7d95
Merger issues with master
2011-12-30 18:23:16 +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
782b311983
[issue #76 ] Changed project list in repositories.
2011-12-29 22:16:39 +04:00
633e5ebffc
Added actions to WikiController
2011-12-29 22:00:43 +04:00
635e2b7977
[refs #54 ] Add comments specs and factory. Remove unused code. Add one delay and fix some links.
2011-12-29 15:16:54 +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
49ec1ebe98
[refs #54 ] Remove unused comments
2011-12-28 18:24:24 +04:00
fa8656d1f5
[refs #54 ] Refactor subscires routes and authorize
2011-12-28 17:54:45 +04:00
1c263c6e0a
[refs #54 ] Notification DJ support. Routes fixes.
2011-12-28 14:47:54 +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
ecbfed9300
[refs #54 ] Fix user_id validation into issues
2011-12-27 21:49:08 +04:00
b48ffecc28
[refs #54 ] Add new styles to comments list to issue page
2011-12-27 17:52:48 +04: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
ec95373d28
[#issue 64] Routes to Wiki and some methods in controller.
...
Useless yet.
2011-12-26 21:07:16 +04:00
81378478ca
[issue #64 ] Added Wiki controller and some methods in Project
2011-12-26 21:07:07 +04: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
7d8d77a386
[issue #79 ] Added validation to ProjectToRepository
2011-12-23 21:06:47 +04:00
bf2f3d1bc7
[refs #54 ] Add issue statuses filters
2011-12-23 18:34:32 +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
e2144e0fdb
[refs #54 ] Fix issue ability and comment redirect after update
2011-12-22 11:41:37 +04:00
96d458875e
Remove publish validator. Add can_cancel/can_publish checking to cancel/publish methods. Refs #80
2011-12-22 04:08:11 +02: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
2ac4391edf
Redo build_list publish to check returned status. Refs #77
2011-12-22 01:31:05 +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
8c2b837600
Fix build_list user assign. Refs #65
2011-12-21 21:17:55 +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
7f58a52602
Autocheck current save platform and disable unavailable base platforms on JS level. Refs #65
2011-12-21 19:51:55 +02:00
3ab55d34b8
[refs #54 ] Add CanCan rules for issues and comments. Fix serial_id routes and some actions
2011-12-21 18:48:16 +04: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
6c48e058be
[ close #70 ] Removed all & filter methods in BuildListsController
...
* Removed methods
* Changed abilities
* Changed routes
* Added specs
2011-12-21 05:30:34 +04:00
cb91bdb858
Merge pull request #68 from warpc/build_list_visibilities
...
Customize build list monitoring:
* show all user public build list
* show private build list only who have access for project
* admin see all build list
2011-12-20 15:46:43 -08:00
3eb2ae545a
[issue #27 ] Merge branch 'master' into build_list_visibilities
...
Conflicts:
app/views/build_lists/_filter.html.haml
2011-12-20 21:25:35 +04:00
0978312366
[update #27 ] Removed unnecessary comments.
2011-12-20 21:22:44 +04: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
61cd0a7532
[ close #27 ] Fixed error in template.
2011-12-20 17:08:48 +04:00
446cdac8e6
[refs #54 ] Add new locales. Fix routes. Fix issues and comments update
2011-12-20 14:20:00 +04:00
d20d43eb2b
[refs #54 ] Base logic and templates for issues and comments to them
2011-12-19 19:30:14 +04:00
f9c46185fc
[refs #41 ] Remove platform validation stub
2011-12-16 12:48:39 +04:00
df61ee8459
Merge pull request #59 from warpc/23-project_search_fixes
...
#23 project search fixes
2011-12-16 00:14:37 -08:00
58cfe07124
[refs #56 ] Change project build page title
2011-12-16 11:59:34 +04:00
c81698b81b
[refs #57 ] Forbid access to users_path for simple users
2011-12-16 11:32:34 +04:00
a946349bb4
[ close #23 ] Changed searching.
2011-12-16 04:33:44 +04:00
88ea7110f3
[issue #23 ] Fixed scope 'by_name' in Project model.
2011-12-16 04:32:42 +04:00
194aabdbc3
[issue #27 ] Fixed typo in ability.rb
2011-12-16 02:09:05 +04:00
021f1f8691
Merge pull request #58 from warpc/47-fork_bug
...
Fix #47 . Problem with fork when project already exist in personal repository
* Allow to add only own projects to personal repository(solution);
* Fix tests;
* Remove deprected relation.
2011-12-15 14:08:03 -08:00
0c3b62b235
[issue #27 ] Changed abilities. Added test, but test fails.
2011-12-16 01:58:20 +04:00
7448d74416
Allow to add only own projects to personal repository. Fix tests. Remove deprected relation. Refs #47
2011-12-15 23:52:45 +02:00
7f10fea681
[refs #32 ] Add user uname field to user profile
2011-12-15 20:20:17 +04:00
b3f422e713
[refs #32 ] Add user filter
2011-12-15 20:15:25 +04:00
06e08dcfc6
Fix indentions
2011-12-15 02:36:14 +02:00
e3663381db
Merge branch 'master' into build_list_visibilities
2011-12-15 03:29:22 +04:00
97c43b74e3
Merge pull request #46 from warpc/1-bluepill
...
1 bluepill
* Apply bluepill configuration, write capistrano recipe for it
* Change deploy logic to integrate with bluepill
* Refactor unicorn config, run it through unixsocket
* Cleanup depoy
* Refactor mount_downloads script
* Write autostart script. Launch from rosa user
* Remove old scripts
* Refactor platform mount/umount methods
* Debug
2011-12-14 14:29:28 -08:00
a855366a75
Fix merge bug. Take back method. Refs #1
2011-12-15 00:11:31 +02:00
85231d3f91
Merge pull request #38 from warpc/37-acl_build_list_bug_fix
...
[issue #37 ] Fixed bug that user can't show created build_list
* Changed ability.rb to grant priviliges to show build_list to non-admin users
* Added specs
2011-12-14 14:09:39 -08:00
f1465f51ca
Merge branch 'master' into 1-bluepill
...
Conflicts:
app/controllers/platforms_controller.rb
app/models/platform.rb
2011-12-14 23:51:31 +02:00
b03805bccc
Merge pull request #35 from warpc/build_list_date_fix
...
[fixed #34 ] Changed scopes in BuildList model
2011-12-14 09:37:03 -08:00
7b6863352f
[ fixed #34 ] Changed skopes in BuildList model.
2011-12-14 20:30:35 +04:00
2a108981d5
[update #20 ] To server sends id instead of uname. Added some specs
2011-12-14 19:54:04 +04:00
Alexander Machehin
George Vinogradov
Vladimir Sharshov
konstantin.grabar
George Vinogradov
Pavel Chipiga
Pasha