Commit Graph

256 Commits

Author SHA1 Message Date
Pavel Chipiga 89f31e9782 Minor gems update. Prepare gemfile for jruby and rbx tests. Remove encoding hacks. Apply grit fixes for encoding support. Recode incorrect encodings. Refactor, cleanup and fix lots bugs in git section. Refactor and remove unused git routes. Translate some untranslated parts. Redo branch/tags selector. Fix files tree last commit message. Project section templates refactor and cleanup. Refs #190 2012-03-21 21:55:14 +02:00
Vladimir Sharshov abe06b5068 Merge pull request #305 from warpc/223-monitoring_design
[Refs #223] monitoring design for current task
2012-03-19 03:28:30 -07:00
Alexander Machehin 30038f4c9c [refs #265] show 10 symbols of the commit hash 2012-03-19 15:58:30 +06:00
konstantin.grabar 348fd40daf [refs #223] Fix build status color helpers 2012-03-19 12:39:46 +04:00
konstantin.grabar b3d7091db0 Merge 3.2-master into 223-monitoring_design 2012-03-19 10:41:30 +04:00
konstantin.grabar 4b26eebeca [refs #223] Add new design to build list task page 2012-03-18 12:20:31 +04:00
George Vinogradov 747edb73a5 [issue #279] Merge branch '3.2-master' into 279-new_design_for_platforms
Conflicts:
	db/schema.rb
2012-03-14 21:43:08 +04:00
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
Vladimir Sharshov b07d81644a [Refs #223] Monitoring colors code in index page 2012-03-13 15:04:29 +04:00
George Vinogradov 535c075d3e [issue #279] Added platform main page, menu & sidebar 2012-03-12 03:08:50 +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
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
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
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
konstantin.grabar 9565d58e8f [refs #257] Merge 3.2-master into 257-new_design_for_profiles 2012-03-06 20:13:53 +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
George Vinogradov 93e2caccc8 [issue #195] Added blame view. 2012-03-05 19:29:05 +04: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
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 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
George Vinogradov b3750f8644 [issue #195] Fixed branch selector. 2012-03-02 20:48:19 +04:00
Alexander Machehin 7164dd580e [refs #230] fix error messages + some refactoring 2012-03-02 18:27:38 +06:00
George Vinogradov 6cfb5d0c3d [issue #195] Fixed bug with encodings. Added avatar. Stubbed blame. 2012-03-02 04:39:43 +04: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
George Vinogradov 4b024d1728 [issue #195] Fixes.
*  Fixed translations
  *  Fixed blob display
  *  Fixed routes
2012-03-01 21:37:24 +04:00
George Vinogradov fe5ad9ebf3 [issue #195] Added missed js. Some changes. 2012-03-01 05:07:31 +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
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
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 e9ae923b60 [refs #195] Merge 3.2-master into 195-new_design_for_projects 2012-02-28 20:10:31 +04: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 27c85d32df [refs #194] create page; index pagination; some bugs 2012-02-27 22:10:12 +06: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
George Vinogradov 1bc4efcdc4 [issue #64] Fixed encodings bugs 2012-02-24 19:27:54 +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
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
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
George Vinogradov 99ee490e94 [issue #64] Added callback for notifications + some minor changes 2012-02-14 03:30:17 +04:00
George Vinogradov 74d401d087 [issue #133] Writed draft of web editing. 2012-02-08 21:51:30 +04:00
konstantin.grabar 96d3b35bdf [refs #123] Merge master into 123-activity-feed 2012-02-06 19:46:32 +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
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
George Vinogradov e05f391f8e [issue #64] Write User.uname instead of User.name to commit 2012-02-03 04:04:20 +04:00
George Vinogradov 8733c4dc34 [issue #64] Some dirty hacks.
Diff for file with russian name don't work yet.
2012-02-01 03:20:42 +04:00
George Vinogradov 6f78e5456c [issue #64] Changes for ruby 1.9.3 compatibility. 2012-01-31 20:40:46 +04:00
George Vinogradov 24124766f4 [issue #64] Merge branch 'master' into 64-project_wiki
Conflicts:
	Gemfile.lock
	config/locales/en.yml
	db/schema.rb
2012-01-31 02:07:11 +04:00
George Vinogradov 07e71c2dfc [issue #64] Changed find_by to where 2012-01-31 01:20:03 +04:00
Pavel Chipiga 13780a1b53 Add magic encodings. Refs #95 2012-01-30 22:39:34 +02:00
George Vinogradov 2a27cd3662 [issue #64] Some fixes. 2012-01-30 19:27:54 +04:00
George Vinogradov 5f40030e30 [issue #64] Fixed bug with cloning wiki repository 2012-01-30 18:17:00 +04:00
George Vinogradov 706c052a5e [issue #64] User names are clickable. 2012-01-29 22:03:42 +04:00
George Vinogradov acdd1f22b6 [issue #64] Fixed bug with revert all wiki. 2012-01-28 16:10:43 +04:00
George Vinogradov 324e9a294f [issue #64] Fixed some bugs. 2012-01-27 22:30:45 +04:00
George Vinogradov 549f0a55e8 [issue #64] Merge branch 'master' into 64-project_wiki
Conflicts:
	Gemfile.lock
	app/models/project.rb
	app/models/user.rb
	app/views/projects/_form.html.haml
	config/locales/ru.yml
	db/schema.rb
2012-01-27 18:27:23 +04:00
konstantin.grabar 0eb0eb9713 [refs #123] Activity Feed logic global refactoring. 2012-01-26 21:04:58 +04:00
konstantin.grabar 990a46018c [refs #123] Add base logic for activity feed 2012-01-25 12:31:49 +04:00
konstantin.grabar f46b179486 [refs #113] Add json to mime types list 2012-01-20 22:40:00 +04:00
konstantin.grabar 23ace52d90 [refs #113] Images render and download href for binary data into blobs 2012-01-20 22:31:01 +04:00
George Vinogradov 011efb0c4b [issue #64] Added git access to Wiki. 2012-01-20 19:01:59 +04:00
George Vinogradov 364f2e40c0 [issue #64] Added Wiki history, compare, revert. 2012-01-20 03:25:15 +04:00
George Vinogradov 0c527af291 [issue #64] Added revisions comparsion. 2012-01-19 17:49:32 +04:00
George Vinogradov 7afcc3a617 [issue #64] Some fixes. 2012-01-18 18:33:09 +04:00
George Vinogradov 2522dd3c63 [issue #64] Added page history views. 2012-01-18 03:30:54 +04:00
George Vinogradov 1e1dab369b [issue #64] Added some views, styles and scripts.
*  Added base gollum styles
*  Added base gollum javascripts (with minor changes)
*  Fixed some bugs in WikiController
*  Added some views (draft yet)
2012-01-17 01:48:38 +04:00
George Vinogradov 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
konstantin.grabar 2b8aca5f09 [refs #54] Add settings notifier 2012-01-11 17:58:13 +04:00
George Vinogradov 81378478ca [issue #64] Added Wiki controller and some methods in Project 2011-12-26 21:07:07 +04:00
konstantin.grabar ce6746f7a9 [refs #54] Add subscribes and notifications 2011-12-26 19:48:57 +04:00
konstantin.grabar d20d43eb2b [refs #54] Base logic and templates for issues and comments to them 2011-12-19 19:30:14 +04:00
Pavel Chipiga 796ff75857 Great models refactoring. Refactor some cancan abilities and controllers authorization. Move some common parts to modules. Fix lots bugs. Remove unused files and code. Drop ACL tables. Add more can? helpers. Refs #2249 2011-11-24 23:48:58 +02:00
Pavel Chipiga a9026bd6f8 Change git_repo_url logic. Refs #2261 2011-11-22 20:58:23 +02:00
Pavel Chipiga 3b36943b91 Remove gitolite and it callbacks. Add git repo create, destroy callbacks. Improve grack wrappers: separate read/write requests, ask password for push even for public repo, prepare for cancan, apply hooks, refactor. Fix auto_build_lists order. Refactor auto_build - move to model. Redo git_repo_url. Improve and test project import script. Fix bugs, refactor and cleanup. Refs #2243 2011-11-17 23:57:30 +02:00
Pavel Chipiga 7996740ae7 Improve build_lists time. Apply product build lists basic functionality. Move product build functionality to separate controller. Apply event logging for product build. Fix logging for project build list publishing. Code refactor and cleanup. Refs #2161 2011-11-11 19:13:09 +02:00
Pavel Chipiga da784b0bc2 Improve git_repo_url helper. Refs #2162 2011-11-10 11:04:24 +02:00
konstantin.grabar 92011e493b [refs #2161] Add new titles to application 2011-11-02 00:18:52 +04:00
George Vinogradov b9ee6e365b Added collaborators management. 2011-10-31 02:59:03 +04:00
konstantin.grabar 30564e8e17 [refs #2161] Add auto build lists functional 2011-10-29 23:09:50 +04:00
Pavel Chipiga f66216fa6a Change project redirect rules. Fux git repo clone port. Refs #2136 2011-10-28 01:44:02 +03:00
konstantin.grabar 89312375fd Merge master and personal_repos 2011-10-27 17:13:53 +04:00
konstantin.grabar 3114eb1ecc [refs #2106] Add personal repos to project. Some changes of private repos controller and logic 2011-10-27 17:04:03 +04:00
Pavel Chipiga 7b9fa26ac8 Remove git_projects_path application config var. usr root_path instead. Fix bugs. Improve links, usability, refactor. Refs #2136 2011-10-27 15:49:26 +03:00
Pavel Chipiga 0171a0a42a Apply basic git repo functionality operation: add, change, destroy user ssh_key. Create, destroy, open/close project git repos. Calc project owner. Improve UI for users, groups and projects: fix links and routes, add actions refactor. Other minor fixes and refactoring. Add ssh_key uniqness check. Add uname uniqness check between User and Group. Check project owner ssh_key existance before project creation. Temporary disable uname and unixname change due to gitolite stranges. Refs #2136 2011-10-26 23:57:51 +03:00
konstantin.grabar d04de6e2fc [refs #1832] Fixed git repos web interface routes 2011-10-24 14:19:04 +04:00
George Vinogradov 1659ad5805 Merge branch 'private_repos'
Conflicts:
	config/application.yml.sample
	config/locales/ru.yml
	config/routes.rb
	db/schema.rb
2011-10-20 19:49:35 +04:00
santaux 5f17928423 [refs #1923] Add private repositories to project 2011-10-18 17:47:17 +04:00
santaux 8103b14e15 [refs #1861] Add downloads statistics 2011-10-14 10:35:25 +04:00
Alexey Nayden cd6e7ade15 Product Builder xml-rpc and Product model 2011-04-11 12:35:08 +04:00
Timothy N. Tsvetkov 6120547800 AwEsOmE blame + minor fixes 2011-04-04 15:28:33 +04:00
Timothy N. Tsvetkov efbd64e924 the aWeSOME commit view (with REALLY AWESOME view for git diffs) 2011-04-01 07:44:21 +04:00
Timothy N. Tsvetkov 5135f048a5 some views for git 2011-04-01 04:36:34 +04:00
Alexey Nayden c116f23b7e even more minor ui fixes 2011-03-31 16:13:04 +04:00
Alexey Nayden 002dc417b5 Container/Arch/Rpm 2011-03-16 00:52:27 +03:00
Timothy N. Tsvetkov 5bc5638934 friday fixes lets drink vodka for your money very well 2011-03-11 20:19:47 +03:00
Timothy N. Tsvetkov 5d4ca333da commit and diff helpers 2011-03-10 16:33:50 +03:00
Alexey Nayden 0a7c0e4e9b Platforms list + UI enchancements 2011-03-10 14:35:46 +03:00
Alexey Nayden af3c9b52be Hoptoad + blank platforms#index 2011-03-09 22:27:51 +03:00
Alexey Nayden eae3c46912 Initial commit 2011-03-09 16:13:36 +03:00