saurabh
/
orbit-basic
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
461 Commits 5 Branches 0 Tags 52 MiB
JavaScript 42.1%
HTML 27.4%
Ruby 18.6%
CSS 10.9%
SCSS 1%
Go to file
Christophe Vilayphiou 7c55f6fb88 Merge branch 'announcement_dev_view_and_auth' of github.com:Rulingcom/orbit into announcement_dev_view_and_auth 
Conflicts:
	config/environments/development.rb
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/announcements_controller.rb
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
	vendor/built_in_modules/announcement/app/models/bulletin.rb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletins.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/edit.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/new.html.erb
	vendor/built_in_modules/announcement/config/routes.rb
	vendor/built_in_modules/web_resource/lib/tasks/web_resource_tasks.rake
 		2012-02-29 19:03:29 +08:00
app change view and action for announcement ,Lin checked. Also add validation for object_auth make sure for each object,the object will be unique for each action. 2012-02-29 18:58:33 +08:00
config fix bugs with token 2012-02-29 18:56:42 +08:00
db upgrade to rails3, but grip is broken 2010-03-08 16:04:05 +08:00
doc init rails 2.3.2 2009-05-08 00:53:18 +08:00
lib change view and action for announcement ,Lin checked. Also add validation for object_auth make sure for each object,the object will be unique for each action. 2012-02-29 18:58:33 +08:00
log add log folder 2011-04-13 18:22:49 +08:00
public Add RSS event 2012-02-28 18:29:13 +08:00
script remove useless script 2011-04-13 19:18:40 +08:00
spec fixing for app_auth 2012-01-05 16:20:51 +08:00
tmp Change to MongoDB 2010-01-04 15:52:30 +08:00
vendor Merge branch 'announcement_dev_view_and_auth' of github.com:Rulingcom/orbit into announcement_dev_view_and_auth 2012-02-29 19:03:29 +08:00
.gitignore Modifications for images in html code 2011-10-18 11:21:24 +08:00
.rspec Change role structure 2011-12-10 18:12:39 +08:00
Gemfile Changes for nccu 2012-02-29 16:01:50 +08:00
Gemfile.lock Changes for nccu 2012-02-29 16:01:50 +08:00
README.md Update README 2011-04-13 19:06:09 +08:00
Rakefile announcement path error 2012-02-13 17:09:37 +08:00
config.ru Chris's first commit at Fri Jan 28 2011 10:14:32 GMT+0800 (CST) 2011-04-13 18:19:51 +08:00

README.md

Ruling Orbit

RulingSite-s Version 4