developers/orbit-basic

0 Fork 0

T

chris b40d4702d5 Merge branch 'master' into various_bugs

Conflicts:
	config/locales/en.yml
	config/locales/zh_tw.yml
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/_form.html.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/_form.html.erb

2012-11-06 11:44:00 +08:00

Merge branch 'master' into various_bugs

2012-11-06 11:44:00 +08:00

Merge branch 'master' into various_bugs

2012-11-06 11:44:00 +08:00

upgrade to rails3, but grip is broken

2010-03-08 16:04:05 +08:00

init rails 2.3.2

2009-05-08 00:53:18 +08:00

Merge branch 'master' into various_bugs

2012-11-06 11:44:00 +08:00

merge

2012-10-01 21:09:09 +08:00

Merge branch 'master' into various_bugs

2012-11-06 11:44:00 +08:00

remove useless script

2011-04-13 19:18:40 +08:00

First version of Solr search.

2012-08-08 10:59:55 +08:00

Merge branch 'master' into various_bugs

2012-11-06 11:44:00 +08:00

New and Announcement search. Disabled impression.

2012-07-20 15:47:40 +08:00

Merge branch 'master' into various_bugs

2012-11-06 11:44:00 +08:00

.gitignore

Merge branch 'various_bugs' into nccu_master

2012-10-29 16:10:07 +08:00

.rspec

Merge with sub_roles

2011-12-23 18:34:21 +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

Gemfile

Merge branch 'various_bugs' into nccu_master

2012-10-29 16:10:07 +08:00

Guardfile

Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member

2012-10-30 10:11:51 +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 11:41:58 +08:00

README.md

Update README

2011-04-13 19:06:09 +08:00

README.md

Ruling Orbit

RulingSite-s Version 4