809 Commits

Author	SHA1	Message	Date
Matthew K. Fu JuYuan	768f907f66	Merge branch 'master' of github.com:Rulingcom/NCCU	2012-09-10 11:54:20 +08:00
Matthew K. Fu JuYuan	a20db344f1	preview for update	2012-09-10 11:53:59 +08:00
Matt	9d21a86f53	Ray's CSS changes for NCCU email	2012-09-07 18:16:34 +08:00
Fu Matthew	6044857fea	complete preview for both new and announcement	2012-09-07 17:55:59 +08:00
Matthew K. Fu JuYuan	ae1595a008	view for preview	2012-09-04 09:24:12 +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
Christophe Vilayphiou	fc560f4205	Try fb from override and generated page	2012-08-08 05:40:50 +08:00
Harry Bomrah	4660c26b7a	fix for ie8,9 for tinymce	2012-08-07 20:55:18 +08:00
Christophe Vilayphiou	8ea7bf75cd	Fix uploader, ie9 ok, not ie8	2012-08-07 17:32:15 +08:00
Matthew K. Fu JuYuan	1c62c1a799	first version of fb_share	2012-08-06 16:12:49 +08:00
Christophe Vilayphiou	934b515914	Sitemap with main	2012-07-27 19:13:39 +08:00
Christophe Vilayphiou	db9c4c0e10	Partial sitemap	2012-07-27 19:13:39 +08:00
unknown	c0cac812c5	demo site widget	2012-07-26 16:39:29 +08:00
OrbitServer	f223e4bb1e	Ika's changes for orbit bar	2012-07-20 15:41:27 +08:00
devin	68fd726ce1	little	2012-07-09 16:25:41 +08:00
devin	b6266284b4	dump	2012-07-09 16:21:02 +08:00
Harry Bomrah	222c0b9564	Merge branch 'desktop_harry' into desktop_devin	2012-07-09 16:12:45 +08:00
Harry Bomrah	4796de882f	Scroll down fixes	2012-07-09 16:11:31 +08:00
devin	bfedf207c9	some changes	2012-07-09 15:37:47 +08:00
devin	58d162d225	publication adjustment	2012-07-09 10:44:01 +08:00
Harry Bomrah	2e94c19019	Merge branch 'desktop_devin' into desktop_harry	2012-07-06 16:12:01 +08:00
Harry Bomrah	830eb8eb62	Timeline design and timescale update	2012-07-06 16:11:03 +08:00
devin	8948ccca25	little changes	2012-07-06 16:09:26 +08:00
devin	bfaed4deb4	timeline change	2012-07-05 16:49:03 +08:00
Harry Bomrah	312e63f242	New Timeline with books and seminar pages	2012-07-05 16:42:00 +08:00
Harry Bomrah	6923b82284	Added seminar section	2012-07-04 19:12:02 +08:00
Harry Bomrah	f635f642fc	Merge for new timeline updates and font updates	2012-07-04 18:49:10 +08:00
Joshua Milton	6b9926539d	Merge branch 'desktop_joshua' of https://github.com/Rulingcom/orbit into desktop_joshua ... Conflicts: app/assets/javascripts/orbitdesktop.js app/controllers/desktop_publications_controller.rb config/routes.rb	2012-07-04 18:31:00 +08:00
Joshua Milton	3f42a22094	Books section added	2012-07-04 17:55:30 +08:00
devin	e133673736	some change	2012-07-04 13:38:18 +08:00
Harry Bomrah	a0c09046a8	Timeline merge plus font update	2012-07-03 19:53:34 +08:00
Harry Bomrah	f20f36383e	Timeline ajax load fixed… a bit change in structure..	2012-07-03 19:45:47 +08:00
Harry Bomrah	bacb1f1e63	Timeline ajax loading	2012-07-02 21:06:36 +08:00
devin	f34cb47618	font aweosme change	2012-07-02 16:23:14 +08:00
devin	08fd07b6aa	timeline and font update	2012-07-02 16:22:51 +08:00
devin	6533abf214	font awesome update	2012-07-02 11:10:01 +08:00
Christophe Vilayphiou	a1e74987dc	Merge branch 'desktop_harry' of github.com:Rulingcom/orbit into desktop_harry ... Conflicts: Gemfile.lock app/assets/javascripts/.DS_Store app/assets/stylesheets/style.css.erb app/views/layouts/_orbit_bar.html.erb	2012-06-29 16:10:29 +08:00
Harry Bomrah	7151102a86	new page add and timeline changes	2012-06-28 17:31:48 +08:00
Matthew K. Fu JuYuan	04a23db745	fix invalid invalid byte sequence in US-ASCII for js files	2012-06-27 14:27:27 +08:00
Matthew K. Fu JuYuan	55449efb35	fix 新聞與公告QA ... 1.優先處理-快速編輯中的檔案上傳無法新增，但可刪除 2.優先處理-編輯中的檔案列表，無法刪除 3.優先處理-刪除時應彈出警告視窗，請user確認一次，再將檔案刪除	2012-06-27 14:21:06 +08:00
Christophe Vilayphiou	4c4929c20a	Fix js for news quick_edit and edit for files	2012-06-27 11:36:18 +08:00
Matthew K. Fu JuYuan	6a4abc6c43	fix news error	2012-06-27 09:59:32 +08:00
Harry Bomrah	4aa155a44d	timeline updates major ones..	2012-06-26 21:09:33 +08:00
Harry Bomrah	555ec86403	Timeline commit	2012-06-26 15:59:28 +08:00
Harry Bomrah	7488341836	Commit for app window..	2012-05-25 15:41:07 +08:00
Christophe Vilayphiou	c062b43069	Merge branch 'design_team' into ldap	2012-05-23 12:11:38 +08:00
Christophe Vilayphiou	006b84f6a1	Ray's fix for ie	2012-05-23 12:06:09 +08:00
Christophe Vilayphiou	f1c8bed29d	Merge branch 'design_team' into ldap ... Conflicts: vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_approvals_controller.rb vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_news_bulletin.html.erb	2012-05-22 20:33:07 +08:00
Christophe Vilayphiou	541aa5831e	JS changes to load drag and drop	2012-05-22 17:37:15 +08:00
Christophe Vilayphiou	874a89d99b	Ray's fix for structure side_bar	2012-05-22 16:48:57 +08:00
Christophe Vilayphiou	d0b030c47d	Put inc/ajax_setting in new_admin ... Fix callback for link on save	2012-05-22 16:11:00 +08:00
Matthew K. Fu JuYuan	99bcdf6e1e	clean up unless code	2012-05-22 14:59:54 +08:00
Matthew K. Fu JuYuan	79f67208fa	js for preventing user do stupid things durning ajax	2012-05-22 14:59:54 +08:00
Christophe Vilayphiou	5e9836f371	Changes for structure	2012-05-22 14:45:49 +08:00
devin	6fedf7232a	app update	2012-05-21 15:45:15 +08:00
Harry Bomrah	81ff0f2c1c	Merge branch 'desktop_harry' into desktop_devin	2012-05-21 15:26:38 +08:00
devin	a78b72ebfc	app update	2012-05-21 15:25:18 +08:00
Harry Bomrah	dfe7ccf166	general commit	2012-05-21 15:24:47 +08:00
devin	ab7ae6dcee	app	2012-05-21 14:55:51 +08:00
Christophe Vilayphiou	4d33c7a56d	Changes for dat and time format ... Impression bug when some i18n missing in impressionable object JS bug in ad_banner edit title	2012-05-18 19:42:36 +08:00
Matt	6a022c90da	Changes on nccu	2012-05-18 15:20:45 +08:00
Christophe Vilayphiou	17b6a70506	Merge branch 'design_team' into ldap	2012-05-17 23:36:24 +08:00
Matthew K. Fu JuYuan	16ada34585	fix ad_banner. new ad_image with best size from ad_banner. content editable at tab	2012-05-17 23:35:46 +08:00
Harry Bomrah	1b1c2c0032	image title and description callback fixed…	2012-05-17 20:19:31 +08:00
Christophe Vilayphiou	5e93fe51a9	Merge branch 'design_team' into ldap	2012-05-17 16:41:11 +08:00
Christophe Vilayphiou	29c54e6480	Add mandatory fields to assets	2012-05-17 16:40:09 +08:00
Christophe Vilayphiou	eba4671733	Merge branch 'design_team' into ldap	2012-05-17 06:46:29 +08:00
Matthew K. Fu JuYuan	a3acd865d7	AdBanner reopen new banner and delete. Rename title with content editable tag.	2012-05-17 06:44:14 +08:00
Christophe Vilayphiou	6b9c8eb15d	Merge branch 'design_team' into ldap	2012-05-17 06:31:57 +08:00
Christophe Vilayphiou	26292f0dcc	Asset upload	2012-05-17 06:28:29 +08:00
Harry Bomrah	617a683d00	image insertion completed..	2012-05-16 16:22:50 +08:00
Harry Bomrah	c380c4cad0	popup fixed	2012-05-16 15:34:23 +08:00
Harry Bomrah	30137b50b4	popup fix..	2012-05-16 15:33:54 +08:00
Harry Bomrah	75cbae049b	few experiments…	2012-05-16 11:18:54 +08:00
Christophe Vilayphiou	0b0916179f	Change assets	2012-05-16 11:07:11 +08:00
Christophe Vilayphiou	f950f77f36	Merge branch 'design_team' into ldap ... Conflicts: Gemfile app/models/ad_banner.rb	2012-05-15 23:02:22 +08:00
Christophe Vilayphiou	53a0fbddf0	Fix commit error	2012-05-15 21:25:51 +08:00
Christophe Vilayphiou	ebc8dd33ec	Merge branch 'design_team' into ldap ... Conflicts: Gemfile.lock app/controllers/admin/module_apps_controller.rb app/controllers/application_controller.rb vendor/built_in_modules/web_resource/web_resource.json	2012-05-14 00:57:17 +08:00
Christophe Vilayphiou	281cfa6518	Changes for widgets	2012-05-13 21:55:39 +08:00
Christophe Vilayphiou	4685952bd6	Changes in page_edit	2012-05-13 20:13:26 +08:00
Christophe Vilayphiou	803253ebcf	Put nestedSortable in page_edit.js.erb	2012-05-12 22:12:17 +08:00
Christophe Vilayphiou	076f5ad6ef	Ray's changes for drag and drop in structure's side_bar	2012-05-11 17:54:33 +08:00
Harry Bomrah	1a9fa8f505	Merge branch 'desktop_harry' into desktop_devin	2012-05-11 15:28:05 +08:00
Harry Bomrah	2c3637e9b4	very important update for widgets management..	2012-05-11 15:27:16 +08:00
Christophe Vilayphiou	fd52d00187	Add drag and drop to structure side_bar	2012-05-11 10:00:45 +08:00
Christophe Vilayphiou	63f904d3b0	Fix tinymce js load ... Change to full_name for page_context index	2012-05-10 20:36:19 +08:00
devin	97b60c48b2	update	2012-05-10 17:41:56 +08:00
Christophe Vilayphiou	5eba2638ce	Merge branch 'design_team' into ldap	2012-05-10 14:17:38 +08:00
Matthew K. Fu JuYuan	b6aad17681	Appauth new interface for setting managers. Fix showing sidebar for News and Announcement when setting managers at module app page.	2012-05-10 14:16:37 +08:00
devin	ada56a7a63	some update	2012-05-10 10:54:43 +08:00
Christophe Vilayphiou	87449ec6a8	Merge branch 'design_team' into ldap	2012-05-10 10:34:28 +08:00
Christophe Vilayphiou	a43877323e	Add tinymce to page_part edit for text	2012-05-10 10:34:13 +08:00
Christophe Vilayphiou	1785da51a2	Merge branch 'design_team' into ldap	2012-05-09 15:04:06 +08:00
Christophe Vilayphiou	50edfdd02f	Changes for tag key in side_bar announcement and news, fix ad_banner css for dot	2012-05-09 14:59:06 +08:00
Christophe Vilayphiou	d88d4e58dc	Merge branch 'design_team' into ldap ... Conflicts: config/environments/development.rb	2012-05-09 13:51:00 +08:00
Christophe Vilayphiou	9ead6cafda	Ray's changes	2012-05-09 04:15:02 +08:00
Christophe Vilayphiou	d2e07f537a	Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team	2012-05-08 17:24:40 +08:00
Christophe Vilayphiou	a3868cb785	Ray's changes for front-end banner	2012-05-08 17:21:26 +08:00
Christophe Vilayphiou	caba8ce7a4	Add nccu icon ... Change news list in front-end Hide links and files in news and announcement front-end show when nothing	2012-05-08 15:27:43 +08:00
Matthew K. Fu JuYuan	b22a275360	Merge branch 'ldap' of https://github.com/Rulingcom/orbit into ldap	2012-05-08 11:55:21 +08:00
Christophe Vilayphiou	2b9190a49e	Merge branch 'design_team' into ldap ... Conflicts: config/locales/zh_tw.yml vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb	2012-05-08 11:40:38 +08:00
Harry Bomrah	2083e0bf4f	widget structure improvised…	2012-05-07 19:00:50 +08:00
Christophe Vilayphiou	f534e6ca7b	Ray's changes for site_info	2012-05-07 15:55:45 +08:00
Harry Bomrah	fcc875bb5d	app store page added… and few other changes..	2012-05-04 20:28:12 +08:00
Christophe Vilayphiou	e0a191162d	Ray's changes	2012-05-04 19:11:28 +08:00
Harry Bomrah	3ad11f2098	View functionality, changed controller, journal and pages collections	2012-05-03 21:38:03 +08:00
Harry Bomrah	a3a1e4b92e	controller change, views working and db for paper and journals	2012-05-03 21:30:12 +08:00
devin	aeaf2f05d1	Start Add Page - no function	2012-05-03 17:59:07 +08:00
Harry Bomrah	1fce99c96f	Merge branch 'desktop_harry' into desktop_devin	2012-05-03 14:42:07 +08:00
Harry Bomrah	d6cbbff9de	connection page working now..	2012-05-03 14:40:54 +08:00
devin	b87cf0e2ff	list page	2012-05-03 14:39:22 +08:00
Harry Bomrah	6b8c79a9a8	Merge branch 'desktop_devin' into desktop_harry	2012-05-02 17:06:56 +08:00
Harry Bomrah	5b7c422446	position update fixed..	2012-05-02 17:05:40 +08:00
devin	887bda1491	lots of change	2012-05-02 17:04:16 +08:00
Christophe Vilayphiou	92a53c1b27	Ray's fix	2012-05-02 16:20:59 +08:00
devin	bfc4507696	Connection page design	2012-05-01 18:05:17 +08:00
Harry Bomrah	769a67f026	the group more structured and also demo connecting with gmail account..	2012-04-30 21:17:20 +08:00
Harry Bomrah	1b7fb106f8	lot of updates	2012-04-30 14:33:12 +08:00
Harry Bomrah	aacd9da9fb	auto login encryption done…	2012-04-30 14:29:42 +08:00
Christophe Vilayphiou	a9ab016d52	Merge branch 'design_team' into ldap	2012-04-30 08:33:21 +08:00
Christophe Vilayphiou	bda21baed2	Add missing js	2012-04-30 08:32:54 +08:00
Christophe Vilayphiou	20504b2205	Merge branch 'design_team' into ldap ... Conflicts: app/controllers/admin/page_parts_controller.rb vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter.html.erb vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_sort_headers.html.erb	2012-04-30 07:57:20 +08:00
devin	b6fceadff4	column group experiment	2012-04-30 06:41:05 +08:00
Christophe Vilayphiou	32faef0c70	DRY code for sorting	2012-04-30 06:30:52 +08:00
Matthew K. Fu JuYuan	c4db7e2157	Fix approval setting ajax problem	2012-04-30 00:24:11 +08:00
Matthew K. Fu JuYuan	94d61abf83	A modal view for approval user	2012-04-30 00:24:10 +08:00
Christophe Vilayphiou	851dc72f42	Ray's changes in css and html	2012-04-30 00:17:18 +08:00
devin	03f19b80b4	small change	2012-04-28 01:49:48 +08:00
Christophe Vilayphiou	2362e1cfdd	Merge branch 'design_team' into ldap	2012-04-27 15:28:32 +08:00
Christophe Vilayphiou	799fd1e3ac	Fix css bugs (opacity=) and changes in sign_in page	2012-04-27 15:27:59 +08:00
devin	2ebba577eb	journal start	2012-04-27 14:04:11 +08:00
Christophe Vilayphiou	3beb035101	Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team	2012-04-27 11:11:56 +08:00
Christophe Vilayphiou	5aca3db95f	Ray's changes for structure and web_links	2012-04-27 11:02:56 +08:00
devin	682880c5bf	skip it	2012-04-26 23:18:52 +08:00
Harry Bomrah	c158375d02	with connection and some save settings…	2012-04-26 21:30:13 +08:00
Christophe Vilayphiou	7d6b82d9dd	Merge branch 'ad_banner' into ldap	2012-04-26 17:15:44 +08:00
Christophe Vilayphiou	3d293f6419	Fix for quick edit file and link in announcement ... Change submit_button into ajax_for_submit	2012-04-26 16:42:28 +08:00
Christophe Vilayphiou	6f1eb97ace	Fix for structure js and css	2012-04-25 18:41:38 +08:00
Christophe Vilayphiou	58d52c60d3	Fix for structure: restore js and change manifests	2012-04-25 18:17:58 +08:00
Christophe Vilayphiou	1f4fe65430	Merge branch 'design_team' into ldap ... Conflicts: app/views/devise/sessions/new.html.erb vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/_privilege_user.html.erb	2012-04-25 16:45:04 +08:00
Christophe Vilayphiou	876036dd20	Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team ... Conflicts: app/views/admin/ad_banners/_ad_banner_tab.html.erb	2012-04-25 16:39:26 +08:00
Christophe Vilayphiou	65a6f9c416	Ray's css fix for quick edit	2012-04-25 16:26:27 +08:00
Matthew K. Fu JuYuan	7f285f4719	Change ad_banner preview from using title to id	2012-04-25 16:10:11 +08:00
Harry Bomrah	a298cbd5f6	Publication started	2012-04-24 16:45:26 +08:00
Christophe Vilayphiou	d1f687e43e	Merge branch 'design_team' into ldap	2012-04-24 16:32:30 +08:00
Christophe Vilayphiou	c7d8e0b27b	Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team ... Conflicts: vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/setting.html.erb	2012-04-24 16:32:00 +08:00
Christophe Vilayphiou	291d5e3a03	Ray's changes in css	2012-04-24 16:24:50 +08:00
Christophe Vilayphiou	70f6c7b540	Merge branch 'design_team' into ldap ... Conflicts: vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_sort_headers.html.erb	2012-04-24 15:28:52 +08:00
Christophe Vilayphiou	c0abaa643c	Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team	2012-04-24 15:21:12 +08:00
Christophe Vilayphiou	45c194e870	Ray's changes in css	2012-04-24 15:15:36 +08:00
Matthew K. Fu JuYuan	c57ba305e9	Fix ad_banner	2012-04-24 14:37:06 +08:00
Christophe Vilayphiou	42aeaead93	Ray's changes, put the js for upload image component in a separate file	2012-04-24 12:15:32 +08:00
Christophe Vilayphiou	b80339d704	Ray's changes for image upload component and sign-in page	2012-04-24 11:35:50 +08:00
Christophe Vilayphiou	308cfc7cf2	Merge branch 'design_team' into ldap ... Conflicts: app/views/devise/sessions/new.html.erb	2012-04-24 02:46:06 +08:00
Christophe Vilayphiou	6831a3dbbb	Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team	2012-04-24 02:44:39 +08:00
Christophe Vilayphiou	0c4328987a	Ray's changes for css files, sort headers in announcement and pagination	2012-04-24 02:37:51 +08:00
Christophe Vilayphiou	d4aea664e2	Merge branch 'design_team' into ldap ... Conflicts: vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb	2012-04-24 02:37:03 +08:00
Christophe Vilayphiou	a5b13e680f	Add sub_menu in r_tags	2012-04-24 02:30:40 +08:00
Harry Bomrah	670ec2a40e	Themes from db fixed..	2012-04-23 21:04:02 +08:00
Christophe Vilayphiou	5a423178e3	Merge branch 'design_team' into ldap ... Conflicts: app/assets/stylesheets/new_admin.css.erb app/assets/stylesheets/widget.css	2012-04-23 15:16:50 +08:00
Christophe Vilayphiou	499930a680	Pull from github	2012-04-23 14:29:55 +08:00
Christophe Vilayphiou	2eeb530422	Merge branch 'master' into ldap ... Conflicts: app/assets/stylesheets/new_admin.css.erb	2012-04-23 14:13:37 +08:00
Matthew K. Fu JuYuan	0c46b4da23	AdImage and AnBanner JS fixed	2012-04-23 14:07:13 +08:00
Matthew K. Fu JuYuan	81b0046f42	Preview now can be use at both ad_banner and ad_image,however it won't run correctly if user change its ad_banner at ad_image.	2012-04-23 14:07:13 +08:00
Matthew K. Fu JuYuan	1b70852ff7	realtime preview is working. but save to object when preview	2012-04-23 14:06:37 +08:00
Matthew K. Fu JuYuan	8cc0611c4a	Ray's fix for ad_banner	2012-04-23 14:06:36 +08:00
Christophe Vilayphiou	2f279c53ff	Apply patch from ldap	2012-04-23 14:04:55 +08:00
Matthew K. Fu JuYuan	868118116b	Merge commit 'b6f64cd8a5b48ad84703e3824ef4d968ed71779d' into ldap	2012-04-23 13:58:56 +08:00
Matthew K. Fu JuYuan	6a4203b850	Ray's css fix with widget css	2012-04-23 11:53:36 +08:00
nccu	fe9032787c	NCCU ldap debug	2012-04-23 10:13:44 +08:00
Harry Bomrah	8c42f6bb7c	Merge branch 'desktop_harry' into desktop_devin	2012-04-20 14:44:57 +08:00
devin	2ebed9e44a	javascript update	2012-04-20 09:45:40 +08:00
devin	1f077cf2b3	javascript update	2012-04-20 07:31:48 +08:00
devin	19750d69e0	some update	2012-04-20 05:38:53 +08:00
Harry Bomrah	3eaf97babe	title and heading and welcome msg…	2012-04-19 20:26:21 +08:00
Harry Bomrah	3c5b7a5de3	Modified confirm box…	2012-04-19 15:36:03 +08:00
Matthew K. Fu JuYuan	ba0677a001	Merge commit '72efdbd742d4f3ac8a910bd5c817cf5c74570ba5' into ldap	2012-04-19 14:09:37 +08:00
Matthew K. Fu JuYuan	f55b3a4374	Merge branch 'master' of https://github.com/Rulingcom/orbit into ldap ... Conflicts: Gemfile Gemfile.lock app/views/admin/attributes/_app_selector.html.erb app/views/admin/module_apps/_app_selector.html.erb app/views/admin/pages/_app_selector.html.erb config/application.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/new_blog/app/controllers/panel/new_blog/widget/posts_controller.rb vendor/built_in_modules/page_content/app/controllers/panel/page_content/front_end/page_contexts_controller.rb vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/front_end/web_links_controller.rb vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/widget/web_links_controller.rb	2012-04-19 14:06:00 +08:00
Christophe Vilayphiou	72efdbd742	changes before Chirs and Ray's trip	2012-04-19 11:50:54 +08:00
Harry Bomrah	4bad25e682	Msg box added and background image saving complete	2012-04-18 22:01:12 +08:00
Harry Bomrah	b4bf81d40a	background image…	2012-04-18 18:20:39 +08:00
Harry Bomrah	6b35cf821e	some updates	2012-04-18 18:15:02 +08:00
Harry Bomrah	30a6dc6a95	Merge branch 'desktop_harry' into desktop_devin	2012-04-18 17:58:49 +08:00
Harry Bomrah	11a0875c44	color changes in custom color…	2012-04-18 17:57:47 +08:00
Harry Bomrah	d14630769a	Bg color fixed…	2012-04-18 14:57:00 +08:00
devin	b743413be9	function update	2012-04-18 13:17:12 +08:00
Harry Bomrah	7b391904f7	Merge branch 'desktop_devin' of https://github.com/Rulingcom/orbit into desktop_devin	2012-04-17 21:20:36 +08:00
Harry Bomrah	95a1e266ae	Custom thème done and theme id done…	2012-04-17 21:15:40 +08:00
devin	1f44a10206	wallpaper added	2012-04-17 18:06:07 +08:00
Harry Bomrah	b2d72902c3	Merge branch 'desktop_harry' into desktop_devin	2012-04-17 16:35:58 +08:00
Harry Bomrah	02c6933d0b	Tiles position saved in db and also change them from section manager	2012-04-17 16:33:41 +08:00
devin	8cd4844689	html change	2012-04-17 16:32:11 +08:00
devin	4f18257733	try	2012-04-17 01:32:53 +08:00
Harry Bomrah	8d2e5210a1	alert removes	2012-04-13 17:06:27 +08:00
Harry Bomrah	d92451d079	alert removed	2012-04-13 17:05:47 +08:00
Harry Bomrah	7479a64c95	width changes in section page	2012-04-13 17:01:11 +08:00
Matthew K. Fu JuYuan	430b0fd9ae	Merge branch 'ad_banner' of https://github.com/Rulingcom/orbit into ad_banner ... Conflicts: app/views/admin/ad_banners/_ad_image_update.html.erb	2012-04-13 16:52:14 +08:00
Matthew K. Fu JuYuan	4af73ecf6f	fix preview window size.	2012-04-13 16:46:16 +08:00
Matthew K. Fu JuYuan	0fe5baf93f	fix for letting ad_banner display even when file in not uploaded	2012-04-13 16:14:43 +08:00
Christophe Vilayphiou	957d4eaebb	Merge branch 'master' into desktop_harry	2012-04-13 16:03:43 +08:00
Christophe Vilayphiou	ca0fc4c767	Comment out code that bugged upload image in ad_banner	2012-04-13 15:53:25 +08:00
Christophe Vilayphiou	f54dba8b0b	Merge branch 'master' into desktop_harry	2012-04-13 13:39:00 +08:00
Harry Bomrah	64a9579b92	final on 13 april 00:00	2012-04-13 00:00:24 +08:00
Harry Bomrah	6b43e70f53	Merge branch 'desktop_harry' into desktop_devin	2012-04-12 22:21:05 +08:00
Harry Bomrah	193cee2df7	new icons and widgets	2012-04-12 22:18:58 +08:00
Christophe Vilayphiou	f8873267a2	Ray's fix for announcement list	2012-04-12 18:41:14 +08:00
devin	eabbba76fc	css change	2012-04-12 18:14:26 +08:00
Christophe Vilayphiou	93ac99d235	Add missing css in "inc"	2012-04-12 18:12:46 +08:00
Harry Bomrah	92427e8831	section page done…	2012-04-12 16:25:06 +08:00
Harry Bomrah	7b423877bf	new updates	2012-04-12 14:50:45 +08:00
Harry Bomrah	48323ac1af	lot of changes in fetching	2012-04-12 14:44:08 +08:00
devin	67d1f7ad08	lots of change	2012-04-12 14:19:53 +08:00
Matthew K. Fu JuYuan	83b4443910	add pic and js for permission checkbox and filter	2012-04-12 07:14:06 +08:00
Matthew K. Fu JuYuan	57402b8602	add permission-checkbox js	2012-04-12 07:14:06 +08:00
Matthew K. Fu JuYuan	e4c41ab54c	A filter UI for permission select. with Harry's JS	2012-04-12 07:14:06 +08:00
Christophe Vilayphiou	5417c6fec0	Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team ... Conflicts: vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter.html.erb	2012-04-12 07:13:13 +08:00
Christophe Vilayphiou	7bca339a5b	Ray's fix for columns width in bulletins	2012-04-12 07:01:34 +08:00
Christophe Vilayphiou	486845460c	Filter and delete for bulletins	2012-04-12 06:50:36 +08:00
Harry Bomrah	25ca29403c	section page added	2012-04-11 17:58:52 +08:00
Harry Bomrah	5a6541a592	Setting page update	2012-04-11 17:26:25 +08:00
Harry Bomrah	c55cd5c9bb	Last commit	2012-04-11 15:50:27 +08:00
Harry Bomrah	68803c0c97	Lets see	2012-04-11 15:36:32 +08:00
Harry Bomrah	edf6089e0c	Devin complete	2012-04-11 15:34:19 +08:00
Harry Bomrah	4875b339f8	Fetching desktop from db	2012-04-11 15:31:10 +08:00
devin	1fabe3d8f7	theme setting update	2012-04-11 15:22:05 +08:00
devin	0219c3df28	various update	2012-04-11 15:04:00 +08:00
devin	42f45aa137	theme setting update	2012-04-11 13:46:32 +08:00
devin	ee85380ab2	little update	2012-04-10 18:09:29 +08:00
devin	360e5228b7	custom theme settings	2012-04-10 17:44:36 +08:00
devin	6006f1b3c6	start editing setting page ... some relevant stuff updated	2012-04-10 01:06:29 +08:00
Harry Bomrah	32a1be624b	Fully updated..	2012-04-09 17:55:03 +08:00
Harry Bomrah	f807cd026d	app section modified…	2012-04-09 17:40:03 +08:00
Christophe Vilayphiou	963a0cb604	Change filter to js with history for bulletins	2012-04-07 00:20:52 +08:00
Harry Bomrah	35567c2139	Widgets Loading dynamically and semi structured	2012-04-06 23:48:03 +08:00
Harry Bomrah	bb2375b15e	Temp Commit	2012-04-06 19:05:11 +08:00
Christophe Vilayphiou	f65bb9b323	Merge branch 'master' into desktop_harry ... Conflicts: app/assets/stylesheets/style.css.erb	2012-04-06 19:02:39 +08:00
Christophe Vilayphiou	253f4bcb54	Ray's changes for orbit bar	2012-04-06 18:06:57 +08:00
Harry Bomrah	e1ef2b28e7	theme changes	2012-04-06 17:49:22 +08:00
Harry Bomrah	7309d9c446	Dock change and getting values from db	2012-04-06 17:49:22 +08:00
Harry Bomrah	b2c9229099	route fixed.	2012-04-06 17:47:04 +08:00
Harry Bomrah	3acd8a86c7	commit temp	2012-04-06 17:47:04 +08:00
devin	cd3e04c55c	add tinyscrollbar	2012-04-06 17:47:04 +08:00
devin	293e084bea	dock effect	2012-04-06 17:47:04 +08:00
Harry Bomrah	f5c080efd4	Model commit	2012-04-06 17:47:04 +08:00
unknown	79f005c88e	new icons	2012-04-06 17:47:03 +08:00
Harry Bomrah	58b51f0d17	Themes fixed…	2012-04-06 17:47:03 +08:00
Harry Bomrah	ddf6a606a2	with notifications and other changes	2012-04-06 17:47:03 +08:00
Harry Bomrah	6158799a47	Stupid theme	2012-04-06 17:47:03 +08:00
Harry Bomrah	77b2919d8c	Desktop Commit	2012-04-06 17:47:02 +08:00
Harry Bomrah	da7b415ad8	Desktop commit	2012-04-06 17:47:01 +08:00
Harry Bomrah	94816ce224	js change	2012-04-06 15:18:39 +08:00
devin	74f083b226	details changed ... orbitdesktop.js, orbitdesktopAPI.js update!	2012-04-06 04:42:20 +08:00
Harry Bomrah	39e1bc8948	new setting page	2012-04-05 20:09:11 +08:00
Matthew K. Fu JuYuan	01bda515a6	fact_check with Ray's permission check. ... needs Ray's new css	2012-04-05 17:41:43 +08:00
Christophe Vilayphiou	ef8eb0450b	Changes in tinymce bar	2012-04-05 17:28:21 +08:00
devin	f7997bbd85	layout adjustment	2012-04-05 15:52:15 +08:00
unknown	d45725cf3b	fix announcement & add lang tab	2012-04-05 15:23:20 +08:00
Christophe Vilayphiou	1259d62249	Fix mainTablePosition in js -> remove the notable class	2012-04-05 14:55:41 +08:00
Harry Bomrah	e0f5583f43	route fixed.	2012-04-05 13:58:58 +08:00
Harry Bomrah	07dadbef70	commit temp	2012-04-05 13:54:49 +08:00
devin	a7d84e8583	add tinyscrollbar	2012-04-05 02:31:32 +08:00
devin	c4b9a9e275	dock effect	2012-04-04 05:53:49 +08:00
unknown	11d3906951	new icons	2012-04-03 18:06:16 +08:00
Matthew K. Fu JuYuan	8f28d45379	The new AdBanner.	2012-04-02 03:04:38 +08:00
Christophe Vilayphiou	503f71e554	Ray's changes in tags, css and js	2012-04-02 02:55:36 +08:00
Christophe Vilayphiou	6c50aa5243	Add pagination to bulletin index and remove ajax to make it simple	2012-04-02 02:55:36 +08:00
Harry Bomrah	bbd2c23b3d	Themes fixed…	2012-03-30 18:06:06 +08:00
Harry Bomrah	aa3997f7cf	with notifications and other changes	2012-03-29 19:50:23 +08:00
Harry Bomrah	176597f5af	Stupid theme	2012-03-29 15:23:48 +08:00
Harry Bomrah	2e283a039d	Desktop Commit	2012-03-28 18:53:30 +08:00
Harry Bomrah	4798cd43c1	Desktop commit	2012-03-28 18:53:06 +08:00
Christophe Vilayphiou	d6e4da6dad	Ray's fix for margin-top	2012-03-28 11:31:07 +08:00
Christophe Vilayphiou	55d12e50f2	Ray's changes in announcenment back-end	2012-03-27 18:58:03 +08:00
Christophe Vilayphiou	f9c5ee5d18	Merge branch 'dashboard' of github.com:Rulingcom/orbit into dashboard ... Conflicts: app/assets/javascripts/bulletin_form.js.erb vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/show.html.erb vendor/built_in_modules/announcement/config/routes.rb	2012-03-27 18:37:14 +08:00
unknown	e8d1352890	fix announcement	2012-03-27 14:29:11 +08:00
unknown	a30bc499c7	fix announcement & links	2012-03-27 14:19:58 +08:00
unknown	42519d9f78	fix announcement & links	2012-03-23 18:04:11 +08:00
Christophe Vilayphiou	61698f3f2c	Remove quick_edit on bulletin index load	2012-03-23 17:32:59 +08:00
Christophe Vilayphiou	472744fc87	Changes for IE9 with html5	2012-03-21 15:51:55 +08:00
Christophe Vilayphiou	3aa7c5120d	Put tinymce in its own js file. ... To use on a text area just add the class "tinymce_textarea".	2012-03-21 12:41:32 +08:00
unknown	a755eb184b	fix announcement links & files	2012-03-16 16:49:25 +08:00
unknown	7d553acaec	fix announcement link & files	2012-03-16 15:53:57 +08:00
Christophe Vilayphiou	07edf44643	Merge branches 'design_team' and 'design_team' of github.com:Rulingcom/orbit into design_team	2012-03-16 15:13:06 +08:00
Christophe Vilayphiou	29ec36130e	css and js changes	2012-03-16 15:06:45 +08:00
unknown	6f6e84b015	fix dashboard & announcement	2012-03-16 14:44:57 +08:00
unknown	00ab773942	fix dashboard & announcement	2012-03-14 20:05:03 +08:00
Christophe Vilayphiou	6b2aeadde6	Changes for nccu	2012-02-29 16:01:50 +08:00
Christophe Vilayphiou	5223a7a3e9	Css and js changes	2012-02-29 12:45:47 +08:00
Christophe Vilayphiou	9aa4173933	Change orbit-bar for language but bug when user name is too long	2012-02-29 04:21:56 +08:00
Christophe Vilayphiou	6a30b0a1e4	Add RSS event	2012-02-28 18:29:13 +08:00
Christophe Vilayphiou	f13ebc6c46	Fix bugs and changes for nccu	2012-02-27 18:50:56 +08:00
Christophe Vilayphiou	f8d1d7242d	Merge branch 'design_team' into dashboard	2012-02-23 16:05:33 +08:00
Christophe Vilayphiou	1a6e497b3d	Ika's changes	2012-02-23 15:53:15 +08:00
Christophe Vilayphiou	63d7810b35	Add isotope, categories for announcement page, sort for announcement	2012-02-23 15:52:58 +08:00
Christophe Vilayphiou	22d9741ac8	Fix for orbit_bar	2012-02-23 15:51:33 +08:00
Christophe Vilayphiou	ba4d71a026	Changes in orbit_bar and js in announcements	2012-02-23 15:51:33 +08:00
Christophe Vilayphiou	cf038183b9	Ika's changes in modules	2012-02-20 08:48:27 +08:00
Christophe Vilayphiou	a3f152b200	Changes for jquery 1.7 (.live -> .on), create module_layout	2012-02-20 03:24:05 +08:00
Christophe Vilayphiou	44a346ffe9	Changes for orbit bar, login	2012-02-19 16:33:22 +08:00
Christophe Vilayphiou	9cd3cbc478	Modifications for design, pages, page_parts… ... Move orbit_bar out of kernel.js	2012-02-17 02:09:32 +08:00
Christophe Vilayphiou	e0accbecaa	Changes into page_part edition. ... Can choose between 'text', 'public_r_tag' and 'widget'	2012-02-16 13:09:09 +08:00
Christophe Vilayphiou	1913f0aca8	Add tinymce	2012-02-15 10:02:05 +08:00
Christophe Vilayphiou	3e70634add	Announcement modifications and tags	2012-02-15 00:34:22 +08:00
Christophe Vilayphiou	55ae7de01c	Orbit-bar in front-end and back-end, side-bar and drop-down menu	2012-02-15 00:34:22 +08:00
unknown	f097f83f2b	announcement_category edit	2012-02-06 16:20:51 +08:00
Matthew Kaito Juyuan Fu	8b3b71ca58	fix js bugs,partial bugs	2012-02-06 16:17:07 +08:00
Matthew Kaito Juyuan Fu	394099c388	Ad banner close complete,need validation	2012-02-04 09:37:23 +08:00
Matthew Kaito Juyuan Fu	f530eb7112	Revert "mistake commit" ... This reverts commit 2608b72d65.	2012-02-03 14:39:15 +08:00
Matthew Kaito Juyuan Fu	2608b72d65	mistake commit	2012-02-03 14:28:08 +08:00
Matthew Kaito Juyuan Fu	a980847eb3	Basic function for AdBanner	2012-02-01 14:27:51 +08:00
Christophe Vilayphiou	5518ae362d	Ray's modification before redesign	2012-01-24 11:57:27 +08:00
chris2tof	b04d845a5a	New rss.js from Harry and fix html form for assets	2012-01-24 11:56:08 +08:00
Christophe Vilayphiou	3e912b6262	Merge branches 'master' and 'exception_notification' into new_announcement_dev	2012-01-16 07:57:40 +08:00
chris2tof	4be97f6ea6	Merge branch 'fix_it' ... Conflicts: app/assets/javascripts/page_edit.js app/assets/javascripts/rss.js app/assets/stylesheets/admin.css.erb app/assets/stylesheets/admin_back_end.css.erb app/controllers/admin/app_auths_controller.rb app/controllers/admin/module_apps_controller.rb app/controllers/admin/users_controller.rb app/controllers/application_controller.rb app/models/app_auth.rb app/models/user/user.rb app/views/admin/app_auths/index.html.erb app/views/admin/attributes/_attribute_field.html.erb app/views/admin/designs/_new.html.erb app/views/admin/designs/new.html.erb app/views/admin/infos/_form.html.erb app/views/admin/module_apps/_app_selector.html.erb app/views/admin/module_apps/index.html.erb app/views/admin/pages/_form.html.erb app/views/admin/roles/_form.html.erb app/views/admin/roles/_sub_role.html.erb app/views/admin/users/_form.html.erb app/views/admin/users/_show_sub_role.html.erb app/views/admin/users/_sub_role.html.erb app/views/admin/users/edit.html.erb app/views/admin/users/index.html.erb app/views/admin/users/new.html.erb app/views/admin/users/show.html.erb app/views/layouts/admin.html.erb lib/fraisier/layout.html lib/parsers/parser_back_end.rb lib/parsers/parser_layout.rb lib/tasks/dev.rake spec/models/app_auth_basic.rb vendor/built_in_modules/NewBlog/.gitignore vendor/built_in_modules/NewBlog/Gemfile vendor/built_in_modules/NewBlog/Gemfile.lock vendor/built_in_modules/NewBlog/MIT-LICENSE vendor/built_in_modules/NewBlog/NewBlog.gemspec vendor/built_in_modules/NewBlog/README.rdoc vendor/built_in_modules/NewBlog/Rakefile vendor/built_in_modules/NewBlog/app/assets/images/NewBlog/.gitkeep vendor/built_in_modules/NewBlog/app/assets/javascripts/NewBlog/.gitkeep vendor/built_in_modules/NewBlog/app/assets/stylesheets/NewBlog/.gitkeep vendor/built_in_modules/NewBlog/app/assets/stylesheets/NewBlog/application.css vendor/built_in_modules/NewBlog/app/assets/stylesheets/NewBlog/production.css vendor/built_in_modules/NewBlog/app/controllers/.gitkeep vendor/built_in_modules/NewBlog/app/controllers/application_controller.rb vendor/built_in_modules/NewBlog/app/controllers/panel/blog/back_end/posts_controller.rb vendor/built_in_modules/NewBlog/app/helpers/.gitkeep vendor/built_in_modules/NewBlog/app/helpers/application_helper.rb vendor/built_in_modules/NewBlog/app/mailers/.gitkeep vendor/built_in_modules/NewBlog/app/models/.gitkeep vendor/built_in_modules/NewBlog/app/models/comment.rb vendor/built_in_modules/NewBlog/app/models/post.rb vendor/built_in_modules/NewBlog/app/views/.gitkeep vendor/built_in_modules/NewBlog/app/views/layouts/application.html.erb vendor/built_in_modules/NewBlog/app/views/layouts/edit_view.html.erb vendor/built_in_modules/NewBlog/app/views/layouts/production.html.erb vendor/built_in_modules/NewBlog/app/views/panel/blog/back_end/posts/_form.html.erb vendor/built_in_modules/NewBlog/app/views/panel/blog/back_end/posts/index.html.erb vendor/built_in_modules/NewBlog/app/views/panel/blog/back_end/posts/latest_post.html.erb vendor/built_in_modules/NewBlog/app/views/panel/blog/back_end/posts/new.html.erb vendor/built_in_modules/NewBlog/app/views/panel/blog/back_end/posts/show.html.erb vendor/built_in_modules/NewBlog/app/views/panel/blog/front_end/posts/show.html.erb vendor/built_in_modules/NewBlog/app/views/panel/blog/widget/posts/index.html.erb vendor/built_in_modules/NewBlog/app/views/panel/blog/widget/posts/latest_post.html.erb vendor/built_in_modules/NewBlog/config/locales/en.yml vendor/built_in_modules/NewBlog/lib/NewBlog.rb vendor/built_in_modules/NewBlog/lib/NewBlog/engine.rb vendor/built_in_modules/NewBlog/lib/NewBlog/version.rb vendor/built_in_modules/NewBlog/lib/tasks/NewBlog_tasks.rake vendor/built_in_modules/NewBlog/script/rails vendor/built_in_modules/NewBlog/test/NewBlog_test.rb vendor/built_in_modules/NewBlog/test/dummy/Rakefile vendor/built_in_modules/NewBlog/test/dummy/app/assets/javascripts/application.js vendor/built_in_modules/NewBlog/test/dummy/app/assets/stylesheets/application.css vendor/built_in_modules/NewBlog/test/dummy/app/controllers/application_controller.rb vendor/built_in_modules/NewBlog/test/dummy/app/helpers/application_helper.rb vendor/built_in_modules/NewBlog/test/dummy/app/mailers/.gitkeep vendor/built_in_modules/NewBlog/test/dummy/app/models/.gitkeep vendor/built_in_modules/NewBlog/test/dummy/app/views/layouts/application.html.erb vendor/built_in_modules/NewBlog/test/dummy/config.ru vendor/built_in_modules/NewBlog/test/dummy/config/application.rb vendor/built_in_modules/NewBlog/test/dummy/config/boot.rb vendor/built_in_modules/NewBlog/test/dummy/config/database.yml vendor/built_in_modules/NewBlog/test/dummy/config/environment.rb vendor/built_in_modules/NewBlog/test/dummy/config/environments/development.rb vendor/built_in_modules/NewBlog/test/dummy/config/environments/production.rb vendor/built_in_modules/NewBlog/test/dummy/config/environments/test.rb vendor/built_in_modules/NewBlog/test/dummy/config/initializers/backtrace_silencers.rb vendor/built_in_modules/NewBlog/test/dummy/config/initializers/inflections.rb vendor/built_in_modules/NewBlog/test/dummy/config/initializers/mime_types.rb vendor/built_in_modules/NewBlog/test/dummy/config/initializers/secret_token.rb vendor/built_in_modules/NewBlog/test/dummy/config/initializers/session_store.rb vendor/built_in_modules/NewBlog/test/dummy/config/initializers/wrap_parameters.rb vendor/built_in_modules/NewBlog/test/dummy/config/locales/en.yml vendor/built_in_modules/NewBlog/test/dummy/config/mongoid.yml vendor/built_in_modules/NewBlog/test/dummy/config/routes.rb vendor/built_in_modules/NewBlog/test/dummy/lib/assets/.gitkeep vendor/built_in_modules/NewBlog/test/dummy/log/.gitkeep vendor/built_in_modules/NewBlog/test/dummy/public/404.html vendor/built_in_modules/NewBlog/test/dummy/public/422.html vendor/built_in_modules/NewBlog/test/dummy/public/500.html vendor/built_in_modules/NewBlog/test/dummy/public/favicon.ico vendor/built_in_modules/NewBlog/test/dummy/script/rails vendor/built_in_modules/NewBlog/test/integration/navigation_test.rb vendor/built_in_modules/NewBlog/test/test_helper.rb vendor/built_in_modules/blog/app/controllers/application_controller.rb vendor/built_in_modules/blog/app/controllers/panel/blog/posts_controller.rb vendor/built_in_modules/blog/app/helpers/application_helper.rb vendor/built_in_modules/blog/app/models/comment.rb vendor/built_in_modules/blog/app/models/post.rb vendor/built_in_modules/blog/app/views/layouts/application.html.erb vendor/built_in_modules/blog/app/views/panel/blog/posts/_form.html.erb vendor/built_in_modules/blog/app/views/panel/blog/posts/index.html.erb vendor/built_in_modules/blog/app/views/panel/blog/posts/show.html.erb vendor/built_in_modules/blog/config/initializers/backtrace_silencers.rb vendor/built_in_modules/blog/config/initializers/inflections.rb vendor/built_in_modules/blog/config/initializers/mime_types.rb vendor/built_in_modules/blog/public/404.html vendor/built_in_modules/blog/public/422.html vendor/built_in_modules/blog/public/500.html vendor/built_in_modules/blog/public/favicon.ico vendor/built_in_modules/blog/public/stylesheets/.gitkeep vendor/built_in_modules/blog/script/rails vendor/built_in_modules/blog/vendor/plugins/.gitkeep vendor/built_in_modules/new_blog/.gitignore vendor/built_in_modules/new_blog/Gemfile vendor/built_in_modules/new_blog/Gemfile.lock vendor/built_in_modules/new_blog/MIT-LICENSE vendor/built_in_modules/new_blog/README.rdoc vendor/built_in_modules/new_blog/Rakefile vendor/built_in_modules/new_blog/app/assets/images/NewBlog/.gitkeep vendor/built_in_modules/new_blog/app/assets/javascripts/NewBlog/.gitkeep vendor/built_in_modules/new_blog/app/assets/stylesheets/NewBlog/.gitkeep vendor/built_in_modules/new_blog/app/assets/stylesheets/NewBlog/application.css vendor/built_in_modules/new_blog/app/assets/stylesheets/NewBlog/production.css vendor/built_in_modules/new_blog/app/controllers/.gitkeep vendor/built_in_modules/new_blog/app/controllers/application_controller.rb vendor/built_in_modules/new_blog/app/controllers/panel/new_blog/back_end/posts_controller.rb vendor/built_in_modules/new_blog/app/helpers/.gitkeep vendor/built_in_modules/new_blog/app/mailers/.gitkeep vendor/built_in_modules/new_blog/app/models/.gitkeep vendor/built_in_modules/new_blog/app/models/comment.rb vendor/built_in_modules/new_blog/app/models/post.rb vendor/built_in_modules/new_blog/app/views/.gitkeep vendor/built_in_modules/new_blog/app/views/layouts/application.html.erb vendor/built_in_modules/new_blog/app/views/layouts/edit_view.html.erb vendor/built_in_modules/new_blog/app/views/layouts/production.html.erb vendor/built_in_modules/new_blog/app/views/panel/new_blog/back_end/posts/_form.html.erb vendor/built_in_modules/new_blog/app/views/panel/new_blog/back_end/posts/index.html.erb vendor/built_in_modules/new_blog/app/views/panel/new_blog/back_end/posts/latest_post.html.erb vendor/built_in_modules/new_blog/app/views/panel/new_blog/back_end/posts/new.html.erb vendor/built_in_modules/new_blog/app/views/panel/new_blog/back_end/posts/show.html.erb vendor/built_in_modules/new_blog/app/views/panel/new_blog/front_end/posts/show.html.erb vendor/built_in_modules/new_blog/app/views/panel/new_blog/widget/posts/index.html.erb vendor/built_in_modules/new_blog/app/views/panel/new_blog/widget/posts/latest_post.html.erb vendor/built_in_modules/new_blog/config/locales/en.yml vendor/built_in_modules/new_blog/lib/new_blog/version.rb vendor/built_in_modules/new_blog/lib/tasks/NewBlog_tasks.rake vendor/built_in_modules/new_blog/new_blog.gemspec vendor/built_in_modules/new_blog/script/rails vendor/built_in_modules/new_blog/test/NewBlog_test.rb vendor/built_in_modules/new_blog/test/dummy/Rakefile vendor/built_in_modules/new_blog/test/dummy/app/assets/javascripts/application.js vendor/built_in_modules/new_blog/test/dummy/app/assets/stylesheets/application.css vendor/built_in_modules/new_blog/test/dummy/app/controllers/application_controller.rb vendor/built_in_modules/new_blog/test/dummy/app/helpers/application_helper.rb vendor/built_in_modules/new_blog/test/dummy/app/mailers/.gitkeep vendor/built_in_modules/new_blog/test/dummy/app/models/.gitkeep vendor/built_in_modules/new_blog/test/dummy/app/views/layouts/application.html.erb vendor/built_in_modules/new_blog/test/dummy/config.ru vendor/built_in_modules/new_blog/test/dummy/config/application.rb vendor/built_in_modules/new_blog/test/dummy/config/boot.rb vendor/built_in_modules/new_blog/test/dummy/config/database.yml vendor/built_in_modules/new_blog/test/dummy/config/environment.rb vendor/built_in_modules/new_blog/test/dummy/config/environments/development.rb vendor/built_in_modules/new_blog/test/dummy/config/environments/production.rb vendor/built_in_modules/new_blog/test/dummy/config/environments/test.rb vendor/built_in_modules/new_blog/test/dummy/config/initializers/backtrace_silencers.rb vendor/built_in_modules/new_blog/test/dummy/config/initializers/inflections.rb vendor/built_in_modules/new_blog/test/dummy/config/initializers/mime_types.rb vendor/built_in_modules/new_blog/test/dummy/config/initializers/secret_token.rb vendor/built_in_modules/new_blog/test/dummy/config/initializers/session_store.rb vendor/built_in_modules/new_blog/test/dummy/config/initializers/wrap_parameters.rb vendor/built_in_modules/new_blog/test/dummy/config/locales/en.yml vendor/built_in_modules/new_blog/test/dummy/config/mongoid.yml vendor/built_in_modules/new_blog/test/dummy/config/routes.rb vendor/built_in_modules/new_blog/test/dummy/lib/assets/.gitkeep vendor/built_in_modules/new_blog/test/dummy/log/.gitkeep vendor/built_in_modules/new_blog/test/dummy/public/404.html vendor/built_in_modules/new_blog/test/dummy/public/422.html vendor/built_in_modules/new_blog/test/dummy/public/500.html vendor/built_in_modules/new_blog/test/dummy/public/favicon.ico vendor/built_in_modules/new_blog/test/dummy/script/rails vendor/built_in_modules/new_blog/test/integration/navigation_test.rb vendor/built_in_modules/new_blog/test/test_helper.rb vendor/plugins/NewBlog/.gitignore vendor/plugins/NewBlog/Gemfile vendor/plugins/NewBlog/Gemfile.lock vendor/plugins/NewBlog/MIT-LICENSE vendor/plugins/NewBlog/NewBlog.gemspec vendor/plugins/NewBlog/README.rdoc vendor/plugins/NewBlog/Rakefile vendor/plugins/NewBlog/app/assets/images/NewBlog/.gitkeep vendor/plugins/NewBlog/app/assets/javascripts/NewBlog/.gitkeep vendor/plugins/NewBlog/app/assets/stylesheets/NewBlog/.gitkeep vendor/plugins/NewBlog/app/assets/stylesheets/NewBlog/application.css vendor/plugins/NewBlog/app/assets/stylesheets/NewBlog/production.css vendor/plugins/NewBlog/app/controllers/.gitkeep vendor/plugins/NewBlog/app/helpers/.gitkeep vendor/plugins/NewBlog/app/mailers/.gitkeep vendor/plugins/NewBlog/app/models/.gitkeep vendor/plugins/NewBlog/app/views/.gitkeep vendor/plugins/NewBlog/app/views/layouts/edit_view.html.erb vendor/plugins/NewBlog/app/views/layouts/production.html.erb vendor/plugins/NewBlog/app/views/panel/blog/posts/index.html.erb vendor/plugins/NewBlog/app/views/panel/blog/posts/latest_post.html.erb vendor/plugins/NewBlog/app/views/panel/blog/posts/new.html.erb vendor/plugins/NewBlog/app/views/panel/blog/posts/show.html.erb vendor/plugins/NewBlog/app/views/panel/blog/posts/widget_index.html.erb vendor/plugins/NewBlog/app/views/panel/blog/posts/widget_latest_post.html.erb vendor/plugins/NewBlog/config/locales/en.yml vendor/plugins/NewBlog/lib/NewBlog/version.rb vendor/plugins/NewBlog/lib/tasks/NewBlog_tasks.rake vendor/plugins/NewBlog/script/rails vendor/plugins/NewBlog/test/NewBlog_test.rb vendor/plugins/NewBlog/test/dummy/Rakefile vendor/plugins/NewBlog/test/dummy/app/assets/javascripts/application.js vendor/plugins/NewBlog/test/dummy/app/assets/stylesheets/application.css vendor/plugins/NewBlog/test/dummy/app/controllers/application_controller.rb vendor/plugins/NewBlog/test/dummy/app/mailers/.gitkeep vendor/plugins/NewBlog/test/dummy/app/models/.gitkeep vendor/plugins/NewBlog/test/dummy/app/views/layouts/application.html.erb vendor/plugins/NewBlog/test/dummy/config.ru vendor/plugins/NewBlog/test/dummy/config/application.rb vendor/plugins/NewBlog/test/dummy/config/boot.rb vendor/plugins/NewBlog/test/dummy/config/database.yml vendor/plugins/NewBlog/test/dummy/config/environment.rb vendor/plugins/NewBlog/test/dummy/config/environments/development.rb vendor/plugins/NewBlog/test/dummy/config/environments/production.rb vendor/plugins/NewBlog/test/dummy/config/environments/test.rb vendor/plugins/NewBlog/test/dummy/config/initializers/secret_token.rb vendor/plugins/NewBlog/test/dummy/config/initializers/session_store.rb vendor/plugins/NewBlog/test/dummy/config/initializers/wrap_parameters.rb vendor/plugins/NewBlog/test/dummy/config/locales/en.yml vendor/plugins/NewBlog/test/dummy/config/mongoid.yml vendor/plugins/NewBlog/test/dummy/config/routes.rb vendor/plugins/NewBlog/test/integration/navigation_test.rb vendor/plugins/NewBlog/test/test_helper.rb	2012-01-12 18:15:43 +08:00
unknown	ec235bcaa3	merge with master	2012-01-11 20:31:52 +08:00
chris2tof	d85f29e65c	Fix missing modification for "panel_main" to "back_main"	2011-12-29 17:49:48 +08:00
chris2tof	c1238a7043	Prefix ids with "back_" in back-end layout to avoid conflict with site's ids	2011-12-29 15:35:13 +08:00
chris2tof	ea19f11fe2	Integrate Harry's modifications to reload pop-up content	2011-12-29 14:09:06 +08:00
chris2tof	b002c411ce	Merge branch 'design_team'	2011-12-28 21:03:35 +08:00
Christophe Vilayphiou	75c9851dbc	Ray's back-end modifications for sub-roles	2011-12-28 20:57:18 +08:00
chris2tof	090493fd51	Re-commit	2011-12-28 20:51:52 +08:00
chris2tof	245def9cb6	Integration of pop-up and generic js.erb	2011-12-28 20:49:53 +08:00
chris2tof	62aaf79491	Merge with sub_roles	2011-12-23 18:34:21 +08:00
Christophe Vilayphiou	fc591ee308	Ray's back_end modification before sub_roles	2011-12-23 18:02:45 +08:00
Matthew Fu	d3ca1647be	fix page form bugs	2011-12-23 13:54:28 +08:00
chris2tof	d465febca7	merge with november_presentation	2011-12-22 15:43:38 +08:00
chris2tof	e7c9816139	Move NewBlog to built_in_modules and delete "vendor/templates"	2011-12-22 01:38:27 +08:00
chris2tof	a09f8e4551	merge with november_presentation	2011-12-20 16:47:17 +08:00
chris2tof	afbffe37d5	Users can now be saved with sub_roles	2011-12-20 14:35:28 +08:00
chris2tof	4108ebf06d	Fix mongoid deeply nested polimorphic ... Got the commit from github. The roles and sub_roles save.	2011-12-19 21:22:26 +08:00
chris2tof	d27d7a623c	Changes for sub_roles ... Issues: update doesn't create new i18n_variables, role form has bugs	2011-12-18 10:07:42 +08:00
chris2tof	d23cf152da	Merge 'standardization' and 'role structure modification'	2011-12-10 18:21:59 +08:00
Christophe Vilayphiou	f774084e9a	Back-end standardization	2011-12-10 18:03:32 +08:00
chris2tof	e0cdedfa2e	Remove useless controller and view ... user_attributes_controller and user_attributes views	2011-12-06 18:12:12 +08:00
chris2tof	b77282c643	Test redmine service-hook	2011-12-05 19:28:06 +08:00
chris2tof	69a8fce64a	Fix double loading bug ... On an html load, the page was reload by the js "popstate"	2011-12-05 11:22:32 +08:00
chris2tof	26b49dcf02	Remove js from html	2011-12-05 10:36:25 +08:00
chris2tof	75a3c4d5b1	Modify assets ... Each layout has a manifest for css and js	2011-12-05 09:54:41 +08:00
chris2tof	b68f5e11e5	Final modifications for the presentation	2011-11-22 18:54:10 +08:00
chris2tof	66bc0ce560	Modified dev.rake	2011-11-20 03:16:35 +08:00
chris2tof	ad9f9bbf5c	Final Ray's modifications	2011-11-19 21:47:18 +08:00
chris2tof	65349796d0	Ray's modifications	2011-11-18 16:43:14 +08:00
chris2tof	861237d65b	Integration of Ray' modifications	2011-11-17 20:02:58 +08:00
chris2tof	0556dc9297	ika's modification to the backend	2011-11-16 18:34:54 +08:00
Matthew Kaito Juyuan Fu	cb07a35cc9	Revert ff82391b7d0d17c17568ed21176b8b0112a34e31^..HEAD	2011-10-20 10:06:06 +08:00
Matthew Kaito Juyuan Fu	ff82391b7d	Revert "Merge with new_blog" ... This reverts commit 64c68fcdeb.	2011-10-20 10:01:39 +08:00
chris2tof	64c68fcdeb	Merge with new_blog	2011-10-18 11:36:01 +08:00
chris2tof	07ccacb7d7	Modifications of the JS in Design	2011-09-09 15:40:13 +08:00
chris2tof	a571d1dcff	Clean code and workaround mongoid embedded with carrierwave	2011-09-08 18:12:04 +08:00
chris2tof	0956e9784a	Fix bug in layout, parser and change lib/fraisier	2011-09-07 11:53:16 +08:00
chris2tof	230842d26a	Ika fix bug	2011-08-25 15:44:51 +08:00
chris2tof	c248b729db	CSS problem for page	2011-08-25 15:08:23 +08:00
chris2tof	4540f23a3f	Merge branch 'rails_3_1' of github.com:Rulingcom/orbit into rails_3_1	2011-08-25 08:18:22 +08:00
chris2tof	c427e2af14	Page form with drop down. Modifications for Designs	2011-08-25 08:13:38 +08:00
chris2tof	4cd9854706	Ika's changes	2011-08-25 08:07:18 +08:00
chris2tof	09cdb9a852	CSS modifications for design team	2011-08-23 15:59:07 +08:00
chris2tof	4f38074932	content.css -> content.css.erb	2011-08-23 10:05:16 +08:00
chris2tof	e74f2931b1	Modifications asset pipeline	2011-08-20 22:54:07 +08:00
Kaito	f6ae58cef4	Trying to create Design from upload package	2011-08-12 17:47:03 +08:00
Kaito	b6db304579	add nokogiri into Gemfile and fixing dup bug again...	2011-07-29 17:49:10 +08:00
Kaito	c9e4d0f345	in design,after online editing,return json url,callback not finish	2011-07-28 18:54:31 +08:00
Kaito	1839269581	finishing saving edited file online and redo dev.rake modification	2011-07-28 18:08:16 +08:00
Kaito	9eb80d7424	Made r_editor into class style add functions	2011-07-27 17:23:01 +08:00
Kaito	dabd6dd5b5	Fixing upload bug	2011-07-26 18:22:17 +08:00
Kaito	1ac10e70a2	redo lost code....	2011-07-22 16:28:41 +08:00
chris2tof	9898bd9df7	Modification in JS to upload more than 2 files	2011-07-21 11:22:31 +08:00
Matthew Fu	f8d1a1315b	fixing duplicate when updating design	2011-07-20 17:05:28 +08:00
Matthew Fu	e3a50ccf69	move design file field to partial	2011-07-20 14:04:16 +08:00
Matthew Fu	612ed629bc	fix design upload	2011-07-20 09:58:24 +08:00
Matthew Fu	c48a11d9f5	Add some JS for design uploading	2011-07-19 18:31:53 +08:00
Matthew Fu	f73f09ffcf	adding files not commited from previous commit	2011-07-12 16:02:41 +08:00