saurabh
/
orbit-basic
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,577 Commits 5 Branches 0 Tags 52 MiB
Commit Graph

2577 Commits

Author SHA1 Message Date
Harry Bomrah a2da065ce6 Merge branch 'gallery_orbit' into desktop_devin 2012-08-29 17:19:04 +08:00
Harry Bomrah 4e6703dae6 ruby update for form and edit tagging 2012-08-29 17:13:45 +08:00
devin e17bc400f1 gallery frontend update 2012-08-29 17:12:20 +08:00
Matthew K. Fu JuYuan 0ea73fa874 Merge branches 'master' and 'master' of github.com:Rulingcom/NCCU 2012-08-29 10:03:34 +08:00
Harry Bomrah a11d865dd1 Ruby update 2012-08-28 21:04:48 +08:00
Harry Bomrah 833349bf6c Merge branch 'gallery_orbit' into desktop_devin 2012-08-28 15:45:20 +08:00
devin 86535874f7 language fix 2012-08-28 15:38:35 +08:00
devin d2733bde28 front end added 2012-08-28 15:23:55 +08:00
Harry Bomrah 62abbf9417 Ruby structure implementation 2012-08-27 23:36:56 +08:00
Matthew K. Fu JuYuan 6bd8514675 fix for no login window for backend 2012-08-24 11:53:45 +08:00
Harry Bomrah 99096c4ac0 View only update 2012-08-23 21:30:37 +08:00
Harry Bomrah 33bc430df5 Commit for view only 2012-08-23 19:25:56 +08:00
Harry Bomrah 861f521da3 Merge branch 'gallery_orbit' into desktop_devin 2012-08-23 17:15:03 +08:00
Harry Bomrah e2c16e1931 frontend fixes 2012-08-23 17:13:33 +08:00
Matthew K. Fu JuYuan e4cc80248d Merge branch 'demo_site' of github.com:Rulingcom/orbit into visitor_dsahbroad 
Conflicts:
	config/mongoid.yml
 2012-08-23 16:08:17 +08:00
Matthew K. Fu JuYuan 01d278d688 guest user 2012-08-23 16:05:14 +08:00
Harry Bomrah 4d9244005a Code merge 2012-08-23 01:40:55 +08:00
Harry Bomrah 1e4d534908 frontend updates 2012-08-23 01:36:56 +08:00
devin 93da8520ed gallery update 2012-08-23 01:36:56 +08:00
devin 9430f66bee gallery update 2012-08-23 01:36:56 +08:00
devin 1a4097d1c0 gallery update 
especially upload panel
 2012-08-23 01:36:56 +08:00
Harry Bomrah 4fe4dc35de Minor update 2012-08-23 01:36:55 +08:00
Harry Bomrah 0799fb4f87 code merged … ui updated 2012-08-23 01:36:55 +08:00
Harry Bomrah 94ee16ae01 design update 2012-08-23 01:36:55 +08:00
devin d6b24c6454 gallery update 2012-08-23 01:36:55 +08:00
devin a732910f35 gallery update 2012-08-23 01:36:55 +08:00
devin 7b42adc9a0 gallery update 2012-08-23 01:36:55 +08:00
chris 7d5531bf01 Merge branch 'nccu_master' into demo_site 
Conflicts:
	Gemfile
	app/assets/javascripts/tinymce_orbit.js.erb
	app/assets/stylesheets/style.css.erb
	app/controllers/admin/assets_controller.rb
	app/controllers/admin/module_apps_new_interface_controller.rb
	app/controllers/admin/page_parts_controller.rb
	app/jobs/sync_db.rb
	app/models/page.rb
	app/models/page_part.rb
	app/models/user/user.rb
	app/uploaders/image_uploader.rb
	app/views/admin/assets/create.js.erb
	app/views/admin/module_apps/reload_frontend_pages.js.erb
	app/views/layouts/_orbit_bar.html.erb
	app/views/layouts/_side_bar.html.erb
	app/views/layouts/_users_checkbox_ary.html.erb
	app/views/shared/_privilege_user.html.erb
	config/mongoid.yml
	lib/parsers/parser_common.rb
	vendor/built_in_modules/announcement/announcement.json
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/widget/bulletins_controller.rb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_bulletin_link.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/_privilege_user.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/index.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/_index.html.erb
 2012-08-22 18:07:49 +08:00
devin 75b6c447fc gallery update 2012-08-22 16:46:37 +08:00
devin e8a0015365 gallery update 2012-08-22 15:59:06 +08:00
devin 1437d2dc14 gallery update 
especially upload panel
 2012-08-22 01:15:50 +08:00
Harry Bomrah 4a53e5faea Minor update 2012-08-21 20:26:07 +08:00
Harry Bomrah 16b1e97685 code merged … ui updated 2012-08-21 20:15:17 +08:00
Harry Bomrah e447dc411a design update 2012-08-21 19:36:49 +08:00
unknown 1bfae05242 update item page 2012-08-21 17:37:25 +08:00
devin 0ad0ea9acf gallery update 2012-08-21 16:32:55 +08:00
devin cbef7cd368 gallery update 2012-08-21 14:31:25 +08:00
devin 1a6ecf4d0f gallery update 2012-08-21 13:56:50 +08:00
chris 68aed18956 Merge branch 'gallery_orbit' of github.com:Rulingcom/orbit into gallery_orbit 
Conflicts:
	app/views/layouts/_side_bar.html.erb
	config/mongoid.yml
	vendor/built_in_modules/gallery/app/assets/javascripts/galleryAPI.js.erb
	vendor/built_in_modules/gallery/app/assets/stylesheets/gallery.css
 2012-08-20 23:24:41 +08:00
Harry Bomrah 3d607cfca4 updates for tagging and language fix 2012-08-20 23:20:20 +08:00
Harry Bomrah 2c0058e8c9 authorization 2012-08-20 23:18:50 +08:00
devin 489231166f gallery update 2012-08-20 23:17:32 +08:00
devin 1731c4bcf7 gallery update 
add "tag panel", not complete
 2012-08-20 23:17:32 +08:00
Harry Bomrah faf2d914b6 Page added for desktop 2012-08-20 23:17:31 +08:00
devin 4beedb1aa4 gallery update 2012-08-20 23:17:31 +08:00
devin 0dd1c6eb51 encoding fixed 
Maybe there are some "chinese" in galleryAPI.js.erb and Ruby treat them
all US-ASCII, so everything crash.
see this post
"http://stackoverflow.com/questions/7761540/encoding-issues-in-javascrip
t-files-using-rails-asset-pipeline"
 2012-08-20 23:16:54 +08:00
Harry Bomrah 263cf130e2 tp 2012-08-20 23:16:54 +08:00
Harry Bomrah aef1bfaba3 Button fixes 2012-08-20 23:16:54 +08:00
Harry Bomrah 69304fda43 UI modifications 2012-08-20 23:16:06 +08:00
devin abd1a9ecbc gallery update 2012-08-20 23:14:11 +08:00