Orbit

0 Fork 0

Author	SHA1	Message	Date
harrybomrah	638ed73d21	added sync for journal paper books and conference.. and also disabled the icons	2013-09-26 22:26:19 +08:00
saurabhbhatia	096aec3406	Merge branch 'development' of https://github.com/Rulingcom/orbit into 0917_ntu_mb Bring Development Related Changes to ntu_mb	2013-09-26 20:31:46 +08:00
chris	622534e5db	Fix user order: - gender color - add cancel button for input	2013-09-26 20:18:34 +08:00
harrybomrah	52c896d8c5	some backend code change for sharing personal plugin module content. Added sharing in desktop for all the modules.	2013-09-26 20:11:45 +08:00
Spen	028c689739	Change User.all to User.not_guest_user	2013-09-26 19:46:14 +08:00
chris	f81894af90	User ordering Run the task new_ui:save_users	2013-09-26 19:00:13 +08:00
Spen	09e0d5bd92	sso for ntu mb all sites	2013-09-26 18:52:32 +08:00
saurabhbhatia	1159375de7	Updated Import to Sync Data for all personal plugins	2013-09-26 18:51:31 +08:00
Manson Wang	dc3593c162	zh-tw for new ui	2013-09-26 17:13:17 +08:00
saurabhbhatia	843775a2c0	Fixed the order in Personal Plugin member show page	2013-09-26 16:39:45 +08:00
Manson Wang	16c26e3273	Fix path of jquery.cycle.all.latest.js	2013-09-26 16:11:08 +08:00
saurabhbhatia	1021ac2e9b	Merge branch '0917_ntu_mb' of https://github.com/Rulingcom/orbit into 0917_ntu_mb	2013-09-26 14:46:14 +08:00
saurabhbhatia	ab04070a8e	Updated show to remove test code	2013-09-26 14:45:43 +08:00
saurabhbhatia	5ec011a5ff	Fixed Personal Plugins tabs for en locale	2013-09-26 14:45:43 +08:00
Spen	cd8448d447	Add Brief intro. for all personal plugins Add Share Setting for Personal Plugins ( if have old data must be add default value "field: is_hidden => false " ) Apply New UI to Member Plugin Edit Page Personal Plugin Summary fix Academic Info. list fix Updated Import method in teachers to make all false positives. Updated Data import and sync code Updated Books,Conference, Journal to display properly in the frontend Journal title being imported correctly now Fixed Import data to import journal level types, fixed writing journal	2013-09-26 14:45:43 +08:00
saurabhbhatia	7990d4388c	Import Announcements, Journal Paper, Conference Data, book data Conflicts: app/models/user/user.rb Updated import data controller to check for blank user_id Updated import data controller to check the absense of title data Updated route to get announcement data Conflicts: config/routes.rb Updated import data controller Updated import data controller to import data correctly Added method for importing page data Updated import data with pages working Updated Import data with page data importing successfully Updated import controller Updated import data to get complete teacher and announcement data	2013-09-26 14:45:42 +08:00
saurabhbhatia	367cf67928	Get data from database Conflicts: app/controllers/admin/import_data_controller.rb Conflicts: app/controllers/admin/import_data_controller.rb app/views/admin/import_data/get_teacher_data.html.erb	2013-09-26 14:45:42 +08:00
harrybomrah	e7c04c6e6e	small add question fix for survey module.	2013-09-26 09:33:25 +08:00
harrybomrah	6ac600fb5c	brief added to desktop for all plugins	2013-09-26 09:33:18 +08:00
harrybomrah	42dcf0a2d2	survey edit completed	2013-09-26 09:33:10 +08:00
harrybomrah	c35d42d671	external links and link widget fixed for development	2013-09-26 09:33:01 +08:00
harrybomrah	5332162646	small add question fix for survey module.	2013-09-26 09:31:52 +08:00
harrybomrah	1d0ea6718f	brief added to desktop for all plugins	2013-09-25 18:23:44 +08:00
saurabhbhatia	6fc47d7afd	Updated show to remove test code	2013-09-25 17:33:05 +08:00
harrybomrah	04ff345b94	survey edit completed	2013-09-25 17:29:38 +08:00
saurabhbhatia	79c4cd2075	Fixed Personal Plugins tabs for en locale	2013-09-25 17:07:15 +08:00
saurabhbhatia	2a41e3440e	Fixed Import data to import journal level types, fixed writing journal	2013-09-25 12:58:37 +08:00
saurabhbhatia	e29b08d0dc	Journal title being imported correctly now	2013-09-24 17:13:00 +08:00
harrybomrah	58fb2d1c73	external links and link widget fixed for development	2013-09-24 15:37:40 +08:00
saurabhbhatia	d5bb2a1889	Updated Books,Conference, Journal to display properly in the frontend	2013-09-24 15:07:49 +08:00
saurabhbhatia	b535f2cf9c	Updated Data import and sync code	2013-09-23 16:18:07 +08:00
saurabhbhatia	f2a27c6b40	Updated Import method in teachers to make all false positives.	2013-09-23 09:52:33 +08:00
Spen	9613a52305	Add Brief intro. for all personal plugins Add Share Setting for Personal Plugins ( if have old data must be add default value "field: is_hidden => false " ) Apply New UI to Member Plugin Edit Page Personal Plugin Summary fix Academic Info. list fix	2013-09-18 18:56:36 +08:00
Spen	a067bcd304	Add Brief intro. for all personal plugins Add Share Setting for Personal Plugins ( if have old data must be add default value "field: is_hidden => false " ) Apply New UI to Member Plugin Edit Page Personal Plugin Summary fix Academic Info. list fix	2013-09-18 18:55:40 +08:00
saurabhbhatia	b487740035	Fixed Pagination Errors in member module	2013-09-18 16:11:17 +08:00
saurabhbhatia	dc8815d619	Fixed Pagination Errors in member module	2013-09-18 16:10:39 +08:00
harrybomrah	b5b416d531	add page completed with attributes and reordering	2013-09-18 12:27:01 +08:00
harrybomrah	f27f96b994	commit for survey questions	2013-09-18 12:26:52 +08:00
harrybomrah	1e3cffee0a	add page completed with attributes and reordering	2013-09-17 15:34:34 +08:00
harrybomrah	e4a16eab3a	commit for survey questions	2013-09-17 15:34:23 +08:00
saurabhbhatia	cd1d4356fb	Updated import data to get complete teacher and announcement data	2013-09-17 11:36:50 +08:00
saurabhbhatia	d5357ea63c	Updated import controller	2013-09-17 11:36:45 +08:00
saurabhbhatia	50bb2a870c	Updated Import data with page data importing successfully	2013-09-17 11:36:41 +08:00
saurabhbhatia	a93945cd45	Updated import data with pages working	2013-09-17 11:36:38 +08:00
saurabhbhatia	249644e72c	Added method for importing page data	2013-09-17 11:36:35 +08:00
saurabhbhatia	f16d1908be	Updated import data controller to import data correctly	2013-09-17 11:36:31 +08:00
saurabhbhatia	c8be884291	Updated import data controller	2013-09-17 11:36:29 +08:00
saurabhbhatia	6280fdfba0	Updated route to get announcement data Conflicts: config/routes.rb	2013-09-17 11:36:26 +08:00
saurabhbhatia	2a9948868f	Updated import data controller to check the absense of title data	2013-09-17 11:36:24 +08:00
saurabhbhatia	e4514a353a	Updated import data controller to check for blank user_id	2013-09-17 11:36:07 +08:00
saurabhbhatia	d2a07d9ffb	Import Announcements, Journal Paper, Conference Data, book data Conflicts: app/models/user/user.rb	2013-09-17 11:36:05 +08:00
saurabhbhatia	93909eeca0	Get data from database Conflicts: app/controllers/admin/import_data_controller.rb Conflicts: app/controllers/admin/import_data_controller.rb app/views/admin/import_data/get_teacher_data.html.erb	2013-09-17 11:36:02 +08:00
harrybomrah	e45b7e09a0	half survey module form changed to new ui plus one calendar fix	2013-09-16 12:25:58 +08:00
harrybomrah	bd3462df7f	small change left in last commit. commiting for gallery widget	2013-09-16 11:19:24 +08:00
harrybomrah	f5f1822f0a	no data file added	2013-09-16 11:19:18 +08:00
harrybomrah	d532ded8e4	widget code for gallery rewritten for new_ui	2013-09-16 11:19:11 +08:00
chris	8456a91968	Fix structure edit	2013-09-14 17:26:16 +08:00
chris	ba7ac5d954	Fix [app_name]_category_with_title and change announcement init	2013-09-14 11:54:35 +08:00
Spen	9cc1e95cb1	announcement add new widget bulletins_and_links Conflicts: vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/_bulletins.html.erb	2013-09-14 11:52:19 +08:00
chris	c1cbfddf4b	Fix for user and role relationship (from role and sub-role side)	2013-09-13 17:39:01 +08:00
harrybomrah	3595c59810	some unmerged code i pushd 3 months back not update by chris	2013-09-13 15:58:42 +08:00
harrybomrah	789e02e313	ad_banner banner load fixed for test site	2013-09-13 14:23:44 +08:00
Manson Wang	bb8bc9a529	Added missing translation for gallery	2013-09-12 10:10:37 +08:00
Manson	6430e60577	Added the missing translations in config/locales/en.yml and zh_tw.yml Conflicts: config/locales/en.yml config/locales/zh_tw.yml	2013-09-12 09:30:07 +08:00
chris	17d7912e07	Ray's js code for status in form	2013-09-11 19:24:58 +08:00
chris	911cfdc980	Move js into a file for status in form	2013-09-11 18:38:56 +08:00
harrybomrah	579bc3c245	some very small fix for image alternative text and browse files manager	2013-09-11 14:03:25 +08:00
harrybomrah	8c98645a69	small bug fix for inserting and delete button.	2013-09-11 14:03:19 +08:00
harrybomrah	9e10a3c944	editing for the assets are done with replacable files and description	2013-09-11 14:03:13 +08:00
harrybomrah	f920a4f6ba	filemanager and some update for file uploader . added file uploader to kernel	2013-09-11 14:03:06 +08:00
chris	3328a41b55	Put back js that was deleted by mistake	2013-09-11 14:01:06 +08:00
chris	06203d27b9	Fix for user and role relationship	2013-09-11 14:00:41 +08:00
saurabhbhatia	865be29b37	Updated Preference Page	2013-09-09 11:29:46 +08:00
saurabhbhatia	0eeb7db1a8	Updated preference UI	2013-09-09 11:02:58 +08:00
saurabhbhatia	7216676c40	Updated Sidebar and Preferences	2013-09-09 10:18:14 +08:00
saurabhbhatia	fa857cfeea	Default Locale	2013-09-06 18:00:36 +08:00
saurabhbhatia	a3f1b8d54a	Updated Preferences in Site Info	2013-09-06 18:00:30 +08:00
saurabhbhatia	e9d6fa8787	Preference Page	2013-09-06 18:00:28 +08:00
saurabhbhatia	6e032a8757	Add Preference and search engine	2013-09-06 18:00:23 +08:00
saurabhbhatia	1558cfdb4e	Updated Sitebar with Search Engine	2013-09-06 18:00:21 +08:00
saurabhbhatia	9e4686a565	Fixed Site Info completely and added search engine page	2013-09-06 18:00:18 +08:00
saurabhbhatia	fef7cc4ed2	Updated Site info	2013-09-06 18:00:10 +08:00
saurabhbhatia	7f0821ea84	Updated Site info page to new ui	2013-09-06 17:59:56 +08:00
saurabhbhatia	2c0761aafb	Updated Sitemap to New UI	2013-09-06 17:59:54 +08:00
saurabhbhatia	1e5ad750cd	Updated Site bar with correct links	2013-09-06 17:59:43 +08:00
harrybomrah	335991e152	by mistake pushed code with debugger	2013-09-05 12:51:15 +08:00
harrybomrah	131dd3fea8	child images tag adding and deleting updated.	2013-09-05 12:51:13 +08:00
chris	6d8698af63	Comment out included css from member front	2013-09-03 17:09:47 +08:00
Matt K. Fu	00ddd94314	fix design index	2013-09-03 15:20:48 +08:00
chris	8045a18230	Change modal delete to take an "remote" option	2013-09-03 15:04:05 +08:00
Spen	81a89d2d7c	new ui member image js fix	2013-09-02 14:37:35 +08:00
harrybomrah	4209356e9d	new features in gallery image view.. and also tags for gallery completed.	2013-09-02 11:23:01 +08:00
Spen	3123c5de0a	new ui member bug and interface fix	2013-09-02 11:22:17 +08:00
harrybomrah	82b6be483a	isotope embedded inside desktop kernel	2013-08-30 10:58:08 +08:00
harrybomrah	ff64fb5230	file title translations fixed	2013-08-30 10:57:54 +08:00
saurabhbhatia	2bc9d3424a	Deleted unused module	2013-08-27 15:10:10 +08:00
saurabhbhatia	5591b06ee6	Ask Module for New UI	2013-08-27 12:38:06 +08:00
saurabhbhatia	b970ea1e0e	Updated Authorization for member, link, tag, archive	2013-08-27 10:14:39 +08:00
saurabhbhatia	155722519b	Module Auth for video	2013-08-23 15:22:21 +08:00
chris	45e987d6f5	Fix for authorization Dashboard and page authorisation	2013-08-23 12:08:33 +08:00
harrybomrah	399dfad392	faq authorization completed.	2013-08-22 18:00:05 +08:00
saurabhbhatia	53e5c57970	Commented Dashboard Public Visibility and fall back on no-filter defined authorization	2013-08-22 16:43:11 +08:00
saurabhbhatia	e75873273c	Updated Gallery with authorizations	2013-08-22 16:25:11 +08:00
saurabhbhatia	4c217ec12f	Updated Authorizations for Adbanner, Calendar, Location	2013-08-22 15:20:50 +08:00
saurabhbhatia	452da1b8ec	Updated Desktop Themes controller	2013-08-22 14:14:19 +08:00
chris	ec40591489	Make the filter for authorisation easier for developers	2013-08-22 12:17:50 +08:00
Spen	4078d426a6	new ui personal front_end page(member app) & users_new_interface show sub_roles fix	2013-08-21 14:13:36 +08:00
chris	c474fa063f	New authorization	2013-08-21 13:42:29 +08:00
chris	d24bd176cc	Changes in datetimepicker to accepts formats in options	2013-08-21 13:42:29 +08:00
harrybomrah	897ed49d2e	new ui for faq and announcement status fixed.	2013-08-20 18:22:11 +08:00
saurabhbhatia	21a7b5da5c	Icons for sidebar	2013-08-19 17:13:36 +08:00
harrybomrah	b004121187	minimize bar updated to new style and more flexible.	2013-08-19 12:59:57 +08:00
saurabhbhatia	bc596614fb	fixed pagnination errors for ask,qa,survey module	2013-08-19 10:16:53 +08:00
harrybomrah	88ad59f55a	title and css fix for file view	2013-08-19 09:42:50 +08:00
saurabhbhatia	7dfd5d7e00	Generate Breadcrumb for only for modules where module_apps are clearly defined	2013-08-19 09:39:45 +08:00
harrybomrah	bbb765c88d	small fix for file link inside edit form for desktop	2013-08-16 15:49:12 +08:00
harrybomrah	6577885761	docx xlsx and pptx file types fixed plus icon provided in edit form for files	2013-08-16 15:49:04 +08:00
Spen	a12e538932	new ui member show plugin profile translation fix	2013-08-14 17:21:40 +08:00
harrybomrah	a04155963d	all file things are fixed. delete and view and also names	2013-08-14 09:30:48 +08:00
harrybomrah	6d54dbd5f8	bilingual for files fixed and description added and also filename display after selecting filenames Conflicts: app/assets/javascripts/desktop/orbitdesktop.js	2013-08-13 17:22:09 +08:00
saurabhbhatia	cb070cc537	Updated Desktop with fix for forms for all users	2013-08-13 11:51:59 +08:00
Spen	6c514770bc	solved conflict for member_new_ui	2013-08-12 15:40:34 +08:00
harrybomrah	9c7558847a	bilingual fixed for all the plugins in desktop	2013-08-12 12:28:58 +08:00
harrybomrah	771ec0b8f6	css fixed for plugins and types and also some other css problem fixed	2013-08-12 12:28:51 +08:00
harrybomrah	d0ef862f85	language changes and conferences add/edit bug fixed	2013-08-12 12:28:46 +08:00
harrybomrah	b2c3beefe9	icons and colors for themes fixed	2013-08-12 12:28:39 +08:00
harrybomrah	55670e6318	icons and theme minicolors fixed	2013-08-12 12:28:32 +08:00
saurabhbhatia	76d25882e8	Added Rake task to update desktop users to new_ui	2013-08-09 18:44:43 +08:00
saurabhbhatia	6269c6d1e6	Updated init.rb	2013-08-09 15:22:12 +08:00
saurabhbhatia	7c64e8c637	Updated AdBanner index page and Ad Image index page, and edit pages Conflicts: vendor/built_in_modules/ad_banner/config/locales/en.yml vendor/built_in_modules/ad_banner/init.rb	2013-08-09 15:22:06 +08:00
saurabhbhatia	e14cb3c74c	Updated adimage home page	2013-08-09 15:22:00 +08:00
saurabhbhatia	a2e9aa2e0b	Updated ADBanner with fixes on index page, ADImage with fixes Conflicts: app/views/admin/ad_banners/index.html.erb app/views/admin/ad_images/_form.html.erb vendor/built_in_modules/ad_banner/init.rb	2013-08-09 15:21:51 +08:00
saurabhbhatia	a5c800d3fe	Added video widget to new UI	2013-08-09 10:46:16 +08:00
harrybomrah	0b6ace4e26	ok for precompiling	2013-08-07 15:03:08 +08:00
harrybomrah	e3d9966f76	bugs fixed for plugins. .. and also css fixed	2013-08-06 17:53:04 +08:00
harrybomrah	7d288b4160	some changes in file selection	2013-08-06 17:52:50 +08:00
harrybomrah	c2f223b82c	new plugins added for desktop	2013-08-06 17:52:39 +08:00
harrybomrah	42615f02ea	new feature in desktop for uploading wallpapers or putting url link	2013-08-02 19:32:41 +08:00
chris	0f3a8414be	Delete duplicate js and css Close the form in search in orbit bar	2013-07-31 17:30:53 +08:00
chris	d632439f80	Add class for Ray's check-box Fix some typos Change the default index for auth Add some hard code in object_auth.rb to handle page_context A user cannot select himself in authorisation	2013-07-31 00:08:15 +08:00
saurabhbhatia	b1755bdc80	Added Stock Backgrounds, Fixed production issue with desktop css	2013-07-30 18:37:36 +08:00
saurabhbhatia	2fea428b67	Changed mongoid production back to test_site	2013-07-30 17:17:17 +08:00
saurabhbhatia	7e67d389b9	Added new orbit bar to compatibility page	2013-07-30 17:15:57 +08:00
saurabhbhatia	094c0f4314	Updated desktop compatibility to fix css paths	2013-07-30 17:15:55 +08:00
saurabhbhatia	d9079d9d7c	Updated with icons, latest js and css for desktop	2013-07-30 16:43:47 +08:00
saurabhbhatia	aeaec79a2c	new themes, apps and widgets for new ui	2013-07-30 16:43:44 +08:00
saurabhbhatia	e12b14311e	Updated Desktop with new UI	2013-07-30 16:43:41 +08:00
saurabhbhatia	55d9aea664	Merged Desktop with New UI	2013-07-30 16:43:38 +08:00
harrybomrah	79c7f8e90f	new orbit bar fixed.. Conflicts: app/assets/javascripts/orbit_js_1.0.1-front-end.js app/assets/stylesheets/basic/orbit_bar.css.erb app/assets/stylesheets/orbit_bar_bootstrap.css app/views/layouts/_left_menu.html.erb app/views/layouts/_orbit_bar.html.erb app/views/layouts/_right_menu.html.erb app/views/layouts/desktop.html.erb	2013-07-30 16:43:35 +08:00
harrybomrah	f7dbbf1bca	new themes added to desktop plus theme uploader created	2013-07-30 16:43:32 +08:00
harrybomrah	6d89eab98a	desktop final fix	2013-07-30 16:43:28 +08:00
harrybomrah	c18a8a8c6f	mongoid yml fix	2013-07-30 16:43:22 +08:00
harrybomrah	38194311ab	some changes again	2013-07-30 16:43:18 +08:00
harrybomrah	bd5f3d1a44	some changes Conflicts: config/mongoid.yml	2013-07-30 16:43:14 +08:00
harrybomrah	5f9190db39	few updates with fb integration and some other changes in user and supports data to android Conflicts: vendor/built_in_modules/gallery/app/controllers/panel/gallery/back_end/albums_controller.rb	2013-07-30 16:43:11 +08:00
devin chen	ac58b993c2	simple component update minor update	2013-07-30 16:43:09 +08:00
devin chen	2b12a4775c	Various view update and change #thmbackground tag	2013-07-30 16:43:02 +08:00
devin chen	b085e826a5	fix loading Section page for Chrome	2013-07-30 16:42:59 +08:00
devin chen	ff375f0c5c	minor update	2013-07-30 16:42:56 +08:00
devin chen	3cde26ca4a	gridster update	2013-07-30 16:42:53 +08:00
harrybomrah	ed22a4d303	apps update -- app upload and activation	2013-07-30 16:42:50 +08:00
devin chen	f2ada14b7a	app manager's view update	2013-07-30 16:42:46 +08:00
devin chen	9963395b05	'select2' minor update Conflicts: app/assets/Archive/stylesheets/admin/add_attribute_field.js.erb.bak	2013-07-30 16:42:40 +08:00
harrybomrah	66582fb671	fixed saving of positions of the tiles again	2013-07-30 16:42:36 +08:00
devin chen	4ae1fe68cd	app manager view update	2013-07-30 16:42:33 +08:00
harrybomrah	2d616ab7a8	solved desktop conflict during cherry pick	2013-07-30 16:42:26 +08:00
devin chen	874819266d	minor update	2013-07-30 16:42:23 +08:00
devin chen	3ded19016a	apps setting view	2013-07-30 16:42:20 +08:00
harrybomrah	9478bb13e2	search fixed again according to devin requirements	2013-07-30 16:42:14 +08:00
harrybomrah	cff77fbee5	new search for app manager and few javascript fixes	2013-07-30 16:42:11 +08:00
devin chen	ad68f63a7a	style for checkbox, radio button	2013-07-30 16:41:58 +08:00
harrybomrah	20521dc8b0	removing duplicate code from js file	2013-07-30 16:41:54 +08:00
devin chen	a458a50e97	publication's view update	2013-07-30 16:41:48 +08:00
harrybomrah	ae8033ea1b	duplicate error fixed and css inside widgets fixed, duplicate location fixed	2013-07-30 16:41:44 +08:00
harrybomrah	dc94283af9	duplicate error fixed and css inside widgets fixed, duplicate location fixed	2013-07-30 16:41:38 +08:00
harrybomrah	78d6e33865	devin branch merge plus minor fixes	2013-07-30 16:41:32 +08:00
harrybomrah	b70310c6fe	tiny scrollbar update	2013-07-30 16:41:25 +08:00
devin chen	4215ed5538	minor update	2013-07-30 16:41:16 +08:00
chris	74b2bbf4b7	Fix link in structure when the item is a link Add internal links creation	2013-07-30 11:49:28 +08:00
chris	c85629d3b3	Fix controller js and css loading error	2013-07-30 11:48:14 +08:00
chris	af98f8efce	Fix orbit bar language change	2013-07-29 19:49:07 +08:00
chris	ff59feb2e7	Fix for structure	2013-07-29 18:46:38 +08:00
chris	f332a3191a	Fiix layout for safari	2013-07-29 17:34:29 +08:00
chris	d190a50046	Breadcrumb for dashboard (tags and categories cannot link to original module index)	2013-07-29 17:34:03 +08:00
chris	fe10cc62d9	Fix structure title (page slide)	2013-07-29 14:59:02 +08:00
chris	d434b878a7	Add default delete modal usage: - <%= render 'layouts/delete_modal', delete_options: {title: '', warning: '', cancel: '', submit: '' } %> - in default index, just set title, warning, cancel and submit in quick_edit if needed	2013-07-29 14:29:37 +08:00
chris	b3cdffb59e	Fix typo	2013-07-27 15:57:14 +08:00
chris	fd432f30ba	Fix cktext_area and removing of files and links	2013-07-27 15:50:34 +08:00
chris	0be8a74fa8	Fix missing condition in index auth	2013-07-25 17:45:39 +08:00
chris	f60c190a11	Page module new UI	2013-07-25 17:37:11 +08:00
chris	da1d70efcb	Change authorization to accept other than category	2013-07-25 17:36:55 +08:00
chris	0c208d0020	Remove some css causing errors in precompile Remove the image in announcement index Set the db to test_site	2013-07-25 13:15:49 +08:00
chris	1dc7884ec0	Changes for default index: - remove approvable and filterable - add display_option - change params Update web link and gallery index	2013-07-25 11:32:25 +08:00
saurabhbhatia	af0ab9f0d3	removed categories reference in event categories	2013-07-23 19:16:21 +08:00
saurabhbhatia	9144622c41	Fixed index page for categories color	2013-07-23 19:01:56 +08:00
saurabhbhatia	06ab24374b	Gallery - categories, module_authorization and tags to new_ui	2013-07-23 18:16:19 +08:00
saurabhbhatia	c7cf7e1ce4	removed category_customizable	2013-07-23 12:27:01 +08:00
saurabhbhatia	048f553be8	added timedifference gem to Gemfile required for calendar module	2013-07-23 12:18:36 +08:00
saurabhbhatia	7e3993b67f	removed old calendar and updated new calendar event category Conflicts: vendor/built_in_modules/calendar/app/assets/javascripts/calendarAPI.js.erb vendor/built_in_modules/calendar/app/controllers/panel/calendar/back_end/cals_controller.rb vendor/built_in_modules/calendar/app/controllers/panel/calendar/back_end/events_controller.rb	2013-07-23 12:13:02 +08:00
saurabhbhatia	8924d4f047	Fixed the sidebar order in calendar module Conflicts: vendor/built_in_modules/calendar_new/init.rb	2013-07-23 12:12:55 +08:00
harrybomrah	57a64dc378	mini colors in new ui fixed	2013-07-23 12:12:46 +08:00
saurabhbhatia	3d3d5ed144	updated with fullcalendar.css, added front end page Conflicts: vendor/built_in_modules/calendar_new/init.rb	2013-07-23 12:12:34 +08:00
harrybomrah	4ff5724379	new ui for calendar fixed.	2013-07-23 12:12:25 +08:00
chris	0d0f85e7ad	Fix tooltip in form Change form_file	2013-07-22 20:54:40 +08:00
chris	de6ce0073f	Fix category migration	2013-07-22 18:39:24 +08:00
Spen	5d3bc07488	archive and web_resouce for new ui Conflicts: app/assets/stylesheets/lib/main-forms.css	2013-07-22 18:14:33 +08:00
chris	1ba1703e90	Fix get_viewable	2013-07-22 17:41:52 +08:00
chris	2265b0b404	Fix no file in bulletin form	2013-07-22 17:41:21 +08:00
chris	6cf249ccfb	Change ckeditor gem and kaminari in gemfile	2013-07-22 17:26:32 +08:00
chris	92faeccdb6	Revert change in main-form and change class name of form_file	2013-07-22 17:24:58 +08:00
chris	5284571300	Add tooltip to bulletin form and remove file	2013-07-22 16:55:02 +08:00
chris	fe82427baa	Ray's changes for css and js	2013-07-22 16:31:44 +08:00
rulingcom	408bebaa4b	Ray's changes in structure	2013-07-22 14:06:58 +08:00
saurabhbhatia	c8292a7619	Updated zh_tw translation for sidebar labels Conflicts: vendor/built_in_modules/location/config/locales/zh_tw.yml	2013-07-22 12:17:31 +08:00
saurabhbhatia	7ea9945af0	Location - category fixes Conflicts: app/models/category.rb vendor/built_in_modules/location/init.rb	2013-07-22 12:17:29 +08:00
saurabhbhatia	109b891b27	Merge branch 'development' of https://github.com/Rulingcom/orbit into development	2013-07-19 17:39:55 +08:00
saurabhbhatia	b642072cbe	Removed the category reference for now	2013-07-19 17:38:43 +08:00
chris	1db324d1a2	Fix get_sorted_and_filtered	2013-07-19 17:38:43 +08:00
harrybomrah	0921d7731b	my favorite update :) lazy loading for theater view plus a very smooth navigation of images.	2013-07-19 17:38:41 +08:00
harrybomrah	3c0d2da9a7	description fixed for gallery	2013-07-19 17:38:38 +08:00
saurabhbhatia	e6c411b8e1	Updated tagging with galleries in new ui	2013-07-19 17:38:33 +08:00
saurabhbhatia	1c558a1783	added tags to index page, added html safe for show	2013-07-19 17:38:30 +08:00
harrybomrah	3287a2ef17	gallery migrated to new ui	2013-07-19 17:38:27 +08:00
chris	fc09ac3b68	Fix categorizable	2013-07-19 17:09:17 +08:00
chris	5190c1160a	Fix get_sorted_and_filtered, accepts 3 arguments and works for category	2013-07-16 14:43:56 +08:00
chris	62288a71ca	Fix category_id in forms Fix statuses list	2013-07-16 11:41:22 +08:00
saurabhbhatia	91b1cf6edc	Merge branch 'development' of https://github.com/Rulingcom/orbit into development	2013-07-11 17:18:58 +08:00
chris	1c4b66f1cb	Fix approval in index	2013-07-10 16:42:25 +08:00
saurabhbhatia	72861f05a6	Merge branch 'development' of https://github.com/Rulingcom/orbit into development Conflicts: config/mongoid.yml	2013-07-09 14:40:39 +08:00
chris	2c331bf1a5	Revert non rulingcom email constraint	2013-07-04 14:20:13 +08:00
chris	bec0bd76e4	Replace get_categories by categories	2013-07-04 12:33:28 +08:00
chris	6ce254a24c	Fix no method error in tags	2013-07-04 12:07:09 +08:00
chris	5530419395	Add missing method disable? for categorisable objects	2013-07-04 11:26:57 +08:00
chris	5457afdada	Rename global.css to global.css.erb	2013-07-02 17:42:15 +08:00
chris	65527017ca	Update new UI task to migrate the authorizations. PS: sold must be running for new_ui.rake	2013-07-02 17:26:02 +08:00
chris	856898016b	New UI changes(tags, categories, authorisations, module index…) To run: - ruby lib/remove_old_tags.rb DB_NAME - rake new_ui:migrate_tags - rake new_ui:migrate_categories['APP_KEY,''MODEL_NAME'] (check new_ui.rake for more details)	2013-07-02 16:46:44 +08:00
Spen	07b3857465	archive app Category Authorization fix	2013-06-26 17:44:31 +08:00
Spen	8751b15385	archive app add Module Authorization & Category Authorization	2013-06-26 15:35:35 +08:00
Matt K. Fu	6a40a9555a	fix query for un-permitted category use	2013-06-26 12:28:14 +08:00
Matt K. Fu	869f3b6815	fix object de-authorize failed.	2013-06-26 12:28:00 +08:00
harrybomrah	465d417c35	fixed updated method of events.. was having week error when updating events	2013-06-26 12:27:23 +08:00
harrybomrah	eaf7577810	small syntax error missed out yesterday fixed.	2013-06-26 12:26:52 +08:00
harrybomrah	22358bd862	Small change for creating events when calendar is not selected	2013-06-26 12:26:24 +08:00
harrybomrah	300de76c3a	Calendar fixed... all views fixed plus event loading fixed and also agenda view fixed.	2013-06-26 12:25:58 +08:00
Matt K. Fu	be6d185be7	Merge branch 'scandary_site_god_setting_feature' into development	2013-06-20 17:55:43 +08:00
Matt K. Fu	113ed17fb5	Merge branch 'solr_god_feature' into development	2013-06-20 17:54:47 +08:00
Matt K. Fu	c5ced8cf16	remove useless setting for solar	2013-06-20 17:50:18 +08:00
Matt K. Fu	e037507b0e	fix solr setting	2013-06-20 17:50:18 +08:00
Matt K. Fu	2f01b72ed0	fix solr name	2013-06-20 17:50:18 +08:00
Matt K. Fu	cd6dd40f45	add god to monit sold	2013-06-20 17:50:18 +08:00
Matt K. Fu	345c471fc9	from now on the rescue namespace will be decided by site object field: resque_namespace	2013-06-20 17:50:17 +08:00
Matt K. Fu	ed06be93d6	fix rescue scheduler space error	2013-06-20 17:50:17 +08:00
Matt K. Fu	1268ce0ae9	remove useless setting for solar	2013-06-20 17:42:00 +08:00
harrybomrah	d089822ff3	fixed updated method of events.. was having week error when updating events	2013-06-20 12:47:44 +08:00
harrybomrah	777af19abb	small syntax error missed out yesterday fixed.	2013-06-20 11:55:06 +08:00
Matt K. Fu	cd55f2aac2	fix solr setting	2013-06-19 19:23:45 +08:00
harrybomrah	07e895fc42	Small change for creating events when calendar is not selected	2013-06-19 17:27:13 +08:00
harrybomrah	80bf3499be	Calendar fixed... all views fixed plus event loading fixed and also agenda view fixed.	2013-06-19 17:16:52 +08:00
Matt K. Fu	c4ec6c1ac9	fix solr name	2013-06-19 16:24:56 +08:00
Matt K. Fu	6f46a3f949	add god to monit sold	2013-06-19 16:11:16 +08:00
Matt K. Fu	d78e816b4e	from now on the rescue namespace will be decided by site object field: resque_namespace	2013-06-19 15:45:53 +08:00
Matt K. Fu	e10eb833ed	fix rescue scheduler space error	2013-06-19 15:43:02 +08:00
Matthew K. Fu JuYuan	d3f0a10187	fix default setting for partial category selection error,due to API changing.	2013-06-17 15:26:43 +08:00
Matthew K. Fu JuYuan	256c51a970	add sold setting back	2013-06-17 13:45:30 +08:00
chris	b674f47528	Remove Syslog	2013-06-14 15:30:22 +08:00
chris	c1bd135595	Fix sortable when there's no record	2013-06-14 15:26:12 +08:00
iCross	96fc5ceea3	survey module: ensure the commit	2013-06-14 15:25:58 +08:00
iCross	e48a1ffece	archive module: add sort to frontend module Conflicts: vendor/built_in_modules/archive/app/controllers/panel/archive/front_end/archive_files_controller.rb vendor/built_in_modules/archive/app/views/panel/archive/front_end/archive_files/index.html.erb Conflicts: vendor/built_in_modules/archive/app/views/panel/archive/front_end/archive_files/index.html.erb Conflicts: vendor/built_in_modules/archive/app/views/panel/archive/front_end/archive_files/index.html.erb	2013-06-14 15:25:49 +08:00
Matt K. Fu	e20df41db5	add user log link at site page	2013-06-14 15:24:04 +08:00
chris	e68793afc3	Fix tag delete	2013-06-14 15:23:45 +08:00
iCross	2f7389ae24	ask module change mail view: <p>此為系統自動發信，請勿直接回覆</p>	2013-06-07 13:04:00 +08:00
iCross	110eab0496	ask module: add global smtp setting	2013-06-07 13:04:00 +08:00
iCross	ccd760445d	ask module: configure resque redis and namespace by config/initializers/resque.rb	2013-06-07 13:04:00 +08:00
iCross	c7effcc96c	ask module: create.js.erb	2013-06-07 13:04:00 +08:00
iCross	f3e1f4057d	ask module update css	2013-06-07 13:04:00 +08:00
iCross	e353961b21	ask moudule: add ask.css	2013-06-07 13:04:00 +08:00
iCross	75e27ed849	ask module: default status	2013-06-07 13:04:00 +08:00
iCross	8541033ba9	ask module: send mail on development	2013-06-07 13:04:00 +08:00
iCross	467c2e8a3c	ask module: fix	2013-06-07 13:04:00 +08:00
iCross	b0640f925b	ask module: fix some	2013-06-07 13:04:00 +08:00
iCross	841fa10c55	ask module: add rescue ackknowledgement	2013-06-07 13:04:00 +08:00
iCross	dcc5fc39a7	ask module: dropdown, icon, big5 encoding, redirect, admin, send mail	2013-06-07 13:03:59 +08:00
iCross	97df100c64	remove department	2013-06-07 13:03:59 +08:00
iCross	ce180839f0	finish ask module	2013-06-07 13:03:59 +08:00
chris	0904978292	Remove non resolved conflict	2013-06-07 13:02:47 +08:00
iCross	ddd9a9668e	Merge branch 'lukas/picked_archive' into development	2013-06-06 23:12:30 +08:00
iCross	a468b69013	archive module: fix old data caused error	2013-06-06 23:11:24 +08:00
iCross	b6c8a88b73	Merge branch 'lukas/picked_archive' into development	2013-06-06 22:27:08 +08:00
iCross	5b7ac1a22b	archive module: add sort feature to achive files	2013-06-06 22:20:27 +08:00
Matt K. Fu	d5109c837c	Merge branch 'lukas/picked_ques' into development	2013-06-06 19:59:30 +08:00
iCross	c63ac751ea	archive module: sort for backend/frontend. move get_sorted_and_filtered from orbit_backend_controller.rb to application_controller.rb	2013-06-06 19:20:21 +08:00
iCross	8c1e65994a	Merge branch 'clean_development' into lukas/picked_ques	2013-06-06 19:08:59 +08:00
iCross	f9a148c901	survey module: move down/up i18n Conflicts: vendor/built_in_modules/survey/app/views/panel/survey/back_end/surveys/_form_survey_question.html.erb	2013-06-06 18:46:52 +08:00
iCross	5ea0c5bd5c	survey module: result chart display only other Conflicts: config/environments/production.rb	2013-06-06 18:45:29 +08:00
iCross	d2f131d160	survey module: update css Conflicts: app/assets/stylesheets/questionnaire.css	2013-06-06 18:43:28 +08:00
iCross	8d71c377f2	fix datepicker helper hidden field value	2013-06-06 18:42:26 +08:00
iCross	ec173c4ce1	fix	2013-06-06 18:42:12 +08:00
iCross	ba7d6558ee	fix	2013-06-06 18:42:00 +08:00
iCross	88c57e0b0c	fix	2013-06-06 18:41:48 +08:00
iCross	d4962d20b3	fix	2013-06-06 18:41:36 +08:00
iCross	21bf3a0ccd	standalone css and icon	2013-06-06 18:41:27 +08:00
iCross	cf0d7cfc64	new export csv table Conflicts: vendor/built_in_modules/survey/app/controllers/panel/survey/back_end/surveys_controller.rb	2013-06-06 18:40:28 +08:00
iCross	15347f25dc	fix	2013-06-06 18:38:59 +08:00
iCross	443d1c4fbe	csv stats & required start	2013-06-06 18:38:47 +08:00
iCross	7ba0977e16	stuff Conflicts: vendor/built_in_modules/survey/app/views/panel/survey/front_end/surveys/show.html.erb	2013-06-06 18:38:22 +08:00
iCross	531cee70d2	fix	2013-06-06 18:31:28 +08:00
Lukas	b659c7021d	bug fix and add feature	2013-06-06 18:31:09 +08:00
Lukas	515185d87c	ques: fix submit	2013-06-06 18:30:54 +08:00
Lukas	adc15951bb	questionnaire stuff Conflicts: vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/index.html.erb	2013-06-06 18:29:58 +08:00
Lukas	32c259ac9e	survey: remain stuff	2013-06-06 18:27:05 +08:00
Lukas	51640423a7	survey module initial	2013-06-06 18:26:41 +08:00
Matt K. Fu	dd206437d8	apply tags and cates for fronted. from now app developer can use param category_id and tag_id freely.	2013-06-06 17:39:36 +08:00
Matt K. Fu	7729161123	fix for passing args. code in complete,fronted controller need to take care params,too. backend parser need to catch up.	2013-06-06 17:38:17 +08:00
Matthew K. Fu JuYuan	f2706ff2c1	make default widget work with params[tag_id] params[category_id]	2013-06-06 17:36:30 +08:00
Matthew K. Fu JuYuan	5c94200b77	fix argument passing problem for more link and tag cloud, incomplete code.	2013-06-06 17:21:27 +08:00
Matt K. Fu	6b8b749b0f	fix chris tag cloud	2013-06-06 17:18:42 +08:00
chris	253cca06cc	New widget for tag cloud	2013-06-06 17:17:45 +08:00
Matt K. Fu	30824d1620	add search to archive	2013-06-05 18:03:09 +08:00
Matt K. Fu	704db56925	fix bulletin data having 8 hours difference.	2013-06-05 18:01:57 +08:00
Matt K. Fu	06fd305bf9	default widget show search	2013-06-05 13:00:21 +08:00
Matt K. Fu	c0f1614cb9	fix uploading error due to user action decoder can not handle uploading file	2013-05-30 10:17:28 +08:00
Matt K. Fu	3e0b7d81ae	clean 403 404 500	2013-05-27 16:46:49 +08:00
Matt K. Fu	2806dd35a9	spen's fix for user	2013-05-23 14:03:18 +08:00
Matt K. Fu	54a35b30be	fix design index bug when start start from blank DB. add delay impressionist. add several i18n vars	2013-05-23 12:07:43 +08:00
Matt K. Fu	37aa950028	user action	2013-05-23 11:55:57 +08:00
Matt K. Fu	3d0a1cef56	1.fix for syntax error. 2.Making production console works. 3.Making blank site member no errors.	2013-05-22 16:25:12 +08:00
Spen	4a5256bf4f	ntu dropdown fix member staff css	2013-05-14 14:19:56 +08:00
Spen	5b368235e8	ntu dropdown fix list sort	2013-05-14 14:19:55 +08:00
Spen	b8da40b4ae	ntu_dropdown_fix	2013-05-14 14:19:55 +08:00
Matt K. Fu	287e77836d	fix css compiling error	2013-05-14 14:19:20 +08:00
Matt K. Fu	3e6c2b1ec2	fix member error with blank database	2013-05-14 11:48:13 +08:00
Matt K. Fu	f2247aab32	ray's css fix	2013-05-14 11:27:15 +08:00
Matt K. Fu	ef2c732d2e	make blank site working better	2013-05-14 11:26:35 +08:00
Matt K. Fu	1096db79b6	blank site now can be start from rake site:build	2013-05-14 10:32:53 +08:00
Matt K. Fu	88d55989de	change logger	2013-05-14 10:29:11 +08:00
chris	c2331695cd	Set order of page context to match the order of structure Add some params to keep the sorting	2013-05-07 11:15:30 +08:00
chris	127ab3845c	Changes for queries	2013-05-03 12:12:19 +08:00
chris	aefd62da2a	Add tagged_ids to taggable	2013-05-03 12:12:19 +08:00
chris	167a71272a	queries need to be rethink	2013-05-03 12:12:19 +08:00
Matt K. Fu	caf0426bd4	bulletin search	2013-05-01 12:16:28 +08:00
Matt K. Fu	7d077a92a5	system preference	2013-04-29 15:23:15 +08:00
Matt K. Fu	64101109dd	disable all sorted_tags	2013-04-26 18:07:59 +08:00
Matt K. Fu	3e567223e3	fix for Spen's translation and Chris's tag error	2013-04-26 15:37:27 +08:00
Spen	79ef86f2c9	member translation fix	2013-04-26 11:26:11 +08:00
Matthew K. Fu JuYuan	d047a3d62a	chris tags update	2013-04-26 11:26:10 +08:00
Matt K. Fu	2945e14385	use rack gridfs	2013-04-25 20:37:13 +08:00
Matt K. Fu	c68c563fb0	fix qa problem	2013-04-25 20:37:13 +08:00
Spen	697944a029	user id set & user fields set & role set & member frontend list & user translation & create new member bug fix	2013-04-25 19:59:59 +08:00
Matt K. Fu	12e39b4d77	fix rescue job won't start	2013-04-25 15:46:16 +08:00
Matt K. Fu	a0478f2a8f	fix page name repeated error when page creating	2013-04-25 12:19:25 +08:00
Matt K. Fu	b198b1a17b	system preference	2013-04-24 19:21:11 +08:00
Matt K. Fu	62fa589e8a	add msg when user session expired at page admin	2013-04-24 11:58:48 +08:00
Matt K. Fu	5ff7dfbac6	fronted open switch and backend openness	2013-04-23 18:48:18 +08:00
harrybomrah	11067ef34f	english mandatory removed from albums	2013-04-23 11:09:43 +08:00
Spen	536f0d30af	apps_translate_fix	2013-04-23 11:09:20 +08:00
Matt K. Fu	41168f4c99	fix for fronted routing failed	2013-04-23 10:01:02 +08:00
Matt K. Fu	7e9fce0c2d	clean Harry's code	2013-04-17 14:31:10 +08:00
Matt K. Fu	2416030adc	remove useless rake task	2013-04-17 14:31:09 +08:00
harrybomrah	38d5a193e0	tiny scrollbar trigger fixed and devin branch merged	2013-04-17 14:31:09 +08:00
Matt K. Fu	fcfdd562a6	reverse harrys db setting	2013-04-17 14:29:56 +08:00
devin chen	989e5aa974	minor update	2013-04-17 14:29:56 +08:00
Matt K. Fu	4cbf2fd8b9	complete harrys code	2013-04-17 14:29:56 +08:00
Spen	c94a86c3a4	web_resource rake web_link_url:web_link_url_i18n	2013-04-17 14:29:04 +08:00
devin chen	aedab01ae6	minor update	2013-04-17 14:29:04 +08:00
devin chen	e3782c9cf7	minor update	2013-04-17 14:29:04 +08:00
harrybomrah	e2802d94d0	rake task added	2013-04-17 14:28:13 +08:00
devin chen	055d758769	Page Loading Effect tinyscrollbar has problem	2013-04-17 14:27:18 +08:00
Spen	0734f73291	faq show fix	2013-04-17 14:25:05 +08:00
Matt K. Fu	a4ebe31ada	fix for widget edit js missing	2013-04-17 14:19:32 +08:00
Matt K. Fu	3098496083	widget link followed by setting	2013-04-17 14:19:32 +08:00
Matt K. Fu	28f0df5da8	fix default widget link failed	2013-04-17 14:19:32 +08:00
Matt K. Fu	3de4591413	fix frontend ajax respond 404 due to javascript overwritten after assets precompile	2013-04-17 14:19:32 +08:00
devin chen	d177fe0369	minor update	2013-04-17 14:19:32 +08:00
harrybomrah	d288972035	stupid commit	2013-04-17 14:19:32 +08:00
harrybomrah	c6868bf2e0	small fix in select2.js	2013-04-17 14:18:49 +08:00
devin chen	95e308e046	minor update	2013-04-17 14:18:49 +08:00
Matt K. Fu	425a320c02	fix widget and fronted setting interface. checked with Spen	2013-04-17 14:16:24 +08:00
devin chen	dc5f24ab22	starting new branch ( add rules in .gitignore for SASS cache folder )	2013-04-17 14:16:24 +08:00
harrybomrah	bc0477a5ed	widget and gridster fixes	2013-04-17 14:16:24 +08:00
Matt K. Fu	0781779ac0	solved conflicts	2013-04-17 14:14:24 +08:00
devin	e7bffe4c0f	devin's new branch	2013-04-17 14:14:24 +08:00
chris	dd10b3147c	Fix js bug and asset url after merge	2013-04-17 14:14:24 +08:00
devin	cae43e8acd	recover .gitignore file Conflicts: .gitignore	2013-04-17 14:14:23 +08:00
harrybomrah	793d739726	features and widgets added Conflicts: app/assets/javascripts/orbitdesktop.js	2013-04-17 14:14:23 +08:00
devin	c8aa50ee87	Lots of Update 1. CSS to SCSS 2. Journal Paper update Conflicts: Gemfile.lock app/assets/javascripts/orbitdesktop.js app/assets/stylesheets/desktop/desktop-main.css vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_author_relations/index.html.erb vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_authors/index.html.erb vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/index.html.erb vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/journal_type.html.erb	2013-04-17 14:14:23 +08:00
Matt K. Fu	0f6f5aafce	fix for both part and page part settings Conflicts: app/helpers/admin/page_parts_helper.rb app/views/admin/pages/reload_front_end_setting.js.erb app/views/admin/pages/reload_frontend_pages.js.erb	2013-04-17 14:12:52 +08:00
Fu Matthew	f6b600df59	deliver API	2013-04-17 14:09:01 +08:00
chris	6af375efa4	Fix bug in setup_app_frontend_and_style	2013-04-17 14:09:00 +08:00
Fu Matthew	1709773b0a	style for front end	2013-04-17 14:08:01 +08:00
Rueshyna	95805cfdee	correct model method	2013-04-17 14:07:24 +08:00
harrybomrah	84afbfa86c	section page fixed..	2013-04-17 14:01:48 +08:00
Rueshyna	44fede2b71	fixed co author relation save button	2013-04-17 14:01:48 +08:00
harrybomrah	764f83d58c	app manager changed plus some changes	2013-04-17 14:01:14 +08:00
harrybomrah	8dee211ab4	section page fixed..	2013-04-17 14:01:14 +08:00
Rueshyna	27ad25ccca	add pagination for every controller and view in personal plugin	2013-04-17 14:00:37 +08:00
harrybomrah	f9e7cefc94	compatibility page added and tinyscrollbar drag event fixed..	2013-04-17 13:59:16 +08:00
Rueshyna	df220397b2	make index of list can be hightline list when click cancel button	2013-04-17 12:22:04 +08:00
Rueshyna	b5fd6c7a1a	fixed author sample data generation and model method	2013-04-17 12:21:21 +08:00
Rueshyna	65e306a854	have done conference author filter, journal haven't been done, yet	2013-04-17 12:13:06 +08:00
harrybomrah	41643d1f61	tinyscrollbar pagination fixed	2013-04-17 12:11:33 +08:00
Rueshyna	aad4119892	fixed bug	2013-04-17 12:07:11 +08:00
harrybomrah	54af5e8bd4	insert and remove columns	2013-04-17 12:06:33 +08:00
harrybomrah	6db9e70132	Major tinyscrollbar update	2013-04-17 12:04:22 +08:00
harrybomrah	dabceec3ea	all none for conf done	2013-04-17 11:23:03 +08:00
harrybomrah	52789fa032	all none fixed	2013-04-17 11:23:02 +08:00
Rueshyna	dc68f40cb4	correct model method	2013-04-17 11:13:32 +08:00
Rueshyna	228dd1b767	fixed co author relation save button	2013-04-17 11:13:32 +08:00
harrybomrah	dae3f069ff	app manager changed plus some changes	2013-04-17 11:09:56 +08:00
Rueshyna	5f2c669568	fixed checkout and start in personal plugin	2013-04-17 11:08:58 +08:00
Rueshyna	1b12412596	correct factoried girl for journal	2013-04-17 11:08:58 +08:00
harrybomrah	b1d7d5345e	section page fixed..	2013-04-17 11:08:58 +08:00
Fu Matthew	6efef253a6	add conditions for making multi cates and tags more stable	2013-04-17 11:08:57 +08:00
devin	0d5ab20efa	add browser compatibility page	2013-04-17 11:07:45 +08:00
Fu Matthew	9815950083	now default options can be chosen by developer at init	2013-04-17 11:07:45 +08:00
Rueshyna	50449b55e8	one abstract one column for personal plugin	2013-04-17 11:07:20 +08:00
Rueshyna	00db66b8c4	add pagination for every controller and view in personal plugin	2013-04-17 11:07:20 +08:00
harrybomrah	b8ee2fd559	compatibility page added and tinyscrollbar drag event fixed..	2013-04-17 11:07:20 +08:00
harrybomrah	401c75c0de	Major tinyscrollbar update	2013-04-17 11:06:28 +08:00
Rueshyna	1ebae504dc	modify translation for journal_co_author_relation button	2013-04-17 11:05:57 +08:00
harrybomrah	323fadc210	tinyscrollbar pagination fixed	2013-04-17 11:05:57 +08:00
Fu Matthew	69a49a69aa	style for front end	2013-04-17 11:05:57 +08:00
Rueshyna	5178ce3bde	modify nil of email string and sort	2013-04-17 11:04:52 +08:00
Rueshyna	95128a3465	remove redundant space of co_author sample data	2013-04-17 11:04:52 +08:00
Rueshyna	8783b8e5fe	make index of list can be hightline list when click cancel button	2013-04-17 11:04:52 +08:00
Rueshyna	a3de4cc2d4	fixed author sample data generation and model method	2013-04-17 11:04:52 +08:00
Rueshyna	bdaef3af0f	add author filter for journal and fix some bug	2013-04-17 11:04:52 +08:00
Rueshyna	625f2e9ad6	have done conference author filter, journal haven't been done, yet	2013-04-17 11:04:52 +08:00
harrybomrah	db60a3bcfa	insert and remove columns	2013-04-17 11:04:37 +08:00
harrybomrah	a7667d586a	Major tinyscrollbar update	2013-04-17 11:04:36 +08:00
Rueshyna	e9ddb85734	add pagination for personal plugin	2013-04-17 10:56:49 +08:00
harrybomrah	d840b82fa9	insert and remove columns	2013-04-17 10:56:15 +08:00
devin	84dfb44e78	tinyscrollbar css minor update	2013-04-17 10:56:15 +08:00
Fu Matthew	4a08a1992b	1.make module app forbid unearthed access except from admin 2.override sidebar link when it's object_auth or app_auth.	2013-04-17 10:56:15 +08:00
Rueshyna	15be80a35f	fixed bug	2013-04-17 10:56:14 +08:00
harrybomrah	1d06bcaae7	Major tinyscrollbar update	2013-04-17 10:54:38 +08:00
Fu Matthew	8e98cb3ec9	put add admin pages using orbit back end controller	2013-04-17 10:54:38 +08:00
harrybomrah	6cd97adf21	all none for conf done	2013-04-17 10:54:38 +08:00
harrybomrah	0189d1c2c0	all none fixed	2013-04-17 10:54:38 +08:00
chris	3e96cfe514	Changes for FAQ to work with not latest but stable code	2013-03-28 15:05:52 +08:00
Spen	468555a037	faq app	2013-03-28 14:09:29 +08:00
chris	da8a5123c2	Change in announcement init for query Change in default widget query	2013-03-27 16:31:42 +08:00
chris	4ebc8cbb77	Delete NTU's i18n	2013-03-27 16:30:35 +08:00
chris	ec1605358b	Fix sorting for archive	2013-03-27 06:30:22 +08:00
chris	41311c74d0	Spen's changes in archive	2013-03-21 14:38:04 +08:00
chris	ee8a78621a	Add task to flatten category and tag for page and page_part	2013-03-21 14:15:58 +08:00
chris	d01968dcd0	Changes in query for default widget	2013-03-21 02:29:56 +08:00
chris	04d3e177d5	Fix typo in core lib Change i18n for more link in announcement init	2013-03-20 17:45:08 +08:00
chris	031cf927d5	Sort archive by top and creation date	2013-03-20 17:22:40 +08:00
chris	91afd49f75	Fix for scope	2013-03-20 17:20:17 +08:00
chris	e71b002438	Fix archive front end query for multiple categories	2013-03-20 15:37:34 +08:00
chris	90f08c96fc	Fix merge error: add missing delete route	2013-03-20 02:11:29 +08:00
chris	43f7711433	Put back Gemfile.lock	2013-03-20 00:30:58 +08:00
chris	b92f6d2274	Update Gemfile.lock	2013-03-19 23:59:40 +08:00
chris	535b373af0	Remove nccu's backup db schedule	2013-03-19 23:44:02 +08:00
chris	617ebfd43a	Revert "Fix query for top in bulletin" This reverts commit 332481f9f1a5802ae652bb401d0dd409196ab00f.	2013-03-19 23:44:02 +08:00
chris	b55988af33	Fix query for top in bulletin	2013-03-19 23:44:02 +08:00
chris	9684189258	Fix query for date in bulletin	2013-03-19 23:43:59 +08:00
chris	8374bc8d12	Set I18n from browser	2013-03-19 23:43:31 +08:00
Rueshyna	6abf53f34d	change page number of archive	2013-03-19 23:43:28 +08:00
Rueshyna	4e151690e9	fixed archive bug, make it have page and category	2013-03-19 23:42:39 +08:00
chris	9cf8c2b72b	Revert "Page front end stay in the same page when a link is clicked (category)" This reverts commit `14d856b4d6`.	2013-03-19 20:00:16 +08:00
chris	14d856b4d6	Page front end stay in the same page when a link is clicked (category)	2013-03-19 19:44:04 +08:00
chris	37a38369e7	Fix typo in default widget not showing objects in front end	2013-03-19 18:41:03 +08:00
chris	ff30b3d05e	Fix link not showing for default front end	2013-03-19 18:23:35 +08:00
chris	f3c809fd58	Fix link switch not showing for default front end	2013-03-19 17:49:46 +08:00
chris	5e4e3ac560	Fix link for default widget Convert single id to array to find item	2013-03-19 17:14:01 +08:00
chris	7dcea95dd4	Fix query for multi categories and tags (empty array)	2013-03-19 15:10:31 +08:00
chris	ef2a32be4c	Fix query for multi categories and tags	2013-03-18 22:01:08 +08:00
chris	157935e7eb	Page front end stay in the same page when a link is clicked (title or pagination)	2013-03-18 21:54:06 +08:00
chris	f29ad27b56	Fix pagination in archive back end	2013-03-18 21:53:31 +08:00
chris	aacfcf1997	Fix typo in translations	2013-03-18 21:52:52 +08:00
chris	2427bc5b69	Update CSS for archive and put the call in widget index	2013-03-13 17:21:39 +08:00
chris	e208e99a73	Fix page part update when no tag or category	2013-03-13 15:45:30 +08:00
chris	b864cc0268	Changes in I18n (except personal_conference and personal_journal)	2013-03-12 18:13:48 +08:00
chris	73e9a60212	Pagination or more link for default widget	2013-03-07 21:21:48 +08:00
Spen	d7d480ac12	archive edit & plugins edit	2013-03-07 21:12:31 +08:00
chris	147b7b9292	Fix update when no tag or category	2013-03-07 17:30:49 +08:00
chris	27686a5d04	Merge branch 'development' into desktop	2013-03-05 19:07:58 +08:00
Rueshyna	a9bf400fac	Merge branch 'desktop_work_devin' into desktop * desktop_work_devin: tinyscrollbar minor update desktop CSS update tinyscrollbar minor update desktop CSS update Conflicts: app/views/desktop/index.html.erb vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_author_relations/_form.html.erb vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_author_relations/index.html.erb vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_authors/_form.html.erb vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/_form.html.erb vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/index.html.erb vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_window.html.erb vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_author_relations/_form.html.erb vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_author_relations/index.html.erb vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_authors/_form.html.erb vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/_form.html.erb vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_window.html.erb	2013-03-05 18:48:12 +08:00
Rueshyna	74900ac048	Merge branch 'desktop_work' into desktop_work_devin * desktop_work: tinyscrollbar minor update desktop CSS update Conflicts: vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/_form.html.erb vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/_form.html.erb	2013-03-05 18:35:17 +08:00
Fu Matthew	dc3966be81	fix cates and tags	2013-03-05 18:34:41 +08:00
devin	f2f8ffd157	tinyscrollbar minor update	2013-03-05 17:48:29 +08:00
devin	924ecc3b1f	desktop CSS update	2013-03-05 17:48:28 +08:00
Rueshyna	d5f1d13670	Merge remote-tracking branch 'origin/desktop_work' into desktop * origin/desktop_work: simple layout tinyscrollbar fixed highlighting fixed… fixed adding. layout fix tinyscrollbar_bug fixed url handling modified.. tinyscrollbar modified… star checkbox fixed.. tinyscrollbar fixed some changes for gridster Lot of changes in gridster Conflicts: vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/_form.html.erb	2013-03-05 17:34:28 +08:00
Rueshyna	806ffe0a1e	fixed desktop several bug	2013-03-05 17:31:57 +08:00
devin	db2b371744	tinyscrollbar minor update	2013-03-05 17:22:53 +08:00
Rueshyna	f6272728d5	fixed delete co author relation bug	2013-03-05 12:41:42 +08:00
Rueshyna	430981a534	checked back and cancel button of personal plugin and fixed journal co author save and update bug	2013-03-05 12:14:10 +08:00
Fu Matthew	626b2a7bca	fix default failed when cate or tags set to empty	2013-03-05 11:48:20 +08:00
harrybomrah	3182f5c9a8	merging	2013-03-05 11:20:01 +08:00
harrybomrah	dc92ef9f42	simple layout tinyscrollbar fixed	2013-03-05 11:04:18 +08:00
devin	4e24223c78	desktop CSS update	2013-03-05 09:39:01 +08:00
Fu Matthew	285119a5f3	fix for multi select cates and tags	2013-03-04 19:29:45 +08:00
Rueshyna	80b6a9ab48	Merge branch 'desktop' into desktop_work * desktop: highlighting fixed… add Devin's css file for gallery using refine tiny scroll bar js for personal plugin fixed adding. layout fix layout fix tinyscrollbar_bug fixed url handling modified.. tinyscrollbar modified… star checkbox fixed.. tinyscrollbar fixed some changes for gridster Lot of changes in gridster authors auto-complete fixed paper title and journal title bug Conflicts: vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_author_relations/_show_form.html.erb vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_author_relations/index.html.erb vendor/built_in_modules/personal_journal/app/helpers/panel/personal_journal/desktop/journal_pages_helper.rb vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_author_relations/_show_form.html.erb vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_authors/index.html.erb vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/_form.html.erb vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/journal_type.html.erb	2013-03-04 18:03:59 +08:00
harrybomrah	b5abbc9ef0	highlighting fixed…	2013-03-04 17:57:32 +08:00
harrybomrah	ee5fd18b64	highlighting fixed…	2013-03-04 17:44:55 +08:00
Rueshyna	874648eacf	add Devin's css file for gallery	2013-03-04 17:27:36 +08:00
Rueshyna	a6ca308a5e	using refine tiny scroll bar js for personal plugin	2013-03-04 16:35:09 +08:00
harrybomrah	8ade2c5949	fixed adding.	2013-03-04 16:31:37 +08:00
harrybomrah	0c659e5a9b	layout fix	2013-03-04 16:31:37 +08:00
harrybomrah	d4392c8d56	fixed adding.	2013-03-04 16:21:35 +08:00
harrybomrah	6ae4e4d0ef	layout fix	2013-03-04 15:48:24 +08:00
harrybomrah	9a32732ae4	layout fix	2013-03-04 14:57:36 +08:00
Fu Matthew	15b9839b76	fix archive category fix page adding failed	2013-03-04 14:40:29 +08:00
harrybomrah	e69679d3fe	tinyscrollbar_bug fixed	2013-03-04 12:37:29 +08:00
harrybomrah	2ead541733	url handling modified.. tinyscrollbar modified… star checkbox fixed..	2013-03-04 12:37:29 +08:00
harrybomrah	23c8c28b52	tinyscrollbar fixed	2013-03-04 12:37:29 +08:00
harrybomrah	0f12314213	some changes for gridster	2013-03-04 12:37:29 +08:00
harrybomrah	b8ee748723	Lot of changes in gridster	2013-03-04 12:37:29 +08:00
Rueshyna	ee4b94ace0	Merge branch 'desktop' of https://github.com/Rulingcom/orbit into desktop * 'desktop' of https://github.com/Rulingcom/orbit: fix widget field reload link to more fix default widget link fixed Widget data count should be available for other widgets, not only for default widget. The availability of this option must be set in the init fix javascript disable checkbox failed after cate and tags being reloaded. first version of multi categories and tags fix widget field reload link to more fix default widget link fixed Widget data count should be available for other widgets, not only for default widget. The availability of this option must be set in the init fix javascript disable checkbox failed after cate and tags being reloaded. first version of multi categories and tags	2013-03-04 12:17:14 +08:00
Rueshyna	8f1d7b55ab	authors auto-complete	2013-03-04 12:16:46 +08:00
Rueshyna	e99fef9404	fixed paper title and journal title bug	2013-03-04 11:45:39 +08:00
harrybomrah	c1cb5e5ffb	tinyscrollbar_bug fixed	2013-03-01 17:49:58 +08:00
harrybomrah	9b8ab2a2c1	url handling modified.. tinyscrollbar modified… star checkbox fixed..	2013-03-01 14:45:20 +08:00
harrybomrah	c82e9a646d	tinyscrollbar fixed	2013-02-27 18:55:26 +08:00
harrybomrah	7ef02d3108	Merge branch 'desktop' into desktop_work	2013-02-27 11:51:56 +08:00
harrybomrah	912080482b	some changes for gridster	2013-02-27 11:47:41 +08:00
chris	ca946fc881	Merge branch 'development' of github.com:Rulingcom/orbit into development Conflicts: lib/tasks/migrate.rake	2013-02-27 11:03:52 +08:00
Fu Matthew	0dabd5b95f	fix widget field reload	2013-02-27 10:51:41 +08:00
Fu Matthew	071e8a349c	link to more	2013-02-27 10:50:50 +08:00
Fu Matthew	8a8bfcb8fb	fix default widget link	2013-02-27 10:50:47 +08:00
Fu Matthew	d7699e1a46	fixed Widget data count should be available for other widgets, not only for default widget. The availability of this option must be set in the init	2013-02-27 10:49:51 +08:00
Fu Matthew	0e6599e9b9	fix javascript disable checkbox failed after cate and tags being reloaded.	2013-02-27 10:49:51 +08:00
Fu Matthew	99e67c8719	first version of multi categories and tags	2013-02-27 10:49:48 +08:00
Rueshyna	4bc3a57862	give back and cancel button a link for personal conference	2013-02-26 18:37:58 +08:00
Rueshyna	f431ab9ab5	give back and cancel button a link for personal journal	2013-02-26 18:37:33 +08:00
Rueshyna	fb931b0a4a	Merge remote-tracking branch 'origin/desktop' into desktop * origin/desktop: Remove Gemfile.lock sort conference and type add conferene list order function css minor changes. gridster, url code fixed, views removed. Fix selection of sub_menu for widget (the value wasn't set) Fix bug in widget selection css minor changes. Fix public_r_tag selection gridster, url code fixed, views removed.	2013-02-26 17:02:01 +08:00
Rueshyna	6c9e2a7249	fixed journal co author bug	2013-02-26 16:57:08 +08:00
Rueshyna	d0b54a4d6c	done conferece seeds	2013-02-26 15:52:42 +08:00
Rueshyna	81725ed942	split db/seeds.rb file to local plugin and done journal	2013-02-26 15:52:20 +08:00
Rueshyna	c55f64f3c6	correct view permission of conference	2013-02-26 15:17:09 +08:00
Rueshyna	4ac0f19011	generate journal page by rails side and fixed model name bug	2013-02-26 15:15:09 +08:00
harrybomrah	e9c0f443b7	Lot of changes in gridster	2013-02-26 11:47:39 +08:00
Fu Matthew	5f832a17d4	fix widget field reload	2013-02-25 12:49:06 +08:00
chris	dbf93ea9a8	Remove Gemfile.lock	2013-02-25 12:06:23 +08:00
chris	fbf3f9fd2f	Merge branch 'desktop' of github.com:Rulingcom/orbit into desktop	2013-02-25 12:02:10 +08:00
Rueshyna	6f599bb95d	sort conference and type	2013-02-25 12:01:59 +08:00
Rueshyna	522e0481e1	add conferene list order function	2013-02-25 12:01:59 +08:00
chris	1f58ed5cda	Merge branch 'desktop_work' of github.com:Rulingcom/orbit into desktop_work	2013-02-25 12:01:37 +08:00
Rueshyna	8b0ffe747c	sort conference and type	2013-02-25 11:46:20 +08:00
Rueshyna	6929d30b5d	add conferene list order function	2013-02-25 11:46:11 +08:00
harrybomrah	edd2c1f522	css minor changes.	2013-02-25 11:08:57 +08:00
harrybomrah	9f362d9ae6	gridster, url code fixed, views removed.	2013-02-25 11:08:56 +08:00
chris	3572856486	Fix selection of sub_menu for widget (the value wasn't set)	2013-02-25 10:35:59 +08:00
Fu Matthew	0be1c45c81	link to more	2013-02-23 18:29:50 +08:00
chris	5b0b8e6c79	Fix bug in widget selection	2013-02-23 17:25:07 +08:00
harrybomrah	a0b22761c7	css minor changes.	2013-02-23 17:12:02 +08:00
chris	caac9191ce	Fix public_r_tag selection	2013-02-23 16:52:37 +08:00
harrybomrah	5f9dd984b1	gridster, url code fixed, views removed.	2013-02-23 15:23:24 +08:00
Fu Matthew	73bca03b33	fix default widget link	2013-02-23 15:19:51 +08:00
Fu Matthew	8592015b1b	fixed Widget data count should be available for other widgets, not only for default widget. The availability of this option must be set in the init	2013-02-23 15:19:04 +08:00
chris	ad9b91f792	Fix url with id in default widget	2013-02-23 12:20:45 +08:00
Fu Matthew	d6dd38744b	fix javascript disable checkbox failed after cate and tags being reloaded.	2013-02-23 11:34:47 +08:00
spen	cd98f9c889	member plugin init add frontend	2013-02-22 18:21:11 +08:00
Fu Matthew	9fec7beb47	Merge branch 'development' of github.com:Rulingcom/orbit into development Conflicts: app/controllers/default_widget_controller.rb lib/tasks/migrate.rake	2013-02-22 17:53:49 +08:00
Fu Matthew	b315215bed	first version of multi categories and tags	2013-02-22 16:32:05 +08:00
chris	8704fb30d5	Fix init name/key	2013-02-22 14:46:22 +08:00
chris	9a63adedde	Remove seminar from conference init	2013-02-22 11:57:10 +08:00
chris	680d7908b9	member plugin init edit	2013-02-21 17:53:08 +08:00
chris	4709c08ad1	Temporary fix zh_tw.yml New Gemfile.lock	2013-02-21 14:43:49 +08:00
unknown	d46abd7caf	member list edit	2013-02-21 14:13:46 +08:00
Rueshyna	79f0fc1a3b	add announcement header translation file	2013-02-21 14:10:42 +08:00
Rueshyna	4ee85a8c09	add coauthor and coauthor relation function	2013-02-21 13:58:47 +08:00
Rueshyna	13c757e8a9	clean add/edit page and add conference list page	2013-02-21 13:58:30 +08:00
Rueshyna	16fda25ace	done personal conference add/edit page	2013-02-21 13:53:50 +08:00
Rueshyna	6d65af0312	done personal conference list page, but it need to js.	2013-02-21 13:53:50 +08:00
Rueshyna	2afbae7c08	make a fake data for personal conference plugin	2013-02-21 13:53:50 +08:00
Rueshyna	1c4b696052	add add/edit form page and controller	2013-02-21 13:53:50 +08:00
Rueshyna	54b12a193a	add translation configuration	2013-02-21 13:53:47 +08:00
Rueshyna	158fd8ffff	fixed conference icon and rename _p to _window of conference view	2013-02-21 13:51:42 +08:00
Rueshyna	f1db7be14e	remove test and change for personal journal	2013-02-21 13:51:37 +08:00
Rueshyna	a61ec183c9	change add/edit url of personal_conference	2013-02-21 13:50:12 +08:00
unknown	f59da3ce81	member plugin init edit	2013-02-20 18:05:09 +08:00
unknown	bc44d38948	member plugin edit	2013-02-20 17:25:20 +08:00
unknown	a7bc19768e	member list edit	2013-02-20 11:12:08 +08:00
chris	39c6660c67	Remove useless code not removed in merge Fix argument bug in link_to_field	2013-02-19 20:42:46 +08:00
chris	d19ba7b1c6	Change css mobile for 3 columns	2013-02-19 18:31:34 +08:00
chris	a9aa1dd150	Fix for path renaming	2013-02-19 18:09:55 +08:00
chris	9e9620c04a	Fix item looking for widget when no front end	2013-02-19 18:09:54 +08:00
chris	6d1f919bb7	Fix links in default widget	2013-02-19 18:09:50 +08:00
chris	6324233f58	Fix breadcrumb again	2013-02-19 17:50:46 +08:00
chris	d2f837f342	Add task to save pages	2013-02-19 17:50:46 +08:00
chris	82a8f99208	Fix [again] error in parser for category	2013-02-19 17:50:46 +08:00
chris	ee59228665	Fix error in parser for category	2013-02-19 17:50:43 +08:00
chris	3e79b787bb	Set default widget sort to created_at Don't use page category when home	2013-02-19 17:49:23 +08:00
chris	ec9c68f039	Remove breadcrumb when home	2013-02-19 17:49:22 +08:00
chris	25d9a3d9b9	Add home to breadcrum	2013-02-19 17:49:22 +08:00
chris	bc21840262	Comment out delete link for archive category Modify the import: - hot_news to announcement - iso_zone of 20000 to 21100	2013-02-19 17:49:20 +08:00
chris	324ab266af	Fix query in default widget for tags	2013-02-19 17:48:07 +08:00
chris	f5728a4f92	Enable designer to add the class "page_breadcrumb"	2013-02-19 17:48:07 +08:00
chris	b049e16634	Create part and save pages when layout is edited	2013-02-19 17:48:06 +08:00
chris	c27141ff5a	Fix query for category in default widget	2013-02-19 17:48:04 +08:00
Fu Matthew	5a177f34a8	default widget query for category and tags	2013-02-19 17:45:24 +08:00
chris	a9fecec985	Add pagination to default widget for front end page	2013-02-19 17:41:01 +08:00
chris	0cacfb7c05	Fix path error in parser for breadcrumb	2013-02-19 17:39:43 +08:00
chris	c7cf587581	Fix web links html and index query	2013-02-19 17:39:43 +08:00
chris	236f68ba84	Fix archive module back end pagination and front end html	2013-02-19 17:39:43 +08:00
chris	1f11293fbe	Fix sitemap in page edit	2013-02-19 17:39:43 +08:00
chris	17ac564fbb	Fix sitemap nil Fix namespace of role in subrole	2013-02-19 17:39:43 +08:00
chris	f36bcb8801	Put missing changes for breadcrumb in page edit	2013-02-19 17:39:42 +08:00
chris	61648d23e1	Change delete_all to destroy_all	2013-02-19 17:39:42 +08:00
chris	3676de8a14	Change validation for url: can include IPs	2013-02-19 17:39:42 +08:00
chris	2a293734c7	Change breadcrumb html	2013-02-19 17:39:42 +08:00
Rueshyna	bfad8467c8	breadcrumb widget of front-end has done Conflicts: app/controllers/front_controller.rb lib/parsers/parser_common.rb	2013-02-19 17:39:42 +08:00
Rueshyna	f3bfe67e68	breadcrumb widget of back-end has done, front-end has bug... Conflicts: app/controllers/front_controller.rb app/views/front/show_breadcrumb.html.erb lib/parsers/parser_common.rb lib/parsers/parser_front_end.rb	2013-02-19 17:39:41 +08:00
chris	29b8fec89a	Temporary fix: show for default widget - the task migrate:recreate_page_parts must be run - "create_parts" in page.rb must be unprotected	2013-02-19 17:39:34 +08:00
chris	7105f103e1	Task to delete settings for old version of default widget	2013-02-19 17:34:39 +08:00
chris	e604c38eb4	Push Gemfile.lock	2013-02-19 17:24:24 +08:00
Rueshyna	bca4478f68	front_end widget breadcrumb done	2013-02-19 17:24:23 +08:00
Rueshyna	2a61470f8b	back_end widget breadcrumb finish	2013-02-19 17:24:19 +08:00
Fu Matthew	0b88f7d1f8	deliver app config. fix wrong value cause error for default widget	2013-02-19 14:21:54 +08:00
Fu Matthew	572e512a1d	fix link for default widget	2013-02-19 14:21:54 +08:00
Fu Matthew	0a115906f1	fix i18n,reload problems	2013-02-19 14:21:54 +08:00
Fu Matthew	b7d797f9dd	fix member sidebar add i18n for modules and default_widgets	2013-02-19 14:21:54 +08:00
Fu Matthew	fcb49723b4	fix sidebar icon for page. fix i18n on sidebar make sidebar sortable by changing db value. Need interface	2013-02-19 14:21:53 +08:00
Fu Matthew	96455f31e1	deliver app config. fix wrong value cause error for default widget	2013-02-18 19:04:04 +08:00
Fu Matthew	3a13ab4634	fix link for default widget	2013-02-18 17:03:18 +08:00
Fu Matthew	a6f6dc271c	fix i18n,reload problems	2013-02-18 15:13:31 +08:00
Fu Matthew	29bb92f841	fix member sidebar add i18n for modules and default_widgets	2013-02-06 17:44:38 +08:00
Fu Matthew	8e7e601845	Merge branch 'sidebar_config' of github.com:Rulingcom/orbit into sidebar_config	2013-02-04 18:19:47 +08:00
Fu Matthew	eed7a22dbe	fix sidebar icon for page. fix i18n on sidebar make sidebar sortable by changing db value. Need interface	2013-02-04 18:14:00 +08:00
chris	9771d42587	migrate for app config. fix panel style intro misplace	2013-02-04 18:10:39 +08:00
chris	2b3cbc50b3	Fix location namespace	2013-02-04 18:06:45 +08:00
chris	981854870a	Changes for mobile copyright	2013-02-04 18:02:11 +08:00
chris	6eb5061237	Changes for mobile map	2013-02-04 18:02:11 +08:00
chris	e9f2983176	Fix page part kind being removed	2013-02-04 18:02:09 +08:00
chris	774599a9f2	Set jquery-rails version to 2.1.4	2013-02-04 18:01:43 +08:00
chris	b1a11b4dad	Remove isotope	2013-02-04 18:01:42 +08:00
chris	3791046e5a	Add missing link to writing conference index	2013-02-04 18:01:42 +08:00
Fu Matthew	bbd30759f5	fix web resource frontend page	2013-02-04 18:01:42 +08:00
unknown	e244493b55	member plugin edit	2013-02-04 18:01:42 +08:00
Rueshyna	8e98aa10bc	modularize factories	2013-02-04 18:01:42 +08:00
Rueshyna	8f334f6948	modularize conference	2013-02-04 18:01:42 +08:00
Rueshyna	d4df7c82d3	relpace seminar to conference	2013-02-04 18:01:38 +08:00
Rueshyna	e0fedb4454	change textfiled to bilingual for co_author	2013-02-04 18:01:03 +08:00
Rueshyna	85ca196dec	add bilingual for personal journal	2013-02-04 18:01:03 +08:00
Rueshyna	b2bc62dadd	fixed orbit bar that like nccu bar now, and add rails version in Gemfile	2013-02-04 18:01:03 +08:00
unknown	0b18cf48e3	member roles edit	2013-02-04 18:01:03 +08:00
unknown	18a51f070e	member roles edit	2013-02-04 18:01:03 +08:00
chris	87a89f81ce	Fix bug for mobile app routes	2013-02-04 18:01:03 +08:00
chris	c33a723a2a	Fix css bug when precompile	2013-02-04 18:01:00 +08:00
Fu Matthew	71d5abae2e	first version of app config and modified inits.	2013-01-29 20:33:40 +08:00
unknown	8bf7d0f6f3	member plugin edit	2013-01-28 16:19:36 +08:00
Fu Matthew	bfaa22052f	Merge commit 'fc702a6210d901cd3beea220e72f71a3b7f7d41e' into sidebar_config Conflicts: app/controllers/admin/page_parts_controller.rb app/controllers/default_widget_controller.rb app/uploaders/gprs_uploader.rb app/uploaders/location_uploader.rb app/views/admin/page_parts/_module_widget.html.erb app/views/admin/page_parts/reload_widget_styles.js.erb app/views/admin/page_parts/reload_widgets.js.erb app/views/layouts/_side_bar_content.html.erb config/locales/zh_tw.yml lib/parsers/parser_front_end.rb vendor/built_in_modules/announcement/init.rb vendor/built_in_modules/gprs/app/assets/javascripts/panel/gprs/back_end/locations.js vendor/built_in_modules/gprs/app/assets/stylesheets/panel/gprs/back_end/locations.css vendor/built_in_modules/gprs/app/controllers/panel/gprs/back_end/locations_controller.rb vendor/built_in_modules/gprs/app/views/panel/gprs/back_end/locations/index.html.erb vendor/built_in_modules/gprs/test/functional/panel/gprs/back_end/locations_controller_test.rb vendor/built_in_modules/location/README.rdoc vendor/built_in_modules/location/app/assets/javascripts/panel/gprs/back_end/locations.js vendor/built_in_modules/location/app/assets/javascripts/panel/location/back_end/locations.js vendor/built_in_modules/location/app/assets/stylesheets/panel/gprs/back_end/locations.css vendor/built_in_modules/location/app/assets/stylesheets/panel/location/back_end/locations.css vendor/built_in_modules/location/app/controllers/panel/location/back_end/locations_controller.rb vendor/built_in_modules/location/app/controllers/panel/locations/back_end/locations_controller.rb vendor/built_in_modules/location/app/models/location.rb vendor/built_in_modules/location/app/uploaders/locations_uploader.rb vendor/built_in_modules/location/app/views/panel/location/back_end/locations/index.html.erb vendor/built_in_modules/location/app/views/panel/locations/back_end/locations/_form.html.erb vendor/built_in_modules/location/app/views/panel/locations/back_end/locations/edit.html.erb vendor/built_in_modules/location/app/views/panel/locations/back_end/locations/index.html.erb vendor/built_in_modules/location/app/views/panel/locations/back_end/locations/new.html.erb vendor/built_in_modules/location/config/routes.rb vendor/built_in_modules/location/lib/location.rb vendor/built_in_modules/location/location.gemspec vendor/built_in_modules/location/test/functional/panel/gprs/back_end/locations_controller_test.rb vendor/built_in_modules/location/test/functional/panel/location/back_end/locations_controller_test.rb	2013-01-24 16:30:02 +08:00
Fu Matthew	fc702a6210	add front-end page for web_resource	2013-01-24 13:54:14 +08:00
Fu Matthew	fea1726f6d	fix ajax error when edit new page	2013-01-24 13:39:08 +08:00
Fu Matthew	979df9ac80	daily commit	2013-01-23 18:51:18 +08:00
Fu Matthew	0cc616f988	page can use default widget	2013-01-21 16:56:37 +08:00
chris	1c15335fd7	Merge branch 'member_plugin' of github.com:Rulingcom/orbit into member_plugin	2013-01-18 11:25:55 +08:00
unknown	781a0ad96e	member roles edit	2013-01-18 11:25:11 +08:00
unknown	d0dcd71707	member roles edit	2013-01-18 11:25:11 +08:00
unknown	04d6fb8785	member roles edit	2013-01-18 11:09:38 +08:00
unknown	90c6c88f2f	Merge branch 'member_plugin' of https://github.com/Rulingcom/orbit into member_plugin	2013-01-18 10:39:29 +08:00
unknown	2e4fb361d7	member roles edit	2013-01-18 10:37:55 +08:00
Fu Matthew	9630d0a841	Merge branch 'new_widget_setting_interface' of github.com:Rulingcom/orbit into new_widget_setting_interface	2013-01-16 14:09:05 +08:00
Fu Matthew	9edf0dca54	ika re-redesign module widget	2013-01-16 14:07:09 +08:00
chris	91830f86aa	Fix bug for mobile app routes	2013-01-16 08:14:42 +08:00
chris	72e26fd92a	Fix css bug when precompile	2013-01-16 02:37:49 +08:00
chris	1f944d23cd	Merge branch 'desktop' of github.com:Rulingcom/orbit into desktop	2013-01-16 01:35:57 +08:00
Rueshyna	dca4f5d0be	mv gallery_uploader	2013-01-16 01:35:38 +08:00
Rueshyna	c44b4163e4	gprs byebye, location have two language, must have picture, long, lang have limit	2013-01-16 01:35:38 +08:00
Rueshyna	59b618ec35	mv gallery_uploader	2013-01-15 18:43:13 +08:00
Rueshyna	ae25bdf028	Merge branch 'desktop' of https://github.com/Rulingcom/orbit into desktop * 'desktop' of https://github.com/Rulingcom/orbit: correct personal journal language, but now hava no language config	2013-01-15 17:55:14 +08:00
Rueshyna	f1b6771b34	gprs byebye, location have two language, must have picture, long, lang have limit	2013-01-15 17:47:00 +08:00
Fu Matthew	91afad23ba	Merge branch 'new_widget_setting_interface'	2013-01-15 12:03:56 +08:00
Fu Matthew	ba75c02622	fix wrong behavior of new interface when a new page is newed	2013-01-15 12:02:13 +08:00
Fu Matthew	8413e31048	add i18n	2013-01-15 10:25:55 +08:00
chris	634f647afa	Set the version of mongo_session_store-rails3 to 3.0.6	2013-01-14 19:20:58 +08:00
chris	ee529723ad	Merge branch 'new_widget_setting_interface' of github.com:Rulingcom/orbit into new_widget_setting_interface	2013-01-14 19:18:50 +08:00
Fu Matthew	e1e003af6e	Complete new interface	2013-01-14 19:18:25 +08:00
Fu Matthew	16cfd27fe9	apply view	2013-01-14 19:18:25 +08:00
chris	664ca35801	Merge branch 'member_plugin' of github.com:Rulingcom/orbit into member_plugin	2013-01-14 19:00:35 +08:00
unknown	504f5027cc	member role edit	2013-01-14 19:00:08 +08:00
Fu Matthew	46b1d55ff6	Complete new interface	2013-01-14 18:49:23 +08:00
unknown	6a5c1d9007	member role edit	2013-01-14 18:19:14 +08:00
chris	f589439870	Merge branch 'desktop' of github.com:Rulingcom/orbit into desktop Conflicts: config/routes.rb	2013-01-14 18:06:56 +08:00
Rueshyna	da283e136b	correct personal journal language, but now hava no language config	2013-01-14 17:54:53 +08:00
Rueshyna	1b6bfdb80f	modularize personal journal and pull relational setting in desktop/index.rb	2013-01-14 17:54:52 +08:00
Rueshyna	68e14a7898	move js file to relational module but have js require problem	2013-01-14 17:54:52 +08:00
Rueshyna	919f951981	restore js,journal_pages.js,	2013-01-14 17:54:52 +08:00
Rueshyna	a183ac6041	fixed journal type page	2013-01-14 17:54:52 +08:00
Rueshyna	bf31d0c3dd	modularized personal journal	2013-01-14 17:54:52 +08:00
Rueshyna	758cab5ecd	move journal code to persional_journal modulaar	2013-01-14 17:53:59 +08:00
Rueshyna	284bf34fec	amend file value to correct format	2013-01-14 17:53:59 +08:00
chris	282604d1fa	Merge branch 'back' of github.com:Rulingcom/orbit into back Conflicts: app/assets/javascripts/mobile/orbit.mobile.js.erb app/assets/stylesheets/mobile.css app/assets/stylesheets/mobile/orbit-mobile.css.erb app/controllers/application_controller.rb app/controllers/mobile_controller.rb app/views/layouts/mobile.mobile.erb app/views/mobile/_footer.mobile.erb app/views/mobile/_header.mobile.erb app/views/mobile/_menu.mobile.erb app/views/mobile/index.mobile.erb config/routes.rb	2013-01-14 17:46:27 +08:00
chris	141eb7e723	Add mobile but remove news in it	2013-01-14 17:38:44 +08:00
chris	03c8d42138	Merge branch 'member_plugin' of github.com:Rulingcom/orbit into member_plugin	2013-01-14 17:04:06 +08:00
chris	54d098baf2	Change translation	2013-01-14 17:02:51 +08:00
unknown	84e4a558be	member roles edit	2013-01-14 17:02:51 +08:00
chris	4e2cbac027	Remove bottom padding if no footer in mobile Add a method in routes Copy mobile routes under the scope 'app' for app usage	2013-01-11 19:14:48 +08:00
chris	91d1487a04	Fix mobile banner, icons, announcement css	2013-01-11 18:34:20 +08:00
chris	d00192f018	Fix for mobile icon and iphone5 fullscreen	2013-01-11 17:00:09 +08:00
Rueshyna	c224d04a70	correct personal journal language, but now hava no language config	2013-01-11 16:11:46 +08:00
chris	5a4f681cfc	Fix the tooltips overflow	2013-01-11 12:24:50 +08:00
chris	de39bce4ce	Fix the tooltips	2013-01-11 12:13:16 +08:00
chris	b90e8efb1f	Fix filter not collapsing Fix icon size for button	2013-01-11 11:37:11 +08:00
chris	a7d1cdbb75	Fix for link in ad banner	2013-01-11 11:28:13 +08:00
Rueshyna	c888d9cae4	modularize personal journal and pull relational setting in desktop/index.rb	2013-01-11 10:55:19 +08:00
Fu Matthew	92f3be3200	Merge branch 'ntu' of github.com:Rulingcom/orbit into ntu	2013-01-10 18:18:02 +08:00
Fu Matthew	b950ad64c0	fix for fronted editing not responding for announcement.	2013-01-10 18:17:27 +08:00
Fu Matthew	ca51ebc08c	apply view	2013-01-10 18:00:58 +08:00
chris	e24f7a7880	Put back some field so ad_image can work	2013-01-10 11:08:57 +08:00
Rueshyna	08adb887c5	change default to defulat	2013-01-10 09:40:52 +08:00
chris	c36f3152f5	Changes in css for structure icon and sidebar padding	2013-01-09 21:35:54 +08:00
chris	1c1839fc00	Remove useless code in de_image.rb	2013-01-09 21:17:50 +08:00
chris	02e5e52159	Translation typo Remove test values in ad_image form Remove NeedReset	2013-01-09 21:17:50 +08:00
chris	48ce2278d0	Update disable time when separated picker new or reset date	2013-01-09 21:17:50 +08:00
chris	b49251afee	Date picker separated: reset time when reset date	2013-01-09 21:17:50 +08:00
chris	1d405c3ffe	Add "tag" icon to orbit bar	2013-01-09 21:17:50 +08:00
chris	d8f6ebb153	Fix icons	2013-01-09 21:17:50 +08:00
chris	7434d36e9b	Ray's changes for icon size	2013-01-09 21:17:50 +08:00
chris	933ac7b8fe	Ray's changes for icon css	2013-01-09 21:17:50 +08:00
chris	41dff814fb	Change icons	2013-01-09 21:17:50 +08:00
Fu Matthew	d0f474c2ab	fix wrong i18n	2013-01-09 17:13:25 +08:00
Fu Matthew	5ab4bbd367	add ad_banner inner page,pic title.	2013-01-09 16:54:33 +08:00
Rueshyna	bc031f34f6	move js file to relational module but have js require problem	2013-01-09 16:16:47 +08:00
Rueshyna	97eb9e19f9	restore js,journal_pages.js,	2013-01-09 14:40:58 +08:00
Fu Matthew	614b6fde71	fix wrong html structure for announcement frontend	2013-01-09 12:13:55 +08:00
chris	1d80b39dcb	Fix no responding when trying to access front end page	2013-01-09 11:23:18 +08:00
Rueshyna	bc3cba5ebc	fixed journal type page	2013-01-09 10:57:52 +08:00
chris	fac4faad6c	Change date picker	2013-01-09 05:18:16 +08:00
Rueshyna	4938198357	modularized personal journal	2013-01-08 18:34:18 +08:00
Rueshyna	96ef70aba4	move journal code to persional_journal modulaar	2013-01-08 18:34:18 +08:00
Rueshyna	ded445aae3	amend file value to correct format	2013-01-08 18:25:30 +08:00
chris	9c8bf1ffab	Change translation	2013-01-08 17:30:36 +08:00
unknown	9584d67b23	member roles edit	2013-01-08 16:58:01 +08:00
Fu Matthew	81d4481797	Merge commit '5b13c53ed99858f69d19bd03fe1a6bb74071a007' into sidebar_config	2013-01-08 14:18:04 +08:00
Fu Matthew	76296ab29b	Merge branch 'sidebar_config' into ntu Conflicts: app/controllers/admin/object_auths_new_interface_controller.rb app/controllers/orbit_backend_controller.rb app/controllers/orbit_widget_controller.rb app/models/module_app.rb app/views/admin/page_parts/_module_widget.html.erb config/locales/zh_tw.yml lib/parsers/parser_common.rb lib/parsers/parser_front_end.rb	2013-01-08 14:17:21 +08:00
chris	5b13c53ed9	Ika's changes in default_widget.css	2013-01-08 12:50:28 +08:00
chris	66dafbb2a0	Put impressionist delayed job in a patch	2013-01-08 12:45:15 +08:00
chris	e3d34263e3	Schedule job for tag_cloud	2013-01-08 12:36:50 +08:00
chris	423e2ac54e	Update bootstrap version 2.2.2	2013-01-07 17:25:32 +08:00
chris	67136cf595	Merge branch 'ntu_default_widget' of github.com:Rulingcom/orbit into ntu_default_widget Conflicts: app/views/default_widget/typeB.html.erb app/views/default_widget/typeC.html.erb lib/parsers/parser_common.rb	2013-01-07 17:22:01 +08:00
Fu Matthew	7594e1b9a6	fix member has no module_app	2013-01-07 17:20:37 +08:00
Fu Matthew	b71ebb3982	clean default widget	2013-01-07 17:20:37 +08:00
Fu Matthew	5793f0fe5d	default widget link. make sure to run rake migrate:make_default_widget_work_config for changing announcement module app	2013-01-07 17:20:37 +08:00
Rueshyna	a34da20e48	Merge branch 'master' into desktop * master: (57 commits) Add translations Add mobile version in site settings Add mobile but remove news in it Remove mysql Fix album widget options Fix link for ad_banner Add missing helper for web_link_category Show design's js in front-end Add link to default widget (temporary) Ika's fix for width Ika's fix for width Gallery i18n Ika's changes for css default widgets Ika's changes for css default widgets change bulletin object to bulletin title fixing default widget error when needs image make default widget works without init Fix order in structure Fix old tags correct pic file format complete page error handler logic change sub_menu to header in site setting ...	2013-01-07 16:44:05 +08:00
Rueshyna	ad5ee83c01	Merge branch 'master' of https://github.com/Rulingcom/orbit * 'master' of https://github.com/Rulingcom/orbit: (57 commits) Add translations Add mobile version in site settings Add mobile but remove news in it Remove mysql Fix album widget options Fix link for ad_banner Add missing helper for web_link_category Show design's js in front-end Add link to default widget (temporary) Ika's fix for width Ika's fix for width Gallery i18n Ika's changes for css default widgets Ika's changes for css default widgets change bulletin object to bulletin title fixing default widget error when needs image make default widget works without init Fix order in structure Fix old tags correct pic file format complete page error handler logic change sub_menu to header in site setting ...	2013-01-07 16:43:35 +08:00
Rueshyna	4ee683aa9b	fixed desktop route	2013-01-07 16:38:02 +08:00
Fu Matthew	137beabde9	fix member has no module_app	2013-01-07 14:04:14 +08:00
Rueshyna	35e0011111	Merge remote-tracking branch 'remotes/origin/publication' into desktop * remotes/origin/publication: new desktop framework updates	2013-01-07 12:44:30 +08:00
Fu Matthew	abbecfbe2f	clean default widget	2013-01-07 12:09:36 +08:00
Fu Matthew	5efbe07fbe	default widget link. make sure to run rake migrate:make_default_widget_work_config for changing announcement module app	2013-01-04 18:42:25 +08:00
harrybomrah	37f8c1637a	new desktop framework updates	2012-12-27 18:25:54 +08:00
Matthew K. Fu JuYuan	2dd2368378	remove merge marks	2012-12-25 11:26:23 +08:00
Matthew K. Fu JuYuan	49e6c33b57	Merge branch 'sidebar_config' of github.com:Rulingcom/orbit into sidebar_config Conflicts: app/controllers/admin/object_auths_new_interface_controller.rb app/views/layouts/_side_bar_content.html.erb config/locales/zh_tw.yml config/routes.rb vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb vendor/built_in_modules/announcement/init.rb vendor/built_in_modules/archive/init.rb vendor/built_in_modules/miss_module/config/locales/zh_tw.yml	2012-12-25 11:01:36 +08:00
Matthew K. Fu JuYuan	ec791a6646	keep zh_Tw alive	2012-12-25 10:45:33 +08:00
Matthew K. Fu JuYuan	47a63e3dab	fix widget.	2012-12-25 10:45:08 +08:00
Matthew K. Fu JuYuan	41bcbdd2f0	missing file?	2012-12-24 16:39:53 +08:00
Matthew K. Fu JuYuan	062ebecae3	fix serval bugs on sidebar.	2012-12-24 16:39:53 +08:00
Matthew K. Fu JuYuan	2c69590c36	rename of GPRS now it's named location	2012-12-24 16:39:53 +08:00
Matthew K. Fu JuYuan	397729d3a1	Remove GPRS	2012-12-24 16:39:53 +08:00
Matthew K. Fu JuYuan	53afb6ea0c	sidebar rewrited	2012-12-24 16:39:53 +08:00
Matthew K. Fu JuYuan	5f712622ad	default widgets and sidebar.	2012-12-24 16:38:35 +08:00
Matthew K. Fu JuYuan	6995bb1622	put module app json into init,making orbit app work with module app.	2012-12-24 16:23:16 +08:00
Matthew K. Fu JuYuan	36f6a6fdd6	first version of confined sidebar render	2012-12-24 16:17:00 +08:00
chris	5002916352	Remove mysql	2012-12-22 17:35:59 +08:00
chris	8ec0b35245	Fix wrong deletion in parser for gallery	2012-12-20 16:01:27 +08:00
chris	7ac6958690	Fix css bug when precompiling assets	2012-12-20 14:32:06 +08:00
chris	30268ab3bc	Remove useless css	2012-12-20 13:52:23 +08:00
chris	3a9106c10d	Add mobile but remove news in it	2012-12-20 03:21:50 +08:00
Matthew K. Fu JuYuan	858e942da2	fix serval bugs on sidebar.	2012-12-07 12:40:47 +08:00
Matthew K. Fu JuYuan	bd743a0ca5	rename of GPRS now it's named location	2012-12-07 12:40:21 +08:00
Matthew K. Fu JuYuan	e07fb7d434	Remove GPRS	2012-12-07 12:36:25 +08:00
Matthew K. Fu JuYuan	99f28a0cba	sidebar rewrited	2012-12-05 18:35:58 +08:00
Matthew K. Fu JuYuan	ca290f3519	Merge commit 'e429aa9425e9648a94a1dd7bb5cea15af7ba854a' into sidebar_config Conflicts: app/views/layouts/_side_bar_content.html.erb config/locales/zh_tw.yml config/mongoid.yml vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb vendor/built_in_modules/announcement/init.rb	2012-12-05 11:36:32 +08:00
Matthew K. Fu JuYuan	4bc80f2bd3	default widgets and sidebar.	2012-12-03 18:52:36 +08:00
Matthew K. Fu JuYuan	f9bcb27efc	put module app json into init,making orbit app work with module app.	2012-11-29 14:21:46 +08:00
Matthew K. Fu JuYuan	3d573680b2	Merge commit '6b248a949b44b6e4dc908f29f4f08c3a821210cd' into sidebar_config Conflicts: app/models/user/attribute_value.rb app/views/layouts/_side_bar_content.html.erb vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb	2012-11-26 17:55:53 +08:00
Matthew K. Fu JuYuan	c6894be962	first version of confined sidebar render	2012-11-20 15:56:52 +08:00

3988 changed files with 174671 additions and 51217 deletions

No files matched your search

.gitignore

+16 -14

View File

@@ -1,23 +1,25 @@
 !.gitignore
 .bundle
 .DS_Store
 .rvmrc
 Gemfile.lock
 db/*.sqlite3
 log/*.log
 tmp/**/*
 public/uploads/**/*
 uploads/**/*
 public/panel/**/*
 public/assets
 public/index.html
 .DS_Store
 solr/data/**/*
 public/panel/**/*
 public/uploads/**/*
 solr/data
 tmp/**/*
 uploads/**/*
 *.swp
 *.pid
 *.lck
 public/assets
 config/application.rb
 .rvmrc
 app/assets/javascripts/.DS_Store
 solr
 Gemfile.lock
 .sass-cache/*
 *.supported
 mongoid.yml
 *.

									
										Gemfile
									
		+17
		-10
	
												View File
												
				@@ -1,5 +1,5 @@

				source 'http://rubygems.org'

				gem 'rails', "~> 3.2"

				gem 'rails', "~> 3.2.9"

				gem "brakeman"

				gem 'mime-types'

				@@ -11,9 +11,13 @@ gem "net-ldap", "~> 0.3.1"

				gem 'devise', '1.5.3'

				gem 'exception_notification' # Send error trace

				gem 'execjs'

				gem 'jquery-rails'

				gem 'jquery-rails', '2.1.4'

				gem 'jquery-ui-rails'

				gem 'kaminari', :git => 'git://github.com/amatsuda/kaminari.git'

				gem "select2-rails", '3.3.1'

				gem 'kaminari'

				gem 'time_difference'

				gem "acts_as_unvlogable"

				gem 'youtube_it'

				# gem "memcached", "~> 1.4.3"

				# gem "memcache-client"

				@@ -21,10 +25,11 @@ gem 'kaminari', :git => 'git://github.com/amatsuda/kaminari.git'

				gem 'mini_magick'

				gem 'mongoid', '> 2.1', '< 3.0.0'

				gem 'mongoid-tree', :require => 'mongoid/tree'

				gem "mongo_session_store-rails3", "~> 3.0"

				gem "mongo_session_store-rails3", '3.0.6'

				gem 'nokogiri'

				gem 'fb_graph'

				gem 'rack-gridfs'

				gem 'radius'

				gem 'rake'

				# gem 'remotipart'

				@@ -44,14 +49,15 @@ gem 'sinatra'

				gem 'sprockets'

				gem 'social-share-button'

				gem 'tinymce-rails'

				gem 'ckeditor'

				# gem 'tinymce-rails', "~> 3.5.8"

				gem 'therubyracer' if RUBY_PLATFORM.downcase.include?("linux")

				gem 'libv8', '~> 3.11.8' if RUBY_PLATFORM.downcase.include?("linux")

				gem 'mongoid-encryptor', :require => 'mongoid/encryptor'

				gem 'rb-readline' if RUBY_PLATFORM.downcase.include?("linux")

				gem 'rb-readline','~> 0.4.2' if RUBY_PLATFORM.downcase.include?("linux")

				gem "impressionist", :git => 'git://github.com/charlotte-ruby/impressionist.git'

				gem "impressionist",'1.2.0'

				#gem 'contacts'

				#gem 'event-calendar', :require => 'event_calendar'#, :git => 'git://github.com/elevation/event_calendar.git'

				@@ -61,6 +67,8 @@ gem 'chinese_pinyin', '0.4.1'

				gem 'rmmseg-cpp-huacnlee', '0.2.9'

				gem 'redis-namespace'

				gem 'redis-search'

				gem 'syslog-logger'

				gem "recaptcha", :require => "recaptcha/rails"

				# Gems used only for assets and not required

				# in production environments by default.

				@@ -76,8 +84,8 @@ group :test, :development do

				  gem 'pry-remote'

				  gem 'pry-stack_explorer'

				  gem 'pry-debugger'

				  gem 'debugger'

				  gem 'faker'

				  gem "sunspot-rails-tester"

				  gem 'database_cleaner'  #Strategies for cleaning databases. Can be used to ensure a clean state for testing.

				  gem "rspec", "~> 2.0"

				@@ -93,4 +101,3 @@ group :test, :development do

				  # gem "bluecloth"

				end

				gem 'debugger'

app/assets/images/75.png → app/assets/Archive/images/75.png

View File

File renamed without changes.

app/assets/images/Jobs.jpg → app/assets/Archive/images/Jobs.jpg

View File

File renamed without changes.

app/assets/images/PIE.htc → app/assets/Archive/images/PIE.htc

View File

File renamed without changes.

app/assets/images/Thumbs.db → app/assets/Archive/images/Thumbs.db

View File

File renamed without changes.

app/assets/images/add_mamber.png → app/assets/Archive/images/add_mamber.png

View File

File renamed without changes.

app/assets/images/ajax-loader.gif → app/assets/Archive/images/ajax-loader.gif

View File

File renamed without changes.

app/assets/images/ar1.png → app/assets/Archive/images/ar1.png

View File

File renamed without changes.

app/assets/images/background.jpg → app/assets/Archive/images/background.jpg

View File

File renamed without changes.

app/assets/images/bar_bg.png → app/assets/Archive/images/bar_bg.png

View File

File renamed without changes.

app/assets/images/bar_border.png → app/assets/Archive/images/bar_border.png

View File

File renamed without changes.

app/assets/images/bar_btn.png → app/assets/Archive/images/bar_btn.png

View File

File renamed without changes.

app/assets/images/bar_id.png → app/assets/Archive/images/bar_id.png

View File

File renamed without changes.

app/assets/images/bar_orbit.png → app/assets/Archive/images/bar_orbit.png

View File

File renamed without changes.

app/assets/images/bar_pw.png → app/assets/Archive/images/bar_pw.png

View File

File renamed without changes.

app/assets/images/body.jpg → app/assets/Archive/images/body.jpg

View File

File renamed without changes.

app/assets/images/bought_btn.png → app/assets/Archive/images/bought_btn.png

View File

File renamed without changes.

app/assets/images/buy_btn.png → app/assets/Archive/images/buy_btn.png

View File

File renamed without changes.

app/assets/images/check.png → app/assets/Archive/images/check.png

View File

File renamed without changes.

app/assets/images/connection/Thumbs.db → app/assets/Archive/images/connection/Thumbs.db

View File

File renamed without changes.

app/assets/images/connection/facebook.png → app/assets/Archive/images/connection/facebook.png

View File

File renamed without changes.

app/assets/images/connection/gmail.png → app/assets/Archive/images/connection/gmail.png

View File

File renamed without changes.

app/assets/images/connection/twitter.png → app/assets/Archive/images/connection/twitter.png

View File

File renamed without changes.

app/assets/images/default-img.png → app/assets/Archive/images/default-img.png

View File

File renamed without changes.

app/assets/Archive/images/desktop/chrome.png

Executable

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 2.7 KiB

app/assets/Archive/images/desktop/compatibility_bg.jpg

Executable

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 104 KiB

app/assets/Archive/images/desktop/firefox.png

Executable

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 3.6 KiB

app/assets/Archive/images/desktop/ie.png

Executable

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 1.2 KiB

app/assets/Archive/images/desktop/opera.png

Executable

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 1.0 KiB

app/assets/Archive/images/desktop/safari.png

Executable

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 2.2 KiB

app/assets/Archive/images/desktop/select2/select2.png

Executable

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 824 B

app/assets/Archive/images/desktop/select2/select2x2.png

Executable

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 845 B

app/assets/Archive/images/desktop/select2/spinner.gif

Executable

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 1.8 KiB

app/assets/images/dropdown_ad.png → app/assets/Archive/images/dropdown_ad.png

View File

File renamed without changes.

app/assets/images/editicon.png → app/assets/Archive/images/editicon.png

View File

File renamed without changes.

app/assets/images/f1.jpg → app/assets/Archive/images/f1.jpg

View File

File renamed without changes.

app/assets/images/f2.jpg → app/assets/Archive/images/f2.jpg

View File

File renamed without changes.

app/assets/images/f3.jpg → app/assets/Archive/images/f3.jpg

View File

File renamed without changes.

app/assets/images/facebook.png → app/assets/Archive/images/facebook.png

View File

File renamed without changes.

app/assets/Archive/images/ft-icons/Small Icons/accdb.ico

Executable

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 13 KiB

app/assets/Archive/images/ft-icons/Small Icons/avi.ico

Executable

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 13 KiB

app/assets/Archive/images/ft-icons/Small Icons/bmp.ico

Executable

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 13 KiB

app/assets/Archive/images/ft-icons/Small Icons/css.ico

Executable

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 13 KiB

app/assets/images/ft-icons/docx_mac/docx_mac-sm.ico → app/assets/Archive/images/ft-icons/Small Icons/docx_mac.ico

View File

File renamed without changes.

app/assets/Archive/images/ft-icons/Small Icons/docx_win.ico

Executable

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 13 KiB

app/assets/Archive/images/ft-icons/Small Icons/eml.ico

Executable

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 13 KiB

app/assets/Archive/images/ft-icons/Small Icons/eps.ico

Executable

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 13 KiB

app/assets/Archive/images/ft-icons/Small Icons/fla.ico

Executable

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 13 KiB

app/assets/Archive/images/ft-icons/Small Icons/gif.ico

Executable

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 13 KiB

app/assets/Archive/images/ft-icons/Small Icons/html.ico

Executable

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 13 KiB

app/assets/Archive/images/ft-icons/Small Icons/ind.ico

Executable

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 13 KiB

app/assets/Archive/images/ft-icons/Small Icons/ini.ico

Executable

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 13 KiB

app/assets/Archive/images/ft-icons/Small Icons/jpeg.ico

Executable

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 13 KiB

app/assets/Archive/images/ft-icons/Small Icons/jsf.ico

Executable

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 13 KiB

app/assets/Archive/images/ft-icons/Small Icons/midi.ico

Executable

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 13 KiB

app/assets/Archive/images/ft-icons/Small Icons/mov.ico

Executable

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 13 KiB

app/assets/Archive/images/ft-icons/Small Icons/mp3.ico

Executable

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 13 KiB

app/assets/Archive/images/ft-icons/Small Icons/mpeg.ico

Executable

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 13 KiB

app/assets/Archive/images/ft-icons/Small Icons/pdf.ico

Executable

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 13 KiB

app/assets/Archive/images/ft-icons/Small Icons/png.ico

Executable

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 13 KiB

app/assets/images/ft-icons/pptx_mac/pptx_mac-sm.ico → app/assets/Archive/images/ft-icons/Small Icons/pptx_mac.ico

View File

File renamed without changes.

app/assets/Archive/images/ft-icons/Small Icons/pptx_win.ico

Executable

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 13 KiB

app/assets/Archive/images/ft-icons/Small Icons/proj.ico

Executable

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 13 KiB

app/assets/Archive/images/ft-icons/Small Icons/psd.ico

Executable

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 13 KiB

app/assets/Archive/images/ft-icons/Small Icons/pst.ico

Executable

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 13 KiB

app/assets/Archive/images/ft-icons/Small Icons/pub.ico

Executable

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 13 KiB

app/assets/Archive/images/ft-icons/Small Icons/rar.ico

Executable

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 13 KiB

app/assets/Archive/images/ft-icons/Small Icons/readme.ico

Executable

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 13 KiB

app/assets/Archive/images/ft-icons/Small Icons/settings.ico

Executable

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 13 KiB

app/assets/Archive/images/ft-icons/Small Icons/text.ico

Executable

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 13 KiB

app/assets/Archive/images/ft-icons/Small Icons/tiff.ico

Executable

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 13 KiB

app/assets/Archive/images/ft-icons/Small Icons/url.ico

Executable

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 13 KiB

app/assets/Archive/images/ft-icons/Small Icons/vsd.ico

Executable

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 13 KiB

app/assets/Archive/images/ft-icons/Small Icons/wav.ico

Executable

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 13 KiB

app/assets/Archive/images/ft-icons/Small Icons/wma.ico

Executable

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 13 KiB

app/assets/Archive/images/ft-icons/Small Icons/wmv.ico

Executable

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 13 KiB

app/assets/images/ft-icons/xlsx_mac/xlsx_mac-sm.ico → app/assets/Archive/images/ft-icons/Small Icons/xlsx_mac.ico

View File

File renamed without changes.

app/assets/Archive/images/ft-icons/Small Icons/xlsx_win.ico

Executable

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 13 KiB

app/assets/Archive/images/ft-icons/Small Icons/zip.ico

Executable

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 13 KiB

app/assets/Archive/images/ft-icons/accdb/accdb-128_32.png

Executable

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 17 KiB

app/assets/Archive/images/ft-icons/accdb/accdb-16_32.png

Executable

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 918 B

app/assets/Archive/images/ft-icons/accdb/accdb-24_32.png

Executable

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 1.8 KiB

app/assets/Archive/images/ft-icons/accdb/accdb-256_32.png

Executable

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 44 KiB

app/assets/Archive/images/ft-icons/accdb/accdb-32_32.png

Executable

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 2.4 KiB

app/assets/Archive/images/ft-icons/accdb/accdb-48_32.png

Executable

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 4.8 KiB

app/assets/Archive/images/ft-icons/accdb/accdb-64_32.png

Executable

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 6.2 KiB

app/assets/Archive/images/ft-icons/accdb/accdb-72_32.png

Executable

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 8.6 KiB

app/assets/Archive/images/ft-icons/accdb/accdb-80_32.png

Executable

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 10 KiB

app/assets/Archive/images/ft-icons/accdb/accdb-96_32.png

Executable

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 15 KiB

app/assets/Archive/images/ft-icons/accdb/accdb-sm-16_32.png

Executable

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 735 B

app/assets/Archive/images/ft-icons/accdb/accdb-sm-24_32.png

Executable

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 1.5 KiB

app/assets/Archive/images/ft-icons/accdb/accdb-sm-32_32.png

Executable

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 1.1 KiB

app/assets/Archive/images/ft-icons/accdb/accdb-sm.ico

Executable

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 13 KiB

app/assets/Archive/images/ft-icons/accdb/accdb.ico

Executable

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 228 KiB

app/assets/Archive/images/ft-icons/avi/avi-128_32.png

Executable

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 14 KiB

app/assets/Archive/images/ft-icons/avi/avi-16_32.png

Executable

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 927 B

app/assets/Archive/images/ft-icons/avi/avi-24_32.png

Executable

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 1.8 KiB

app/assets/Archive/images/ft-icons/avi/avi-256_32.png

Executable

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 27 KiB

app/assets/Archive/images/ft-icons/avi/avi-32_32.png

Executable

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 2.4 KiB

Loaded 100 of 3988 files, more files were not shown because too many files have changed in this diff. Show more

Compare commits

No files matched your search