isotope embedded inside desktop kernel

file title translations fixed
new ui for faq and announcement status fixed.
2013-08-28 16:30:08 +08:00 · 2013-08-21 13:46:04 +08:00 · 2013-08-20 18:22:11 +08:00 · 2013-08-19 17:13:36 +08:00 · 2013-08-19 12:59:57 +08:00 · 2013-08-19 10:16:53 +08:00
2688 changed files with 125881 additions and 31430 deletions
--- a/.gitignore
+++ b/.gitignore
@ -22,3 +22,4 @@ uploads/**/*
 .sass-cache/*
 *.supported
 mongoid.yml
 *.
--- a/8
+++ b/8
@ -14,7 +14,10 @@ gem 'execjs'
 gem 'jquery-rails', '2.1.4'
 gem 'jquery-ui-rails'
 gem "select2-rails", '3.3.1'
-gem 'kaminari', :git => 'git://github.com/amatsuda/kaminari.git'
+gem 'kaminari'
 gem 'time_difference'
 gem "acts_as_unvlogable"
 gem 'youtube_it'
 # gem "memcached", "~> 1.4.3"
 # gem "memcache-client"
@ -46,7 +49,8 @@ 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'
--- a/app/assets/Archive/images/75.png
+++ b/app/assets/Archive/images/75.png
--- a/app/assets/Archive/images/Jobs.jpg
+++ b/app/assets/Archive/images/Jobs.jpg
--- a/app/assets/Archive/images/PIE.htc
+++ b/app/assets/Archive/images/PIE.htc
--- a/app/assets/Archive/images/Thumbs.db
+++ b/app/assets/Archive/images/Thumbs.db
--- a/app/assets/Archive/images/add_mamber.png
+++ b/app/assets/Archive/images/add_mamber.png
--- a/app/assets/Archive/images/ajax-loader.gif
+++ b/app/assets/Archive/images/ajax-loader.gif
--- a/app/assets/Archive/images/ar1.png
+++ b/app/assets/Archive/images/ar1.png
--- a/app/assets/Archive/images/background.jpg
+++ b/app/assets/Archive/images/background.jpg
--- a/app/assets/Archive/images/bar_bg.png
+++ b/app/assets/Archive/images/bar_bg.png
--- a/app/assets/Archive/images/bar_border.png
+++ b/app/assets/Archive/images/bar_border.png
--- a/app/assets/Archive/images/bar_btn.png
+++ b/app/assets/Archive/images/bar_btn.png
--- a/app/assets/Archive/images/bar_id.png
+++ b/app/assets/Archive/images/bar_id.png
--- a/app/assets/Archive/images/bar_orbit.png
+++ b/app/assets/Archive/images/bar_orbit.png
--- a/app/assets/Archive/images/bar_pw.png
+++ b/app/assets/Archive/images/bar_pw.png
--- a/app/assets/Archive/images/body.jpg
+++ b/app/assets/Archive/images/body.jpg
--- a/app/assets/Archive/images/bought_btn.png
+++ b/app/assets/Archive/images/bought_btn.png
--- a/app/assets/Archive/images/buy_btn.png
+++ b/app/assets/Archive/images/buy_btn.png
--- a/app/assets/Archive/images/check.png
+++ b/app/assets/Archive/images/check.png
--- a/app/assets/Archive/images/connection/Thumbs.db
+++ b/app/assets/Archive/images/connection/Thumbs.db
--- a/app/assets/Archive/images/connection/facebook.png
+++ b/app/assets/Archive/images/connection/facebook.png
--- a/app/assets/Archive/images/connection/gmail.png
+++ b/app/assets/Archive/images/connection/gmail.png
--- a/app/assets/Archive/images/connection/twitter.png
+++ b/app/assets/Archive/images/connection/twitter.png
--- a/app/assets/Archive/images/default-img.png
+++ b/app/assets/Archive/images/default-img.png
--- a/app/assets/Archive/images/desktop/chrome.png
+++ b/app/assets/Archive/images/desktop/chrome.png
--- a/app/assets/Archive/images/desktop/compatibility_bg.jpg
+++ b/app/assets/Archive/images/desktop/compatibility_bg.jpg
--- a/app/assets/Archive/images/desktop/firefox.png
+++ b/app/assets/Archive/images/desktop/firefox.png
--- a/app/assets/Archive/images/desktop/ie.png
+++ b/app/assets/Archive/images/desktop/ie.png
--- a/app/assets/Archive/images/desktop/opera.png
+++ b/app/assets/Archive/images/desktop/opera.png
--- a/app/assets/Archive/images/desktop/safari.png
+++ b/app/assets/Archive/images/desktop/safari.png
--- a/app/assets/Archive/images/desktop/select2/select2.png
+++ b/app/assets/Archive/images/desktop/select2/select2.png
--- a/app/assets/Archive/images/desktop/select2/select2x2.png
+++ b/app/assets/Archive/images/desktop/select2/select2x2.png
--- a/app/assets/Archive/images/desktop/select2/spinner.gif
+++ b/app/assets/Archive/images/desktop/select2/spinner.gif
--- a/app/assets/Archive/images/dropdown_ad.png
+++ b/app/assets/Archive/images/dropdown_ad.png
--- a/app/assets/Archive/images/editicon.png
+++ b/app/assets/Archive/images/editicon.png
--- a/app/assets/Archive/images/f1.jpg
+++ b/app/assets/Archive/images/f1.jpg
--- a/app/assets/Archive/images/f2.jpg
+++ b/app/assets/Archive/images/f2.jpg
--- a/app/assets/Archive/images/f3.jpg
+++ b/app/assets/Archive/images/f3.jpg
--- a/app/assets/Archive/images/facebook.png
+++ b/app/assets/Archive/images/facebook.png
--- a/app/assets/Archive/images/ft-icons/Small
+++ b/app/assets/Archive/images/ft-icons/Small
--- a/app/assets/Archive/images/ft-icons/Small
+++ b/app/assets/Archive/images/ft-icons/Small
--- a/app/assets/Archive/images/ft-icons/Small
+++ b/app/assets/Archive/images/ft-icons/Small
--- a/app/assets/Archive/images/ft-icons/Small
+++ b/app/assets/Archive/images/ft-icons/Small
--- a/app/assets/images/ft-icons/docx_mac/docx_mac-sm.ico
+++ b/app/assets/images/ft-icons/docx_mac/docx_mac-sm.ico
--- a/app/assets/Archive/images/ft-icons/Small
+++ b/app/assets/Archive/images/ft-icons/Small
--- a/app/assets/Archive/images/ft-icons/Small
+++ b/app/assets/Archive/images/ft-icons/Small
--- a/app/assets/Archive/images/ft-icons/Small
+++ b/app/assets/Archive/images/ft-icons/Small
--- a/app/assets/Archive/images/ft-icons/Small
+++ b/app/assets/Archive/images/ft-icons/Small
--- a/app/assets/Archive/images/ft-icons/Small
+++ b/app/assets/Archive/images/ft-icons/Small
--- a/app/assets/Archive/images/ft-icons/Small
+++ b/app/assets/Archive/images/ft-icons/Small
--- a/app/assets/Archive/images/ft-icons/Small
+++ b/app/assets/Archive/images/ft-icons/Small
--- a/app/assets/Archive/images/ft-icons/Small
+++ b/app/assets/Archive/images/ft-icons/Small
--- a/app/assets/Archive/images/ft-icons/Small
+++ b/app/assets/Archive/images/ft-icons/Small
--- a/app/assets/Archive/images/ft-icons/Small
+++ b/app/assets/Archive/images/ft-icons/Small
--- a/app/assets/Archive/images/ft-icons/Small
+++ b/app/assets/Archive/images/ft-icons/Small
--- a/app/assets/Archive/images/ft-icons/Small
+++ b/app/assets/Archive/images/ft-icons/Small
--- a/app/assets/Archive/images/ft-icons/Small
+++ b/app/assets/Archive/images/ft-icons/Small
--- a/app/assets/Archive/images/ft-icons/Small
+++ b/app/assets/Archive/images/ft-icons/Small
--- a/app/assets/Archive/images/ft-icons/Small
+++ b/app/assets/Archive/images/ft-icons/Small
--- a/app/assets/Archive/images/ft-icons/Small
+++ b/app/assets/Archive/images/ft-icons/Small
--- a/app/assets/images/ft-icons/pptx_mac/pptx_mac-sm.ico
+++ b/app/assets/images/ft-icons/pptx_mac/pptx_mac-sm.ico
--- a/app/assets/Archive/images/ft-icons/Small
+++ b/app/assets/Archive/images/ft-icons/Small
--- a/app/assets/Archive/images/ft-icons/Small
+++ b/app/assets/Archive/images/ft-icons/Small
--- a/app/assets/Archive/images/ft-icons/Small
+++ b/app/assets/Archive/images/ft-icons/Small
--- a/app/assets/Archive/images/ft-icons/Small
+++ b/app/assets/Archive/images/ft-icons/Small
--- a/app/assets/Archive/images/ft-icons/Small
+++ b/app/assets/Archive/images/ft-icons/Small
--- a/app/assets/Archive/images/ft-icons/Small
+++ b/app/assets/Archive/images/ft-icons/Small
--- a/app/assets/Archive/images/ft-icons/Small
+++ b/app/assets/Archive/images/ft-icons/Small
--- a/app/assets/Archive/images/ft-icons/Small
+++ b/app/assets/Archive/images/ft-icons/Small
--- a/app/assets/Archive/images/ft-icons/Small
+++ b/app/assets/Archive/images/ft-icons/Small
--- a/app/assets/Archive/images/ft-icons/Small
+++ b/app/assets/Archive/images/ft-icons/Small
--- a/app/assets/Archive/images/ft-icons/Small
+++ b/app/assets/Archive/images/ft-icons/Small
--- a/app/assets/Archive/images/ft-icons/Small
+++ b/app/assets/Archive/images/ft-icons/Small
--- a/app/assets/Archive/images/ft-icons/Small
+++ b/app/assets/Archive/images/ft-icons/Small
--- a/app/assets/Archive/images/ft-icons/Small
+++ b/app/assets/Archive/images/ft-icons/Small
--- a/app/assets/Archive/images/ft-icons/Small
+++ b/app/assets/Archive/images/ft-icons/Small
--- a/app/assets/images/ft-icons/xlsx_mac/xlsx_mac-sm.ico
+++ b/app/assets/images/ft-icons/xlsx_mac/xlsx_mac-sm.ico
--- a/app/assets/Archive/images/ft-icons/Small
+++ b/app/assets/Archive/images/ft-icons/Small
--- a/app/assets/Archive/images/ft-icons/Small
+++ b/app/assets/Archive/images/ft-icons/Small
--- a/app/assets/Archive/images/ft-icons/accdb/accdb-128_32.png
+++ b/app/assets/Archive/images/ft-icons/accdb/accdb-128_32.png
--- a/app/assets/Archive/images/ft-icons/accdb/accdb-16_32.png
+++ b/app/assets/Archive/images/ft-icons/accdb/accdb-16_32.png
--- a/app/assets/Archive/images/ft-icons/accdb/accdb-24_32.png
+++ b/app/assets/Archive/images/ft-icons/accdb/accdb-24_32.png
--- a/app/assets/Archive/images/ft-icons/accdb/accdb-256_32.png
+++ b/app/assets/Archive/images/ft-icons/accdb/accdb-256_32.png
--- a/app/assets/Archive/images/ft-icons/accdb/accdb-32_32.png
+++ b/app/assets/Archive/images/ft-icons/accdb/accdb-32_32.png
--- a/app/assets/Archive/images/ft-icons/accdb/accdb-48_32.png
+++ b/app/assets/Archive/images/ft-icons/accdb/accdb-48_32.png
--- a/app/assets/Archive/images/ft-icons/accdb/accdb-64_32.png
+++ b/app/assets/Archive/images/ft-icons/accdb/accdb-64_32.png
--- a/app/assets/Archive/images/ft-icons/accdb/accdb-72_32.png
+++ b/app/assets/Archive/images/ft-icons/accdb/accdb-72_32.png
--- a/app/assets/Archive/images/ft-icons/accdb/accdb-80_32.png
+++ b/app/assets/Archive/images/ft-icons/accdb/accdb-80_32.png
--- a/app/assets/Archive/images/ft-icons/accdb/accdb-96_32.png
+++ b/app/assets/Archive/images/ft-icons/accdb/accdb-96_32.png
--- a/app/assets/Archive/images/ft-icons/accdb/accdb-sm-16_32.png
+++ b/app/assets/Archive/images/ft-icons/accdb/accdb-sm-16_32.png
--- a/app/assets/Archive/images/ft-icons/accdb/accdb-sm-24_32.png
+++ b/app/assets/Archive/images/ft-icons/accdb/accdb-sm-24_32.png
--- a/app/assets/Archive/images/ft-icons/accdb/accdb-sm-32_32.png
+++ b/app/assets/Archive/images/ft-icons/accdb/accdb-sm-32_32.png
--- a/app/assets/Archive/images/ft-icons/accdb/accdb-sm.ico
+++ b/app/assets/Archive/images/ft-icons/accdb/accdb-sm.ico
--- a/app/assets/Archive/images/ft-icons/accdb/accdb.ico
+++ b/app/assets/Archive/images/ft-icons/accdb/accdb.ico
--- a/app/assets/Archive/images/ft-icons/avi/avi-128_32.png
+++ b/app/assets/Archive/images/ft-icons/avi/avi-128_32.png
--- a/app/assets/Archive/images/ft-icons/avi/avi-16_32.png
+++ b/app/assets/Archive/images/ft-icons/avi/avi-16_32.png
--- a/app/assets/Archive/images/ft-icons/avi/avi-24_32.png
+++ b/app/assets/Archive/images/ft-icons/avi/avi-24_32.png
--- a/app/assets/Archive/images/ft-icons/avi/avi-256_32.png
+++ b/app/assets/Archive/images/ft-icons/avi/avi-256_32.png
--- a/app/assets/Archive/images/ft-icons/avi/avi-32_32.png
+++ b/app/assets/Archive/images/ft-icons/avi/avi-32_32.png
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Harry Bomrah	8b1702f358	isotope embedded inside desktop kernel	2013-08-28 16:30:08 +08:00
Harry Bomrah	4a68b1edb6	file title translations fixed	2013-08-21 13:46:04 +08:00
Harry Bomrah	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
Harry Bomrah	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
Harry Bomrah	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
Harry Bomrah	bbb765c88d	small fix for file link inside edit form for desktop	2013-08-16 15:49:12 +08:00
Harry Bomrah	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
Harry Bomrah	a04155963d	all file things are fixed. delete and view and also names	2013-08-14 09:30:48 +08:00
Harry Bomrah	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
Harry Bomrah	9c7558847a	bilingual fixed for all the plugins in desktop	2013-08-12 12:28:58 +08:00
Harry Bomrah	771ec0b8f6	css fixed for plugins and types and also some other css problem fixed	2013-08-12 12:28:51 +08:00
Harry Bomrah	d0ef862f85	language changes and conferences add/edit bug fixed	2013-08-12 12:28:46 +08:00
Harry Bomrah	b2c3beefe9	icons and colors for themes fixed	2013-08-12 12:28:39 +08:00
Harry Bomrah	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
Harry Bomrah	0b6ace4e26	ok for precompiling	2013-08-07 15:03:08 +08:00
Harry Bomrah	e3d9966f76	bugs fixed for plugins. .. and also css fixed	2013-08-06 17:53:04 +08:00
Harry Bomrah	7d288b4160	some changes in file selection	2013-08-06 17:52:50 +08:00
Harry Bomrah	c2f223b82c	new plugins added for desktop	2013-08-06 17:52:39 +08:00
Harry Bomrah	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
Harry Bomrah	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
Harry Bomrah	f7dbbf1bca	new themes added to desktop plus theme uploader created	2013-07-30 16:43:32 +08:00
Harry Bomrah	6d89eab98a	desktop final fix	2013-07-30 16:43:28 +08:00
Harry Bomrah	c18a8a8c6f	mongoid yml fix	2013-07-30 16:43:22 +08:00
Harry Bomrah	38194311ab	some changes again	2013-07-30 16:43:18 +08:00
Harry Bomrah	bd5f3d1a44	some changes Conflicts: config/mongoid.yml	2013-07-30 16:43:14 +08:00
Harry Bomrah	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
Harry Bomrah	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
Harry Bomrah	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
Harry Bomrah	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
Harry Bomrah	9478bb13e2	search fixed again according to devin requirements	2013-07-30 16:42:14 +08:00
Harry Bomrah	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
Harry Bomrah	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
Harry Bomrah	ae8033ea1b	duplicate error fixed and css inside widgets fixed, duplicate location fixed	2013-07-30 16:41:44 +08:00
Harry Bomrah	dc94283af9	duplicate error fixed and css inside widgets fixed, duplicate location fixed	2013-07-30 16:41:38 +08:00
Harry Bomrah	78d6e33865	devin branch merge plus minor fixes	2013-07-30 16:41:32 +08:00
Harry Bomrah	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
Harry Bomrah	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
Harry Bomrah	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
Harry Bomrah	0921d7731b	my favorite update :) lazy loading for theater view plus a very smooth navigation of images.	2013-07-19 17:38:41 +08:00
Harry Bomrah	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
Harry Bomrah	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
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
Harry Bomrah	d089822ff3	fixed updated method of events.. was having week error when updating events	2013-06-20 12:47:44 +08:00
Harry Bomrah	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
Harry Bomrah	07e895fc42	Small change for creating events when calendar is not selected	2013-06-19 17:27:13 +08:00
Harry Bomrah	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