Go to file
devin c8aa50ee87 Lots of Update
1. CSS to SCSS
2. Journal Paper update

Conflicts:
	Gemfile.lock
	app/assets/javascripts/orbitdesktop.js
	app/assets/stylesheets/desktop/desktop-main.css
	vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_author_relations/index.html.erb
	vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_authors/index.html.erb
	vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/index.html.erb
	vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/journal_type.html.erb
2013-04-17 14:14:23 +08:00
app Lots of Update 2013-04-17 14:14:23 +08:00
config fix for both part and page part settings 2013-04-17 14:12:52 +08:00
db split db/seeds.rb file to local plugin and done journal 2013-02-26 15:52:20 +08:00
doc init rails 2.3.2 2009-05-08 00:53:18 +08:00
lib fix for both part and page part settings 2013-04-17 14:12:52 +08:00
log relpace seminar to conference 2013-02-04 18:01:38 +08:00
patch Put impressionist delayed job in a patch 2013-01-08 12:45:15 +08:00
public 1.make module app forbid unearthed access except from admin 2013-04-17 10:56:15 +08:00
script remove useless script 2011-04-13 19:18:40 +08:00
solr/conf First version of Solr search. 2012-08-08 10:59:55 +08:00
spec modularize factories 2013-02-04 18:01:42 +08:00
tmp New and Announcement search. Disabled impression. 2012-07-20 15:47:40 +08:00
vendor Lots of Update 2013-04-17 14:14:23 +08:00
.gitignore Lots of Update 2013-04-17 14:14:23 +08:00
.rspec Merge with sub_roles 2011-12-23 18:34:21 +08:00
Gemfile Lots of Update 2013-04-17 14:14:23 +08:00
Gemfile.lock compatibility page added and tinyscrollbar drag event fixed.. 2013-04-17 13:59:16 +08:00
Guardfile Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member 2012-10-30 10:11:51 +08:00
README.md Update README 2011-04-13 19:06:09 +08:00
Rakefile God , Resque, Resque-schedule, is working,but buggy. Need to combine with LDAP and also implement XML calendar sync. 2012-05-08 20:21:28 +08:00
config.ru Replace PrototypeR4 by Orbit. 2012-03-16 14:58:32 +08:00
dump.rdb New and Announcement search. Disabled impression. 2012-07-20 15:47:40 +08:00

README.md

Ruling Orbit

RulingSite-s Version 4