developers
/
orbit-4-1
Archived
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,772 Commits 9 Branches 0 Tags 55 MiB
Commit Graph

415 Commits

Author SHA1 Message Date
Matthew K. Fu JuYuan 9f825de288 user new interface 70% 2012-10-09 06:40:18 +08:00
devin af19f11668 calendar update 
- delete unwanted style in bootstrap-responsive.css
- yet start repeat panel
- please just refer how google works (functionality)
 2012-09-14 15:57:44 +08:00
OrbitServer ee51240102 Ray's changes for new backend 2012-09-14 02:38:56 +08:00
Christophe Vilayphiou 194773f064 Fix bugs after merge 2012-09-14 02:27:49 +08:00
unknown 42d50ae534 Plugins 2012-09-14 00:05:31 +08:00
Harry Bomrah f88176ee1f Merge branch 'gallery_orbit' of https://github.com/Rulingcom/orbit into gallery_orbit 2012-09-12 16:48:33 +08:00
Matthew K. Fu JuYuan 803f83b239 fix for no login window for backend 2012-09-12 16:20:15 +08:00
Harry Bomrah 17f3104c8d Merge branch 'gallery_orbit' into desktop_devin 2012-09-12 16:18:13 +08:00
devin e96ebefe9c calendar update 2012-09-12 16:16:01 +08:00
OrbitServer 905541aa38 Ray's tp CSS changes 2012-09-12 03:50:20 +08:00
Harry Bomrah 04877b9945 design update 2012-09-12 01:58:23 +08:00
unknown a1560ebcf5 update archive 2012-08-30 15:17:39 +08:00
Harry Bomrah 94ee16ae01 design 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
Harry Bomrah 2c0058e8c9 authorization 2012-08-20 23:18:50 +08:00
Harry Bomrah faf2d914b6 Page added for desktop 2012-08-20 23:17:31 +08:00
Harry Bomrah 69304fda43 UI modifications 2012-08-20 23:16:06 +08:00
Harry Bomrah 587595f815 gallery translation supported 2012-08-20 23:14:11 +08:00
Harry Bomrah 797c9e57b8 Gallery update 2012-08-20 23:14:10 +08:00
Harry Bomrah 1daf405b3d Gallery started. 2012-08-20 23:14:10 +08:00
devin 801c7cab0c tinyscroll bar update 2012-08-20 23:11:32 +08:00
Harry Bomrah 1efb807246 tinyscrollbar extension 2012-08-20 23:11:32 +08:00
chris 3c283d1a7a Set default picture 
Fix tags where not in params for index fronted (news and announcement)
Change backend index for news
Home banner link for images and main title
 2012-08-16 17:24:12 +08:00
Christophe Vilayphiou 96fd89cca3 Fix js for ie in list 2012-08-16 01:09:45 +08:00
Christophe Vilayphiou 53c5f6a3b9 New css and images for rss 2012-08-15 18:00:55 +08:00
Christophe Vilayphiou 0d330edfa3 New css and images for rss 2012-08-15 17:42:45 +08:00
Christophe Vilayphiou a19a5415c1 Ray's changes for list.css 2012-08-15 12:13:58 +08:00
Christophe Vilayphiou ab1c457a51 Add i18n for message in editor pop-up 2012-08-14 01:20:45 +08:00
Harry Bomrah 9ff60d2ba4 form validation again 2012-08-14 01:02:45 +08:00
Harry Bomrah ffa49fd092 form validation 2012-08-14 01:02:45 +08:00
Christophe Vilayphiou 9196deb997 Merge branch 'master' of github.com:Rulingcom/NCCU 2012-08-14 01:00:25 +08:00
Christophe Vilayphiou c32b0dd4b4 Move delete checkboxes to js 2012-08-14 00:59:01 +08:00
Matthew K. Fu JuYuan 6cc470ede9 nccu fix 2012-08-13 18:35:47 +08:00
Christophe Vilayphiou 18e18a4add Fix for banner on ie 2012-08-13 15:10:53 +08:00
Christophe Vilayphiou 2bd132cef9 Pass category and tag to search to redirect to the right page 
Ray's change for mouseover (take out the black background)
 2012-08-09 19:16:26 +08:00
Matt 1aea8d91f4 Merge branch 'master' of github.com:Rulingcom/NCCU 2012-08-08 18:16:38 +08:00
Christophe Vilayphiou 0645f04240 Ray's change in css 2012-08-08 18:11:18 +08:00
Matt 62ba8c9f18 Fix bugs on 172:180 2012-08-08 17:56:00 +08:00
Christophe Vilayphiou b4c2dfe0ef Merge branch 'fb_share' of github.com:Rulingcom/NCCU into fb_share 2012-08-08 11:53:47 +08:00
OrbitServer 3fdff9357c Merge branch 'fb_share' of github.com:Rulingcom/NCCU into fb_share 2012-08-08 11:52:11 +08:00
OrbitServer fbb53cca36 Ray's changes for sitemap backend 2012-08-08 11:51:20 +08:00
Christophe Vilayphiou a03d1ad10b Change for getting url from key 2012-08-08 11:04:19 +08:00
Christophe Vilayphiou 6cfdf0f25a Change the way the orig_url is passed to fb 2012-08-08 11:04:19 +08:00
Christophe Vilayphiou 4bed925e0f Try fb from override and generated page 2012-08-08 11:04:19 +08:00
Matthew K. Fu JuYuan 85a556a4a2 first version of fb_share 2012-08-08 11:04:19 +08:00
Christophe Vilayphiou 292105bdf1 Remove remotipart (not working with ie9) the upload is working except that the pop-up does not disappear in ie 2012-08-08 10:53:04 +08:00
Christophe Vilayphiou 86a3d4a4b1 Remove console.log 2012-08-08 10:52:22 +08:00
Christophe Vilayphiou ecc5c39840 Fix remote upload file for tinymce 2012-08-08 10:51:54 +08:00
Christophe Vilayphiou db16fdc7b5 Change for getting url from key 2012-08-08 07:46:10 +08:00
Christophe Vilayphiou f7e6703d5f Change the way the orig_url is passed to fb 2012-08-08 06:50:28 +08:00