Commit Graph

68 Commits

Author SHA1 Message Date
Pavel Chipiga 46f6b519cd Fix path to asset. Refs #325 2012-03-24 01:02:38 +02:00
Vladimir Sharshov ef5c4a1b7b Merge branch '325-new_error_pages_design' of github.com:warpc/rosa-build into 325-new_error_pages_design
Conflicts:
	public/404.html
	public/500.html
2012-03-23 18:07:55 +04:00
Vladimir Sharshov 8a3592e211 [Refs #325] Fix alt text for pages 2012-03-23 18:05:44 +04:00
konstantin.grabar 672cdffcf5 [refs #325] Fix image routes. Add serach bar. 2012-03-23 13:16:30 +04:00
konstantin.grabar 8f9824f176 [refs #325] Fix error pages titles 2012-03-22 17:18:40 +04:00
konstantin.grabar 9cee7d97db [refs #325] Remove unnessecary scripts including form error pages 2012-03-22 16:17:46 +04:00
konstantin.grabar 21c33b384b [refs #325] Add new design to error pages 2012-03-22 11:16:56 +04:00
Pavel Chipiga 2f39b050ae Merge branch 'master' into 3.2-master
Conflicts:
	config/deploy.rb
2012-02-28 17:44:11 +02:00
Vladimir Sharshov fd5f9d13d7 Fix bug in invite page (separator beyond the boundary ) 2012-02-28 15:08:17 +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
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 99c314fb11 [issue #133] Merge branch 'master' into 133-editing_from_web
Conflicts:
	db/schema.rb
2012-02-13 21:48:40 +04:00
Pavel Chipiga c6f9995b98 Add GA code to layouts and invite pages. Do not track admins. Refs #183 2012-02-13 18:42:11 +02:00
Vladimir Sharshov 47399a957f Update doc link 2012-02-11 00:36:45 +04:00
Pavel Chipiga 704c544cbc Add more register_requests fields, change design. Apply invitation mail sending. Refactor. Refs #174 2012-02-10 18:33:16 +02:00
George Vinogradov d0fe7f55d5 [issue #174] added static pages and some changes 2012-02-10 02:57:43 +04:00
George Vinogradov a4baf8b670 [issue #133] Editor JS moved to separate file 2012-02-09 04:35:07 +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 009b1374a2 [issue #133] Fixed commits display 2012-02-08 21:52:13 +04:00
George Vinogradov 4cd20934c4 [issue #64] Removed unused MathJax 2012-02-02 03:17:16 +04:00
George Vinogradov 7974893e01 [issue #64] Fixed bug with links in markdown. 2012-01-28 05:41:28 +04:00
Alexander Machehin 7cc354f4d7 Merge branch '64-project_wiki' of github.com:warpc/rosa-build into 64-project_wiki 2012-01-27 21:24:56 +06:00
Alexander Machehin 5caabac555 [refs #64] fix hide gollum-dialog 2012-01-27 21:19:57 +06: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
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 2af0135fb5 [issue #64] Added All Pages representation. 2012-01-18 19:09:25 +04:00
George Vinogradov 0386c34246 [issue #64] Added page deletion. 2012-01-18 18:33:35 +04:00
George Vinogradov 931aef4db6 [issue #64] Fixed some bugs in templates. 2012-01-18 04:47:01 +04:00
George Vinogradov d3b32e4d6d [issue #64] Fixed bug with preview page. 2012-01-18 04:43:36 +04:00
George Vinogradov 2522dd3c63 [issue #64] Added page history views. 2012-01-18 03:30:54 +04:00
George Vinogradov 62922c30a3 [issue #64] Added search partial. 2012-01-17 04:05:07 +04:00
George Vinogradov 1e1dab369b [issue #64] Added some views, styles and scripts.
*  Added base gollum styles
*  Added base gollum javascripts (with minor changes)
*  Fixed some bugs in WikiController
*  Added some views (draft yet)
2012-01-17 01:48:38 +04:00
konstantin.grabar 52696791f2 [refs #54, #94] Merge master into issues 2012-01-16 13:42:44 +04:00
konstantin.grabar db0a66846b [refs #94] Add new notifier rules. Fix some issues and comments bugs 2012-01-13 19:07:01 +04:00
George Vinogradov 8d35c14fc1 [update #76] Added forgotten files. 2012-01-13 17:48:48 +04:00
George Vinogradov 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
George Vinogradov 7c50b2c3f5 [issue #76] Added jQuery DataTable. But it doesn't work yet 2011-12-31 02:42:58 +04:00
konstantin.grabar b48ffecc28 [refs #54] Add new styles to comments list to issue page 2011-12-27 17:52:48 +04:00
Pavel Chipiga 7f58a52602 Autocheck current save platform and disable unavailable base platforms on JS level. Refs #65 2011-12-21 19:51:55 +02:00
Pavel Chipiga 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
konstantin.grabar 96d4886f49 [refs #2249] Add new ACL relations 2011-12-01 18:20:24 +04:00
konstantin.grabar e50959e205 [refs #2249] Add full rules, helpers and filters of CanCan 2011-11-19 15:41:11 +04:00
konstantin.grabar 680f78475a [refs #2161] Remove public/downloads from repo 2011-10-31 14:30:12 +04:00
konstantin.grabar 4e0617a722 [refs #2161] Swap bpl and pl fields into BuildList 2011-10-29 16:18:41 +04:00
konstantin.grabar 6238012fa9 [refs #2106] Move visibility logic to platforms 2011-10-28 11:20:13 +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
konstantin.grabar 9c182f0bda Merge master and build_lists_queue 2011-10-24 14:40:36 +04:00
George Vinogradov 82d72a851c ACL for testing. 2011-10-24 01:39:44 +04:00