Commit Graph

67 Commits

Author SHA1 Message Date
Alexander Machehin d18e55f180 [refs #340] titles - part2 2012-03-30 22:37:54 +06:00
Alexander Machehin 6864f22b35 [refs #193] remove button style from delete page link 2012-03-23 21:56:21 +06:00
Alexander Machehin 86bd036418 [refs #193] changes in wiki 2012-03-23 21:36:47 +06:00
Pavel Chipiga 90e027b8a6 Remove old project load. Fix project routes. Fix wiki history avatar load. Refs #190 2012-03-21 23:52:40 +02:00
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
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
Pavel Chipiga e3f0b2fce2 Fix gravatar url 2012-03-06 22:16:31 +02: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
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
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 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
Pavel Chipiga 7508bb1339 Fix bugs to force new design work. Minor refactor and improvements. Refs #193 2012-02-27 20:58:37 +02:00
Pavel Chipiga 4d2459c60c Refactor, fix and cleanup wiki templates and translations. Refs #193 2012-02-24 23:39:40 +02: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
konstantin.grabar 2bdcdb6fd3 [refs #193] Fix compare buttons and links design 2012-02-20 14:27:58 +04:00
konstantin.grabar d9025b093f [refs #193] Compare routes repair and compare design 2012-02-17 18:12:05 +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
konstantin.grabar 0763936e38 [refs #193] Wiki navigation design 2012-02-15 19:01:49 +04: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
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 50d27ad34d [issue #171] Added ACL calls to project navigation. 2012-02-13 20:16:50 +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 0591ba4378 [fix #158] Fixed bug with render in BlobController#raw 2012-02-04 22:03:29 +04: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
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
Alexander Machehin 20613ba2c3 [refs #64] All pages: 2012-02-02 01:36:56 +06: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 5f40030e30 [issue #64] Fixed bug with cloning wiki repository 2012-01-30 18:17:00 +04:00
George Vinogradov f7c58f6a77 [issue #64] Removed unnecessary files. 2012-01-30 13:12:18 +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 aa5641da2f [issue #64] Fixed CanCan bugs. 2012-01-28 06:05:13 +04:00
George Vinogradov 2ab039cc62 [issue #64] Some fixes in view. 2012-01-28 05:56:27 +04:00
George Vinogradov a4f95e3660 [issue #64] Changed editor toolbar. 2012-01-27 21:00:44 +04:00
George Vinogradov 3cb426a508 [issue #64] Added cancan restrictions. 2012-01-26 20:26:21 +04:00
George Vinogradov 45877e8b5c [issue #64] Bug fix & views refactoring
*  Fixed bug with history
*  Navigation moved to partial.
2012-01-25 00:47:55 +04:00
George Vinogradov 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