Alexander Machehin
ba437f7703
[refs #265 ] changed activity feed messages
2012-03-14 00:47:37 +06:00
George Vinogradov
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
George Vinogradov
952c9e46ea
[issue #279 ] Added datatables pagination extension
2012-03-13 18:36:42 +04:00
Alexander Machehin
5b932879e2
[refs #265 ] fixed subscribe dublicates
2012-03-13 19:56:58 +06:00
Vladimir Sharshov
2153f66ab1
Merge branch '3.2-master' of github.com:warpc/rosa-build into 3.2-master
2012-03-13 15:05:09 +04:00
Vladimir Sharshov
b07d81644a
[Refs #223 ] Monitoring colors code in index page
2012-03-13 15:04:29 +04:00
Pavel Chipiga
51e2584995
Fix abilities for invites. Refs #174
2012-03-12 23:24:05 +02:00
Vladimir Sharshov
61b8c70f4b
[Refs #257 ] Fix edit profile labels
2012-03-12 22:13:10 +04:00
Alexander Machehin
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
Alexander Machehin
843d95b64e
[refs #257 ] fixed 'big' geometry
2012-03-12 23:02:02 +06:00
Alexander Machehin
4fd91e2bfe
[refs #257 ] force convert avatar to jpg
2012-03-12 22:28:56 +06:00
Alexander Machehin
24639b8684
[refs 257] renamed to profile
2012-03-12 21:03:25 +06:00
Alexander Machehin
fc465a4647
[refs #195 ] onfocus -> onclick
2012-03-12 20:46:11 +06:00
Vladimir Sharshov
19bcdf94d9
[Refs #195 ] More space for project url
2012-03-12 18:31:25 +04:00
Alexander Machehin
5f6ca140d9
[refs #257 ] add ability to destroy avatar
2012-03-12 18:51:07 +06:00
Vladimir Sharshov
64926498d6
[Refs #195 ] Fix pagination for index projects page
2012-03-12 16:05:19 +04:00
Pavel Chipiga
bb7cff5de8
Fix abilities - allow users search build_lists. Refs #223
2012-03-12 13:46:57 +02:00
Alexander Machehin
26e80af8cb
[refs #195 ] one click select
2012-03-12 16:13:34 +06:00
Vladimir Sharshov
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
Alexander Machehin
ecfb4f81a0
[refs #265 ] fixed today builds
2012-03-12 14:52:38 +06:00
George Vinogradov
c2dc8d9e38
[issue #279 ] Added platform products list
2012-03-12 04:07:18 +04:00
George Vinogradov
61bd704cb1
[issue #279 ] Added platform repositories list.
2012-03-12 03:58:25 +04:00
George Vinogradov
535c075d3e
[issue #279 ] Added platform main page, menu & sidebar
2012-03-12 03:08:50 +04:00
Pavel Chipiga
3e344f90ad
Display only 10 last activities. Refs #265
2012-03-12 00:47:22 +02:00
Pavel Chipiga
a78b7b4155
Merge branch 'master' into 3.2-master
2012-03-11 23:39:11 +02:00
George Vinogradov
19a962560a
[issue #279 ] Merge branch '3.2-master' into 279-new_design_for_platforms
...
Conflicts:
app/assets/stylesheets/design/custom.scss
2012-03-12 01:38:20 +04:00
Vladimir Sharshov
b99be18466
Merge pull request #287 from warpc/265-new_design_for_activity_feed
...
[Refs #265 ] fixed multiple "All my projects" and last project size
2012-03-11 13:08:52 -07:00
Alexander Machehin
9c6ba7a584
[refs #265 ] fixed last project size
2012-03-12 02:04:49 +06:00
Alexander Machehin
de61bc8cee
[refs #265 ] fixed multiple "All my projects"
2012-03-12 02:00:54 +06:00
Vladimir Sharshov
a26aa9b919
Merge pull request #286 from warpc/265-new_design_for_activity_feed
...
[refs #265 ] fixed double wiki feed
2012-03-11 11:39:33 -07:00
Alexander Machehin
c4fd73b52b
[refs #265 ] fixed double wiki feed
2012-03-12 00:28:14 +06:00
Vladimir Sharshov
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
Alexander Machehin
35d1323549
[refs #265 ] fixed message format
2012-03-11 23:30:14 +06:00
Vladimir Sharshov
d86653e172
Split code and tracker options in notification center
2012-03-11 21:21:31 +04:00
Alexander Machehin
6a7d9636f5
[refs #265 ] fixed user avatars
2012-03-11 23:06:41 +06:00
Alexander Machehin
6d5120e5cc
Merge branch '3.2-master' into 265-new_design_for_activity_feed
2012-03-11 22:44:25 +06:00
Alexander Machehin
37f4676bfb
[refs #265 ] fuuu fix logo
2012-03-11 22:40:09 +06:00
Vladimir Sharshov
11434ff423
[Refs #285 ] Fix css style, rename button
2012-03-11 20:38:28 +04:00
Vladimir Sharshov
877d82aa06
Merge branch '3.2-master' of github.com:warpc/rosa-build into 3.2-master
2012-03-11 20:02:35 +04:00
Vladimir Sharshov
e2b3eb7b7f
[Refs #285 ] Fix current_user avatar for all user, replace button Edit
2012-03-11 20:02:07 +04:00
Alexander Machehin
849cbce913
[refs #265 ] add link to root
2012-03-11 21:30:45 +06:00
Alexander Machehin
66b57f7a0a
[refs #265 ] fixed issue assignee
2012-03-11 17:56:56 +06:00
Alexander Machehin
cc6390f3a1
[refs #265 ] fixed partial name
2012-03-11 16:18:11 +06:00
Pavel Chipiga
1cf2660cda
Fix search order. Refs #255
2012-03-08 02:32:12 +02:00
Pavel Chipiga
41ae79eb46
Add configurable arch parameter to project build_for method. Write rake task for projects build. Refs #282
2012-03-08 01:25:17 +02:00
Pavel Chipiga
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
Vladimir Sharshov
e49551756c
Merge pull request #276 from warpc/194-issue_page
...
[Refs #194 ] Fix for manage labels and executor
2012-03-07 11:26:11 -08:00
Vladimir Sharshov
57c4c7032b
Merge pull request #280 from warpc/257-new_design_for_profiles
...
[refs #257 ] fix user update registration page
2012-03-07 11:07:36 -08:00
George Vinogradov
9c78a917a1
[issue #279 ] Added platforms page.
2012-03-07 22:59:37 +04:00
Alexander Machehin
de62aaad53
[refs #257 ] fix user update registration page
2012-03-08 00:47:19 +06:00
Alexander Machehin
185962890f
[refs #194 ] issue executor
2012-03-07 22:27:12 +06:00
Alexander Machehin
8df4fdfa5c
[refs #194 ] remove labels search from js
2012-03-07 22:26:43 +06:00
Alexander Machehin
b70e8db695
[refs #194 ] fix selected labels in the index page
2012-03-07 22:04:37 +06:00
Alexander Machehin
db8e1881ba
[refs #195 ] change repo url to readonly
2012-03-07 20:56:25 +06:00
Vladimir Sharshov
1cb109119d
Merge pull request #277 from warpc/274-file_detection_fixes
...
[Refs #274 ] file detection fixes
2012-03-07 06:53:16 -08:00
George Vinogradov
464de82c68
[issue #274 ] Added some MIME types. Changed MIME ordering.
2012-03-07 17:36:39 +04:00
Alexander Machehin
c657efc338
[refs #194 ] show all project labels without searching
2012-03-07 19:36:17 +06:00
Alexander Machehin
324a407161
[refs #223 ] move New build button to sidebar
2012-03-07 17:12:00 +06:00
Alexander Machehin
9a6beef2da
[refs #194 ] fix issue managing labels
2012-03-07 16:50:45 +06:00
Alexander Machehin
4b173932e5
[refs #194 ] fix managing issue executor
2012-03-07 16:44:42 +06:00
Alexander Machehin
82d26b08b9
[refs #223 ] fix selector
2012-03-07 16:27:29 +06:00
Alexander Machehin
7fbee6e90e
[refs #194 ] fix user avatar
2012-03-07 14:31:55 +06:00
George Vinogradov
d6d8410b0f
[issue #274 ] Fixed file detection.
...
TODO.
1. Change MIME in editor
2. Change MIME sorting
2012-03-07 05:20:35 +04:00
Alexander Machehin
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
Alexander Machehin
13ba125dc0
[refs #265 ] add project_id to comment & fix email notification
2012-03-07 03:49:29 +06:00
George Vinogradov
396540ffe3
[issue #193 ] Updated
2012-03-07 00:54:02 +04:00
George Vinogradov
0289f7cc3e
[issue #193 ] Fixed wiki history table.
2012-03-07 00:53:09 +04:00
Alexander Machehin
0f823bd9f3
[refs #265 ] fix security & commit to comments
2012-03-07 02:51:51 +06:00
Pavel Chipiga
e3f0b2fce2
Fix gravatar url
2012-03-06 22:16:31 +02:00
Alexander Machehin
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
Pavel Chipiga
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
Alexander Machehin
872132d8a6
[refs #265 ] fix find owner and project
2012-03-07 00:20:14 +06:00
Alexander Machehin
8ae7ebee2b
Merge branch '3.2-master' into 194-issue_page
2012-03-06 22:51:13 +06:00
Alexander Machehin
1791160b09
[refs #194 ] fix manage issue executor
2012-03-06 22:31:07 +06:00
konstantin.grabar
9565d58e8f
[refs #257 ] Merge 3.2-master into 257-new_design_for_profiles
2012-03-06 20:13:53 +04:00
Pavel Chipiga
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
Alexander Machehin
b9de81f4df
[refs #194 ] managing labels in the issue
2012-03-06 21:21:13 +06:00
konstantin.grabar
7e53a6c511
[refs #265 ] Fix git push and delete branch partials and logic
2012-03-06 18:57:05 +04:00
konstantin.grabar
f54d889f74
[refs #265 ] Fix activity partials messages and locales. Fix observer.
2012-03-06 18:04:05 +04:00
George Vinogradov
f070a9d729
[issue #193 ] Merge branch '3.2-master' into 193-new_design_for_wiki
...
Conflicts:
app/assets/stylesheets/custom.scss
2012-03-06 17:40:44 +04:00
George Vinogradov
2b1b5504cd
[issue #193 ] Added fullname to history table.
2012-03-06 17:20:30 +04:00
George Vinogradov
cd57da0946
[issue #193 ] Fixed searchbar in wiki.
2012-03-06 17:08:19 +04:00
Alexander Machehin
af69c02a6d
[refs #194 ] render user name
2012-03-06 18:29:42 +06:00
konstantin.grabar
de6490346b
[refs #257 ] Change error messages logic. Fix avatar ru translation
2012-03-06 15:24:42 +04:00
Alexander Machehin
4f995ca548
[refs #265 ] hook mode 775 -> 755
2012-03-06 15:39:23 +06:00
Alexander Machehin
de0f7c83c8
[refs #265 ] fix hook and add execute bit for it
2012-03-06 15:07:14 +06:00
Alexander Machehin
9e6d06f1c9
[refs #194 ] manage issue executer
2012-03-06 00:28:55 +06:00
Alexander Machehin
325497d040
Merge branch '3.2-master' into 194-issue_page
2012-03-06 00:11:32 +06:00
konstantin.grabar
637edabb4c
[refs #257 ] Fix some locales and headers
2012-03-05 22:00:44 +04:00
Vladimir Sharshov
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
konstantin.grabar
9558a1d65f
[refs #265 ] Fix wiki history link
2012-03-05 20:36:58 +04:00
George Vinogradov
8845ec17ff
[issue #195 ] Added translations.
2012-03-05 20:31:09 +04:00
Vladimir Sharshov
91ba8b1543
[Refs #257 ] Fix password change, refactoring.
2012-03-05 19:36:23 +04:00
George Vinogradov
93e2caccc8
[issue #195 ] Added blame view.
2012-03-05 19:29:05 +04:00
George Vinogradov
5290f0c712
[issue #195 ] Fixed syntax highlighting. Stub for rpm-specs
2012-03-05 19:27:16 +04:00
Alexander Machehin
e5d5ef11e3
[refs #194 ] fix submenu highlight
2012-03-05 20:00:49 +06:00
Alexander Machehin
695bacd4d2
[refs #194 ] fix rendering 'New issue' label
2012-03-05 19:57:01 +06:00
Alexander Machehin
c76a3e148f
[refs #194 ] more obvious name to partial
2012-03-05 19:55:15 +06:00
Alexander Machehin
dab45f9afe
[refs #228 ] fix checking remember me button
2012-03-05 16:49:31 +06:00
konstantin.grabar
73296059eb
[refs #257 ] Merge 3.2-master into 257-new_design_for_profiles
2012-03-05 13:42:39 +04:00
konstantin.grabar
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
konstantin.grabar
9b68752ffd
[refs #257 ] Change avatar helper and logic. Add paperclip avatar to users
2012-03-03 22:05:02 +04:00
konstantin.grabar
f58e24b134
[refs #257 ] User edit pages fixes
2012-03-03 20:03:23 +04:00
konstantin.grabar
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
konstantin.grabar
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
Pavel Chipiga
ce633f5838
Fix group owner. Refs #232
2012-03-03 03:34:24 +02:00
Pavel Chipiga
a0f0c24f88
Fix flash messages. Add styles. Refs #263
2012-03-03 03:05:19 +02:00
Pavel Chipiga
13f0d8223d
Remove compass-bootstrap. Take back DJ fix. Refs #263
2012-03-03 02:42:10 +02:00
Pavel Chipiga
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
George Vinogradov
ea0ecffd23
Merge branch '3.2-master' of github.com:warpc/rosa-build into 3.2-master
2012-03-03 04:27:07 +04:00
George Vinogradov
7e5e3ca609
[issue #195 ] Fixed another creating bug...
...
I feel like a slipper-man...
2012-03-03 04:24:57 +04:00
Pavel Chipiga
a831a4aa63
Merge branch '3.2-master' of github.com:warpc/rosa-build into 3.2-master
2012-03-03 01:43:14 +02:00
Pavel Chipiga
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
George Vinogradov
9ee3942702
[issue #195 ] Fixed bug with project creating
2012-03-03 03:25:20 +04:00
Vladimir Sharshov
622d80c6d3
Merge pull request #261 from warpc/194-tracker
...
[Refs #194 ] Fix ACL and tests for issues
2012-03-02 11:48:10 -08:00
Alexander Machehin
7cd3e40efc
[refs #194 ] fix accessible list
2012-03-03 01:23:45 +06:00
Vladimir Sharshov
403a8a19ce
Merge pull request #262 from warpc/194-nice_radio_change
...
[Refs #194 ] Fix triggering change event for niceRadio buttons
2012-03-02 10:27:27 -08:00
Alexander Machehin
319fcdad86
[refs #194 ] refactoring
2012-03-03 00:21:46 +06:00
Alexander Machehin
dfa361f5c3
[refs #194 ] fix triggering change event for niceRadio buttons
2012-03-02 23:45:20 +06:00
Alexander Machehin
c7b412c0e0
[refs #194 ] some refactoring
2012-03-02 23:38:00 +06:00
George Vinogradov
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
Alexander Machehin
41c0d1e856
[refs #194 ] fix security and tests
2012-03-02 22:52:15 +06:00
George Vinogradov
b3750f8644
[issue #195 ] Fixed branch selector.
2012-03-02 20:48:19 +04:00
George Vinogradov
7b37846a54
[issue #195 ] Fixed line numbering with files contains <>
2012-03-02 19:50:17 +04:00
Alexander Machehin
50fc094bce
[refs #228 ] fuuuuu...
2012-03-02 21:32:00 +06:00
Vladimir Sharshov
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
Alexander Machehin
7164dd580e
[refs #230 ] fix error messages + some refactoring
2012-03-02 18:27:38 +06:00
konstantin.grabar
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
konstantin.grabar
8677fa7493
[refs #232 ] Remove name field
2012-03-02 14:39:48 +04:00
konstantin.grabar
3369953b4c
[refs #232 ] Remove unused commented code from groups controller
2012-03-02 13:46:16 +04:00
konstantin.grabar
1700588b97
[refs #232 ] Merge 3.2-master into 232-new_groups_design
2012-03-02 13:44:54 +04:00
konstantin.grabar
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
George Vinogradov
4218006f47
[issue #195 ] Returned code highlighting.
2012-03-02 05:10:39 +04:00
George Vinogradov
6cfb5d0c3d
[issue #195 ] Fixed bug with encodings. Added avatar. Stubbed blame.
2012-03-02 04:39:43 +04:00
Pavel Chipiga
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
George Vinogradov
900c1fe2f5
[issue #195 ] Fixes.
...
* Fixed translations
* Fixed blob display
* Fixed routes
2012-03-02 02:07:04 +02:00
Pavel Chipiga
accf38a088
Fix build_list display width. Refs #223
2012-03-02 02:04:07 +02:00
Pavel Chipiga
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
Alexander Machehin
cea7bc79bb
[refs #194 ] fix notification line style
2012-03-02 02:04:06 +02:00
Alexander Machehin
f79c8d6f16
[refs #230 ] shorter error messages
2012-03-02 02:04:06 +02:00
Alexander Machehin
d7dbe79357
[refs #230 ] edit password page
2012-03-02 02:04:06 +02:00
Alexander Machehin
de177f1d03
[refs #194 ] add space between list and create form
2012-03-02 02:04:05 +02:00
Alexander Machehin
c30cd83c33
[refs #194 ] add default scope for comments
2012-03-02 02:04:05 +02:00
Alexander Machehin
3aae663811
[refs #194 ] add comments to issues
2012-03-02 02:04:05 +02:00
Alexander Machehin
790ea38ba6
[refs 194] fix comments
2012-03-02 02:04:04 +02:00
Pavel Chipiga
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
Pavel Chipiga
84a7a9fe2d
Fix build_list display width. Refs #223
2012-03-02 01:37:05 +02:00
Pavel Chipiga
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
George Vinogradov
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
George Vinogradov
43c10ee812
[issue #195 ] Fixed long comments displaying.
2012-03-02 00:33:48 +04:00
Vladimir Sharshov
9e11a20f71
Merge pull request #249 from warpc/230-registration_page
...
[refs #230 ] Edit password page
2012-03-01 11:43:53 -08:00
Alexander Machehin
2f0981c12f
[refs #194 ] fix notification line style
2012-03-02 01:33:22 +06:00
Alexander Machehin
b0b53edf48
[refs #230 ] shorter error messages
2012-03-02 01:16:50 +06:00
Alexander Machehin
4931dc773b
[refs #230 ] edit password page
2012-03-02 01:16:49 +06:00
Alexander Machehin
b8b68e8ad2
[refs #194 ] add space between list and create form
2012-03-02 01:11:21 +06:00
Alexander Machehin
56b9371ee2
[refs #194 ] add default scope for comments
2012-03-02 01:10:12 +06:00
Alexander Machehin
ecc2e1f181
[refs #194 ] add comments to issues
2012-03-02 00:57:59 +06:00
Alexander Machehin
20417241a8
[refs 194] fix comments
2012-03-02 00:57:59 +06:00
George Vinogradov
4b024d1728
[issue #195 ] Fixes.
...
* Fixed translations
* Fixed blob display
* Fixed routes
2012-03-01 21:37:24 +04:00
Pavel Chipiga
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
konstantin.grabar
eb689b7f18
[refs #232 ] Add new design and logic refactor for group members action
2012-03-01 19:41:40 +04:00
konstantin.grabar
fc3d4c0b6d
[refs #232 ] Add group members edit page design
2012-03-01 18:23:26 +04:00
George Vinogradov
6eb239385a
[issue #195 ] Fixed bug with creating project
2012-03-01 17:37:35 +04:00
konstantin.grabar
71748ebddc
[refs #232 ] Add design to group new page
2012-03-01 17:19:58 +04:00
konstantin.grabar
f4a50b509c
[refs #232 ] Add edit btn to group public page
2012-03-01 16:37:54 +04:00
konstantin.grabar
157f9a1a68
[refs #232 ] Add sidebar and group edit page
2012-03-01 16:28:38 +04:00
konstantin.grabar
55ff2c7f6b
[refs #195 ] Change new project route and some other changes
2012-03-01 16:10:12 +04:00
George Vinogradov
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
George Vinogradov
fe5ad9ebf3
[issue #195 ] Added missed js. Some changes.
2012-03-01 05:07:31 +04:00
George Vinogradov
bc96fcdcc3
[issue #195 ] Added missed translation.
2012-03-01 03:34:36 +04:00
George Vinogradov
dedd64f976
[issue #195 ] Returned lost files.
2012-03-01 03:29:16 +04:00
Alexander Machehin
bcef305228
[refs #230 ] change title style; remove unused js
2012-03-01 02:19:39 +06:00
Alexander Machehin
cadd1995d1
[refs #230 ] fix forgot password SignUp style
2012-03-01 01:50:08 +06:00
Vladimir Sharshov
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
Vladimir Sharshov
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
Alexander Machehin
5f71d430fc
[refs #230 ] remove wrong js
2012-03-01 00:48:13 +06:00
Alexander Machehin
aea631824f
[refs #230 ] remove debug messages
2012-03-01 00:39:12 +06:00
Alexander Machehin
3a10ed91b2
[refs #194 ] more uniq
2012-03-01 00:33:01 +06:00
konstantin.grabar
5b25ea221b
[refs #195 ] Add default value to is_rpm field for projects
2012-02-29 22:27:57 +04:00
Alexander Machehin
fe0eba8e61
[refs #194 ] fix index page
2012-03-01 00:23:19 +06:00
Vladimir Sharshov
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
George Vinogradov
c3d7221f97
[issue #195 ] Fixed bugs
...
* Highlighting in submenu
* File history
2012-02-29 21:53:14 +04:00
konstantin.grabar
bc75b318ce
[refs #195 ] Merge 3.2-master into 195-new_design_for_projects
2012-02-29 21:37:28 +04:00
Alexander Machehin
3415c6eb9f
Merge branch '3.2-master' into 230-registration_page
2012-02-29 23:25:24 +06:00
Vladimir Sharshov
6e8b48188e
Merge pull request #229 from warpc/228-sign_in
...
[Refs #228 ] sign in
2012-02-29 09:22:42 -08:00
konstantin.grabar
12d8f5e7b8
[refs #232 ] Add new design to some group pages
2012-02-29 21:12:06 +04:00
Alexander Machehin
ba4fae071f
[refs #230 ] error messages
2012-02-29 23:01:30 +06:00
Alexander Machehin
3136159777
[refs #230 ] add red borders to invalid attributes
2012-02-29 22:59:09 +06:00
Alexander Machehin
f4954557b3
[refs #228 ] fix showing error
2012-02-29 22:59:08 +06:00
Alexander Machehin
ee84ac84cf
[refs #228 ] fix I18n
2012-02-29 22:59:08 +06:00
Alexander Machehin
71d9079003
[refs #228 ] fix registration link
2012-02-29 22:59:08 +06:00
Alexander Machehin
a1bfe66791
[refs #228 ] sign_in page
2012-02-29 22:59:08 +06:00
George Vinogradov
5b9d20154b
[issue #195 ] Added translations and maybe missed partials
2012-02-29 20:27:32 +04:00
Vladimir Sharshov
05eac4918f
Fix NoMethodError: undefined method `default_order' for ActiveRecord::Relation
2012-02-29 19:10:01 +04:00
George Vinogradov
662ea4018c
[issue #195 ] Changed commit header on commit page.
2012-02-29 19:08:21 +04:00
George Vinogradov
19dd58800b
[issue #195 ] Added comments to commit.
2012-02-29 19:05:36 +04:00
konstantin.grabar
c5d8041296
[refs #195 ] Add global fixes to projects and collaborators logic
2012-02-29 18:45:04 +04:00
Pavel Chipiga
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
Vladimir Sharshov
b20c533e6b
[Refs #221 ] Fix xml-rpc call
2012-02-29 16:00:02 +04:00
Alexander Machehin
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
Vladimir Sharshov
02cbec8d86
[Refs #221 ] Add xml-rpc call for iso container destroy
2012-02-29 15:15:49 +04:00
Vladimir Sharshov
062b5c71b1
[Refs #221 ] Fix right for platform local admin
2012-02-29 15:13:56 +04:00
Vladimir Sharshov
97c9eab3be
[ Fix #236 ] Add application/octet-stream content type for tar.bz2 product attachment
2012-02-29 13:41:42 +04:00
Alexander Machehin
89a5cf56b2
[refs #228 ] fix submit button style
2012-02-29 15:23:59 +06:00
Vladimir Sharshov
952082f7a0
[ Fix #235 ] Remove wrong clone_platform_product_path url
2012-02-29 13:15:12 +04:00
Alexander Machehin
ad7be07f2f
[refs #228 ] fix showing error
2012-02-29 12:51:10 +06:00
Alexander Machehin
c9067da374
[refs #233 ] fix users menu toggle
2012-02-29 12:40:21 +06:00
Alexander Machehin
8126b49567
[refs #228 ] fix I18n
2012-02-29 11:43:40 +06:00
Alexander Machehin
c55d6d097e
[refs #228 ] fix registration link
2012-02-29 10:41:25 +06:00
George Vinogradov
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
konstantin.grabar
b586c5ddf0
[refs #195 ] Add js hack for sections bigpadding div class
2012-02-29 01:17:04 +04:00
konstantin.grabar
2ec2548390
[refs #195 ] Add base design and functional to project members page
2012-02-29 01:01:25 +04:00
Alexander Machehin
91eb306560
[refs #228 ] sign_in page
2012-02-29 02:43:17 +06:00
konstantin.grabar
577eadbc7c
[refs #195 ] Fix project form submit tag
2012-02-29 00:12:37 +04:00
konstantin.grabar
fa69cd8ee4
[refs #195 ] Fix radio and checkboxes script. Fix project edit and new form
2012-02-28 23:11:08 +04:00
Alexander Machehin
2cb085992b
[refs #194 ] fix submenu for issues
2012-02-28 22:41:03 +06:00
Alexander Machehin
e83e19ea50
[refs #194 ] remove duplicates
2012-02-28 22:36:29 +06:00
Alexander Machehin
c4719f12da
[refs #194 ] some change in the issue managing
2012-02-28 22:33:38 +06:00
Alexander Machehin
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
konstantin.grabar
e9ae923b60
[refs #195 ] Merge 3.2-master into 195-new_design_for_projects
2012-02-28 20:10:31 +04:00
Vladimir Sharshov
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
konstantin.grabar
06795a56be
[refs #195 ] Add sections action ability for projects
2012-02-28 19:44:16 +04:00
Pavel Chipiga
2f39b050ae
Merge branch 'master' into 3.2-master
...
Conflicts:
config/deploy.rb
2012-02-28 17:44:11 +02:00
Alexander Machehin
99e3bbb762
[refs #194 ] update issue content
2012-02-28 21:41:47 +06:00
Pavel Chipiga
07b081cc0d
Fresh up assets. Force production SSL. Refs #223
2012-02-28 17:40:22 +02:00
Vladimir Sharshov
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
Alexander Machehin
f9c834cf4d
Revert "[refs #194 ] return main.scss"
...
This reverts commit 0b8461a5df9f3d9bbca6e3b377164ff4aa4ac4e6.
2012-02-28 20:56:43 +06:00
Alexander Machehin
5abdbd4486
[refs #194 ] return main.scss
2012-02-28 20:37:30 +06:00
konstantin.grabar
39b0beb3ab
[refs #193 ] Fix wrap gollum and wiki page styles
2012-02-28 18:36:04 +04:00
Alexander Machehin
0abea8ff55
[refs #194 ] fix issues count
2012-02-28 20:28:11 +06:00
Alexander Machehin
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
Alexander Machehin
0d75a37451
[refs #194 ] show page beta version
2012-02-28 20:05:18 +06:00
Vladimir Sharshov
7d56267e03
[ Fix #224 ] Alphabetic order category list
2012-02-28 14:35:17 +04:00
Alexander Machehin
66a08662c2
[refs #194 ] new styles; some changes
2012-02-28 15:23:27 +06:00
konstantin.grabar
03663a8ed7
[refs #195 ] Add sections page and method to projects
2012-02-28 12:00:56 +04:00
Pavel Chipiga
e004822bd3
Remove/replace old assets to avoid production bugs. Fix deploy settings.
2012-02-28 01:16:14 +02:00
Pavel Chipiga
70963d0943
Merge branch 'master' into 3.2-master
2012-02-27 22:34:21 +02:00
Pavel Chipiga
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
Vladimir Sharshov
ddda2b92ab
[Refs #221 ] Delete product build lists (only in web)
2012-02-28 00:00:33 +04:00
Pavel Chipiga
7508bb1339
Fix bugs to force new design work. Minor refactor and improvements. Refs #193
2012-02-27 20:58:37 +02:00
Alexander Machehin
2c0e1b6314
Merge branch '3.2-master' into 194-tracker
...
Conflicts:
app/assets/stylesheets/custom.scss
2012-02-27 23:55:18 +06:00
George Vinogradov
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
George Vinogradov
582063d066
[issue #195 ] Commits history, editing, showing...
2012-02-27 21:40:46 +04:00
Pavel Chipiga
1005fbd64f
Add link to product container. Refs #217
2012-02-27 18:21:56 +02:00
Alexander Machehin
27c85d32df
[refs #194 ] create page; index pagination; some bugs
2012-02-27 22:10:12 +06:00
Pavel Chipiga
e1f7817624
Add local admin ability to build product. Fix template links. Refactor. Refs #217
2012-02-27 15:49:24 +02:00
konstantin.grabar
72fec3b314
[refs #195 ] Add owner choose on project create
2012-02-27 13:03:28 +04:00
Pavel Chipiga
1dd20377cf
Fix layout. Refs #193
2012-02-24 23:54:44 +02:00
Pavel Chipiga
4d2459c60c
Refactor, fix and cleanup wiki templates and translations. Refs #193
2012-02-24 23:39:40 +02:00
George Vinogradov
3c83649627
[issue #96 ] Some fixes in layout and scripts.
2012-02-24 23:39:40 +02:00
Alexander Machehin
dde81b5554
[refs #123 ] fix activity feed for commit comments; remove reply notification
2012-02-25 00:25:35 +06:00
Vladimir Sharshov
46a5ab1c76
Merge branch 'master' into 123-activity-feed
...
Conflicts:
config/deploy.rb
db/schema.rb
2012-02-24 20:44:36 +04:00
George Vinogradov
586d4e0bea
Fixed bug with Windows line endings in blob editing.
2012-02-24 20:34:41 +04:00
Vladimir Sharshov
3c8f1c062b
Fix ActivityFeed for user, remove info about password [Refs #207 ]
2012-02-24 20:33:00 +04:00
Vladimir Sharshov
3685eafe57
Remove unused code [Refs #207 ]
2012-02-24 19:35:29 +04:00
Pavel Chipiga
51e2c85b0a
Fix build_for settings. Refs #207
2012-02-24 19:28:01 +04:00
Pavel Chipiga
165a8dd6f4
Build only main repo. Refs #207
2012-02-24 19:28:01 +04:00
Pavel Chipiga
15f78e30a0
Redo platform build_all with sleep and errors rescue. Refs #207
2012-02-24 19:28:00 +04:00
Pavel Chipiga
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
Pavel Chipiga
9015b971aa
Redo clone logic. Split clone process for repositories. Optimize and refactor. Refs #207
2012-02-24 19:28:00 +04:00
Pavel Chipiga
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
Pavel Chipiga
7c273c022b
Remove raise. Refs #207
2012-02-24 19:27:59 +04:00
Pavel Chipiga
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
Pavel Chipiga
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
Alexander Machehin
30f47a1748
[refs #134 ] lost env!
2012-02-24 19:27:57 +04:00
Alexander Machehin
a809a4c116
[refs #134 ] fixed bug with new project
2012-02-24 19:27:57 +04:00
George Vinogradov
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
Alexander Machehin
41861185c0
[refs #134 ] fixed git hook
2012-02-24 19:27:56 +04:00
George Vinogradov
5986cd6dde
[issue #64 ] Removed debug methods and unnecessary comments.
2012-02-24 19:27:55 +04:00
Pavel Chipiga
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
George Vinogradov
43c896021e
[issue #64 ] Added possibility to diff and revert last commit
2012-02-24 19:27:55 +04:00
George Vinogradov
1bc4efcdc4
[issue #64 ] Fixed encodings bugs
2012-02-24 19:27:54 +04:00
Pavel Chipiga
bda978a306
Fix bug with group autocomplete. Do not delete during rsync
2012-02-24 17:27:49 +02:00
konstantin.grabar
3c5cdfd5e4
[refs #195 ] Add is_rpm field to projects. Continue set new design
2012-02-24 17:05:58 +04:00
konstantin.grabar
28e2494e14
[refs #123 ] Remove stubs controller
2012-02-24 15:26:50 +04:00
Pavel Chipiga
dde34cdffb
Fix build_for settings. Refs #207
2012-02-23 22:20:44 +02:00
Pavel Chipiga
86c717dee5
Build only main repo. Refs #207
2012-02-23 21:06:28 +02:00
Pavel Chipiga
66fc31e404
Redo platform build_all with sleep and errors rescue. Refs #207
2012-02-23 20:32:56 +02:00
Alexander Machehin
a6a51225b8
[refs #194 ] some js refactoring
2012-02-23 22:16:04 +06:00
Alexander Machehin
027012d3e5
[refs #194 ] some refactotring
2012-02-23 21:57:51 +06:00
Alexander Machehin
9e5e7cd5e4
[refs #194 ] labels manage
2012-02-23 20:48:46 +06:00
Pavel Chipiga
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
George Vinogradov
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
George Vinogradov
43b7ccd3dc
[issue #195 ] Added blob show. Some changes.
2012-02-23 02:11:55 +04:00
Pavel Chipiga
9eb191da7b
Redo clone logic. Split clone process for repositories. Optimize and refactor. Refs #207
2012-02-22 22:24:29 +02:00
konstantin.grabar
ba1798fd71
[refs #195 ] Add design to form and edit page
2012-02-22 21:48:37 +04:00
Pavel Chipiga
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
Pavel Chipiga
5829ab87e9
Remove raise. Refs #207
2012-02-21 23:43:06 +02:00
Pavel Chipiga
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
Alexander Machehin
ecb29d1762
[refs #194 ] tags -> labels
2012-02-22 02:28:04 +06:00
konstantin.grabar
3a48f8dea9
[refs #193 ] Add lost file with wiki_history checkboxes script
2012-02-21 20:11:16 +04:00
George Vinogradov
328cd17f46
[issue #195 ] Fixed bug in CommitPresenter
2012-02-21 19:51:48 +04:00
George Vinogradov
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
konstantin.grabar
81393d7f5b
[refs #193 ] Disable more than 2 versions for wiki diff by js
2012-02-21 16:42:09 +04:00
konstantin.grabar
9b610eb920
[refs #193 ] Fixed old commented code from old template versions. Fix diff page
2012-02-21 14:49:06 +04:00
Pavel Chipiga
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
Alexander Machehin
0ce76207af
[refs #194 ] Add issue tags
2012-02-21 00:41:40 +06:00
Alexander Machehin
5dcc4eabf8
[refs #194 ] tracker without tags manage
2012-02-20 22:54:45 +06:00
konstantin.grabar
2bdcdb6fd3
[refs #193 ] Fix compare buttons and links design
2012-02-20 14:27:58 +04:00
konstantin.grabar
f22d9809ff
[refs #193 ] Remove debug puts from wiki controller
2012-02-20 14:02:04 +04:00
Alexander Machehin
76beb6a277
[refs #194 ] add creator to issue
2012-02-19 23:28:43 +06:00
George Vinogradov
43a268371f
[issue #203 ] Some changes in ApplicationPresenter
2012-02-19 03:21:34 +04:00
George Vinogradov
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
konstantin.grabar
d9025b093f
[refs #193 ] Compare routes repair and compare design
2012-02-17 18:12:05 +04:00
George Vinogradov
4bdc763ef0
Merge branch '3.2-master' into 195-new_design_for_projects
2012-02-17 18:02:43 +04:00
konstantin.grabar
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
konstantin.grabar
d8a3983b07
[refs #193 ] Add new design to wiki
2012-02-17 15:13:54 +04:00
George Vinogradov
608faf3564
[issue #96 ] Some fixes in layout and scripts.
2012-02-17 03:07:22 +04:00
Alexander Machehin
a5375c369c
[refs #134 ] lost env!
2012-02-16 22:29:41 +06:00
Alexander Machehin
4888993c3f
[refs #134 ] fixed bug with new project
2012-02-16 21:08:08 +06:00
Vladimir Sharshov
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
konstantin.grabar
c140c1b466
Merge branch '194-project_submenu' into 193-new_design_for_wiki
2012-02-16 12:23:41 +04:00
Alexander Machehin
55379ed9c8
[refs #194 ] first steps
2012-02-16 00:53:58 +06:00
Alexander Machehin
fab80d97eb
[refs #194 ] project submenu partial
2012-02-15 22:32:26 +06:00
George Vinogradov
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
konstantin.grabar
0763936e38
[refs #193 ] Wiki navigation design
2012-02-15 19:01:49 +04:00
Alexander Machehin
eaa6a46a43
[refs #96 ] fixed commit subscribing
2012-02-15 19:07:56 +06:00
Alexander Machehin
20836e8864
[refs #134 ] fixed git hook
2012-02-15 17:12:49 +06:00
Vladimir Sharshov
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
George Vinogradov
5b7d1a79d0
[issue #64 ] Removed debug methods and unnecessary comments.
2012-02-15 02:13:52 +04:00
Alexander Machehin
da0d791f74
[refs #96 ] fixed commentable & subscribeable ids
2012-02-15 02:28:01 +06:00
Pavel Chipiga
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
konstantin.grabar
101fa63514
Small ActivityFeed refactoring
2012-02-14 20:46:08 +04:00
konstantin.grabar
08ffd8c25d
[refs #123 ] Add wiki to ActivityFeed
2012-02-14 20:09:41 +04:00
Pavel Chipiga
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
George Vinogradov
e9c5273136
[issue #64 ] Added possibility to diff and revert last commit
2012-02-14 18:54:44 +04:00
George Vinogradov
85723f7da6
[issue #64 ] Fixed encodings bugs
2012-02-14 18:54:18 +04:00
konstantin.grabar
5039907431
Merge branch 'master' into 123-activity-feed
2012-02-14 14:30:27 +04: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
99ee490e94
[issue #64 ] Added callback for notifications + some minor changes
2012-02-14 03:30:17 +04:00
George Vinogradov
159bf21810
Merge branch 'master' into 64-project_wiki
2012-02-14 02:29:32 +04:00
Vladimir Sharshov
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
George Vinogradov
4dcc39975d
[issue #133 ] Fixed redirection bugs
2012-02-13 23:04:41 +04:00
Vladimir Sharshov
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
George Vinogradov
c26962c216
[issue #133 ] Added redirects if cannot find Blob object
2012-02-13 22:45:45 +04:00
George Vinogradov
e4da6057a5
[issue #64 ] Changed authorization filters
2012-02-13 22:28:43 +04: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
Vladimir Sharshov
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
Pavel Chipiga
c6f9995b98
Add GA code to layouts and invite pages. Do not track admins. Refs #183
2012-02-13 18:42:11 +02:00
George Vinogradov
50d27ad34d
[issue #171 ] Added ACL calls to project navigation.
2012-02-13 20:16:50 +04:00
George Vinogradov
8c0cd29f0e
[issue #133 ] Fixed bug with no acl on editing blobs
2012-02-13 19:21:00 +04:00
konstantin.grabar
391716fee5
[refs #133 ] Fix syntax error into blob template
2012-02-13 14:43:57 +04:00
konstantin.grabar
1356ffa437
[refs #178 ] Fix project create error with group owner
2012-02-13 14:23:20 +04:00
konstantin.grabar
9271c15a5f
[refs #123 ] Add new commits support
2012-02-10 21:33:05 +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
8417e8c16f
[issue #174 ] multiupdate in admin view.
2012-02-10 15:18:40 +04:00
George Vinogradov
a17f548168
[issue #174 ] Fixed bugs
2012-02-10 14:04:15 +04:00
Pavel Chipiga
e535ca2b64
Fix validations. Refs #174
2012-02-10 01:33:06 +02:00
George Vinogradov
d0fe7f55d5
[issue #174 ] added static pages and some changes
2012-02-10 02:57:43 +04:00
George Vinogradov
f9e7f3fb06
[issue #174 ] Devise hacks
2012-02-10 01:45:26 +04:00
George Vinogradov
edef21068d
[issue #174 ] Fixed bug with RegisterRequest
2012-02-10 01:44:47 +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
a4baf8b670
[issue #133 ] Editor JS moved to separate file
2012-02-09 04:35:07 +04:00
George Vinogradov
ffe2608c32
[issue #133 ] Some makeup and a lot of encodings magic
2012-02-09 04:27:26 +04:00
George Vinogradov
e23a02d357
[issue #133 ] Some fixes in Git::Repository#update_file
2012-02-09 04:03:40 +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
d44a274c77
[issue #133 ] Fixed bug and added comments
2012-02-09 00:56:18 +04:00
Vladimir Sharshov
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
George Vinogradov
74d401d087
[issue #133 ] Writed draft of web editing.
2012-02-08 21:51:30 +04:00
Alexander Machehin
02217752af
[refs #169 ] fix creating build list on empty repository
2012-02-08 17:07:16 +06:00
Alexander Machehin
c47db56270
[refs #168 ] can read repos in the open platform
2012-02-07 19:55:45 +06:00
Alexander Machehin
325667dde0
[refs #168 ] removed wrong ability
2012-02-07 17:31:00 +06:00
Vladimir Sharshov
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
Alexander Machehin
86704bc39d
[refs #155 ] fix render event logs
2012-02-07 15:31:07 +06:00
Vladimir Sharshov
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
Alexander Machehin
36f609ec7d
[refs #143 ] fix destroy
2012-02-07 01:47:39 +06:00
konstantin.grabar
96d3b35bdf
[refs #123 ] Merge master into 123-activity-feed
2012-02-06 19:46:32 +04:00
Vladimir Sharshov
4e3d6b4056
Show xml-rpc error code in error message
2012-02-06 19:07:08 +04:00
Vladimir Sharshov
c367fc818b
Merge branch 'master' of github.com:warpc/rosa-build
2012-02-06 19:05:50 +04:00
konstantin.grabar
a83d64eaab
[refs #150 ] Fix collaborators cancan authorize
2012-02-06 19:04:56 +04:00
Alexander Machehin
70346f0015
[refs #151 ] refactoring
2012-02-06 20:12:33 +06:00
Alexander Machehin
a79a081fd1
Merge branch 'master' into 151-grit_encodings_problems
2012-02-06 19:55:59 +06:00
Alexander Machehin
60ec9867bb
[refs #163 ] fix commits list
2012-02-06 18:58:45 +06:00
Alexander Machehin
fde67a2c22
[refs #134 ] add post receive hook to repos
2012-02-06 15:31:22 +06:00
Vladimir Sharshov
427fc670ac
Merge branch 'master' of github.com:warpc/rosa-build
2012-02-06 11:57:09 +04:00
George Vinogradov
f2bfcf8699
[issue #151 ] Probably fixed.
2012-02-05 00:12:37 +04:00
George Vinogradov
0591ba4378
[ fix #158 ] Fixed bug with render in BlobController#raw
2012-02-04 22:03:29 +04:00
Vladimir Sharshov
28da24d020
Merge branch 'master' of github.com:warpc/rosa-build
2012-02-03 19:49:56 +04:00
Alexander Machehin
87abfb4352
[refs #64 ] fixed forbidden redirection after signin
2012-02-03 21:28:19 +06:00
Vladimir Sharshov
85c0d8b827
Change git branch for mass rebuild
2012-02-03 18:32:04 +04:00
Alexander Machehin
b0d0b21ec4
[refs #144 ] fix template
2012-02-03 19:40:47 +06:00
George Vinogradov
549fc242d8
[issue #64 ] Fixed bug in _history partial
2012-02-03 04:23:29 +04:00
George Vinogradov
a2f07fad10
Merge branch '64-project_wiki' of github.com:warpc/rosa-build into 64-project_wiki
2012-02-03 04:05:18 +04:00
George Vinogradov
e05f391f8e
[issue #64 ] Write User.uname instead of User.name to commit
2012-02-03 04:04:20 +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
68c97b3a33
[refs #64 ] some template fixes
2012-02-03 00:46:33 +06:00
George Vinogradov
821062c150
Merge branch '64-project_wiki' of github.com:warpc/rosa-build into 64-project_wiki
2012-02-02 03:18:53 +04:00
George Vinogradov
4cd20934c4
[issue #64 ] Removed unused MathJax
2012-02-02 03:17:16 +04:00
George Vinogradov
0006bf3b63
Returned before_initialize to Group.
2012-02-02 01:20:10 +04:00
Alexander Machehin
cb7a9fcc21
fix group autocomplete
2012-02-02 02:42:23 +06: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
konstantin.grabar
0559f1b678
[refs #127 ] Filter request refactor
2012-02-01 20:00:19 +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
Pavel Chipiga
34b105675a
Add 1 more mime type to product
2012-01-31 23:29:25 +02:00
Pavel Chipiga
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
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