Go to file
Spen 00e9a5df5b new ui member settings account data
Conflicts:
	app/controllers/admin/users_new_interface_controller.rb
	app/views/admin/users_new_interface/show.html.erb
	config/locales/en.yml
	config/routes.rb
2013-10-18 22:28:27 +08:00
app new ui member settings account data 2013-10-18 22:28:27 +08:00
config new ui member settings account data 2013-10-18 22:28:27 +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 bug in open_for, it now takes all the open_for into account 2013-10-17 14:20:49 +08:00
log relpace seminar to conference 2013-02-04 18:01:38 +08:00
patch standalone css and icon 2013-06-06 18:41:27 +08:00
public new themes added to desktop plus theme uploader created 2013-07-30 16:43:32 +08:00
script remove useless script 2011-04-13 19:18:40 +08:00
solr/conf add sold setting back 2013-06-17 13:45:30 +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 Revert "add ntu_ga survey init sorting" 2013-10-18 19:51:16 +08:00
.gitignore new plugins added for desktop 2013-08-06 17:52:39 +08:00
.rspec Merge with sub_roles 2011-12-23 18:34:21 +08:00
Gemfile jquery update and also fixed app manager bug .. jquery updated to 1.10.2 and jquery ui updated to 1.10.0 .. gem jquery-rails vs 2.1.4 changed to 3.0.4 and jquery-ui-rails changed to 4.0.5 2013-10-16 09:37:33 +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 11:41:58 +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
sftp-config.json new plugins added for desktop 2013-08-06 17:52:39 +08:00

README.md

Ruling Orbit

RulingSite-s Version 4