added fix for member_attributes text_area

fix for some edit rendering
fix for fallback if site cant communicate to store and also fixed edit mode
2015-07-20 20:48:28 +08:00 · 2015-07-20 19:50:34 +08:00 · 2015-07-20 17:29:29 +08:00 · 2015-07-17 14:53:50 +08:00 · 2015-07-16 19:42:05 +08:00 · 2015-07-15 14:00:48 +08:00
1464 changed files with 16374 additions and 42176 deletions
--- a/.gitignore
+++ b/.gitignore
@ -20,8 +20,7 @@
 app/views/frontend
 /public/uploads/*
 public/assets/*
+public/site_feeds/*
 public/import_status.yml
 public/announcement_link_widget_en.json
 public/announcement_link_widget_zh_tw.json
-vendor/announcement-test
-vendor/news
--- a/20
+++ b/20
@ -1,5 +1,8 @@
 source 'https://rubygems.org'

+#social gems
+gem "omniauth-google-oauth2", "~> 0.2.1"
+
 #rails gem
 gem 'rails', '~> 4.1.0'
 gem 'sanitize'
@ -28,7 +31,8 @@ gem 'nokogiri'
 gem 'httparty'

 #database
-gem 'mongoid', github: "mongoid/mongoid"
+# gem 'mongoid', github: "mongoid/mongoid"
+gem 'mongoid', '~> 4.0.2'

 #file uploading and carrierwave
 gem "mini_magick", "3.5.0"
@ -42,9 +46,6 @@ gem 'usagewatch_ext'
 gem 'ckeditor'
 gem 'unicorn'
 gem 'zhconv'
-
-gem "net-ldap", "~> 0.3.1"
-
 gem 'time_difference'
 gem 'execjs'
 gem 'therubyracer'
@ -84,8 +85,11 @@ end
 #ask
 gem 'gotcha'

-#desktop
-gem 'angularjs-rails', '~> 1.2.20'
-gem 'angular-ui-bootstrap-rails', '~> 0.11.0'
-gem 'jquery_mousewheel_rails', '~> 3.1.11.3'
+#caching observers
+gem 'mongoid-observers'
+
+#desktop
+# gem 'angularjs-rails', '~> 1.2.20'
+# gem 'angular-ui-bootstrap-rails', '~> 0.11.0'
+# gem 'jquery_mousewheel_rails', '~> 3.1.11.3'

--- a/app/assets/fonts/desktop/FontAwesome.otf
+++ b/app/assets/fonts/desktop/FontAwesome.otf
--- a/app/assets/fonts/desktop/fontawesome-webfont.eot
+++ b/app/assets/fonts/desktop/fontawesome-webfont.eot
--- a/app/assets/fonts/desktop/fontawesome-webfont.svg
+++ b/app/assets/fonts/desktop/fontawesome-webfont.svg
--- a/app/assets/fonts/desktop/fontawesome-webfont.ttf
+++ b/app/assets/fonts/desktop/fontawesome-webfont.ttf
--- a/app/assets/fonts/desktop/fontawesome-webfont.woff
+++ b/app/assets/fonts/desktop/fontawesome-webfont.woff
--- a/app/assets/images/chosen/chosen-sprite.png
+++ b/app/assets/images/chosen/chosen-sprite.png
--- a/app/assets/images/chosen/chosen-sprite@2x.png
+++ b/app/assets/images/chosen/chosen-sprite@2x.png
--- a/app/assets/images/default-site-logo.png
+++ b/app/assets/images/default-site-logo.png
--- a/app/assets/images/ft-icons/Small
+++ b/app/assets/images/ft-icons/Small
--- a/app/assets/images/ft-icons/Small
+++ b/app/assets/images/ft-icons/Small
--- a/app/assets/images/ft-icons/Small
+++ b/app/assets/images/ft-icons/Small
--- a/app/assets/images/ft-icons/Small
+++ b/app/assets/images/ft-icons/Small
--- a/app/assets/images/ft-icons/Small
+++ b/app/assets/images/ft-icons/Small
--- a/app/assets/images/ft-icons/Small
+++ b/app/assets/images/ft-icons/Small
--- a/app/assets/images/ft-icons/Small
+++ b/app/assets/images/ft-icons/Small
--- a/app/assets/images/ft-icons/Small
+++ b/app/assets/images/ft-icons/Small
--- a/app/assets/images/ft-icons/Small
+++ b/app/assets/images/ft-icons/Small
--- a/app/assets/images/ft-icons/Small
+++ b/app/assets/images/ft-icons/Small
--- a/app/assets/images/ft-icons/Small
+++ b/app/assets/images/ft-icons/Small
--- a/app/assets/images/ft-icons/Small
+++ b/app/assets/images/ft-icons/Small
--- a/app/assets/images/ft-icons/Small
+++ b/app/assets/images/ft-icons/Small
--- a/app/assets/images/ft-icons/Small
+++ b/app/assets/images/ft-icons/Small
--- a/app/assets/images/ft-icons/Small
+++ b/app/assets/images/ft-icons/Small
--- a/app/assets/images/ft-icons/Small
+++ b/app/assets/images/ft-icons/Small
--- a/app/assets/images/ft-icons/Small
+++ b/app/assets/images/ft-icons/Small
--- a/app/assets/images/ft-icons/Small
+++ b/app/assets/images/ft-icons/Small
--- a/app/assets/images/ft-icons/Small
+++ b/app/assets/images/ft-icons/Small
--- a/app/assets/images/ft-icons/Small
+++ b/app/assets/images/ft-icons/Small
--- a/app/assets/images/ft-icons/Small
+++ b/app/assets/images/ft-icons/Small
--- a/app/assets/images/ft-icons/Small
+++ b/app/assets/images/ft-icons/Small
--- a/app/assets/images/ft-icons/Small
+++ b/app/assets/images/ft-icons/Small
--- a/app/assets/images/ft-icons/Small
+++ b/app/assets/images/ft-icons/Small
--- a/app/assets/images/ft-icons/Small
+++ b/app/assets/images/ft-icons/Small
--- a/app/assets/images/ft-icons/Small
+++ b/app/assets/images/ft-icons/Small
--- a/app/assets/images/ft-icons/Small
+++ b/app/assets/images/ft-icons/Small
--- a/app/assets/images/ft-icons/Small
+++ b/app/assets/images/ft-icons/Small
--- a/app/assets/images/ft-icons/Small
+++ b/app/assets/images/ft-icons/Small
--- a/app/assets/images/ft-icons/Small
+++ b/app/assets/images/ft-icons/Small
--- a/app/assets/images/ft-icons/Small
+++ b/app/assets/images/ft-icons/Small
--- a/app/assets/images/ft-icons/Small
+++ b/app/assets/images/ft-icons/Small
--- a/app/assets/images/ft-icons/Small
+++ b/app/assets/images/ft-icons/Small
--- a/app/assets/images/ft-icons/Small
+++ b/app/assets/images/ft-icons/Small
--- a/app/assets/images/ft-icons/Small
+++ b/app/assets/images/ft-icons/Small
--- a/app/assets/images/ft-icons/Small
+++ b/app/assets/images/ft-icons/Small
--- a/app/assets/images/ft-icons/Small
+++ b/app/assets/images/ft-icons/Small
--- a/app/assets/images/ft-icons/Small
+++ b/app/assets/images/ft-icons/Small
--- a/app/assets/images/ft-icons/Small
+++ b/app/assets/images/ft-icons/Small
--- a/app/assets/images/ft-icons/Small
+++ b/app/assets/images/ft-icons/Small
--- a/app/assets/images/ft-icons/accdb/accdb-128_32.png
+++ b/app/assets/images/ft-icons/accdb/accdb-128_32.png
--- a/app/assets/images/ft-icons/accdb/accdb-16_32.png
+++ b/app/assets/images/ft-icons/accdb/accdb-16_32.png
--- a/app/assets/images/ft-icons/accdb/accdb-24_32.png
+++ b/app/assets/images/ft-icons/accdb/accdb-24_32.png
--- a/app/assets/images/ft-icons/accdb/accdb-256_32.png
+++ b/app/assets/images/ft-icons/accdb/accdb-256_32.png
--- a/app/assets/images/ft-icons/accdb/accdb-32_32.png
+++ b/app/assets/images/ft-icons/accdb/accdb-32_32.png
--- a/app/assets/images/ft-icons/accdb/accdb-48_32.png
+++ b/app/assets/images/ft-icons/accdb/accdb-48_32.png
--- a/app/assets/images/ft-icons/accdb/accdb-64_32.png
+++ b/app/assets/images/ft-icons/accdb/accdb-64_32.png
--- a/app/assets/images/ft-icons/accdb/accdb-72_32.png
+++ b/app/assets/images/ft-icons/accdb/accdb-72_32.png
--- a/app/assets/images/ft-icons/accdb/accdb-80_32.png
+++ b/app/assets/images/ft-icons/accdb/accdb-80_32.png
--- a/app/assets/images/ft-icons/accdb/accdb-96_32.png
+++ b/app/assets/images/ft-icons/accdb/accdb-96_32.png
--- a/app/assets/images/ft-icons/accdb/accdb-sm-16_32.png
+++ b/app/assets/images/ft-icons/accdb/accdb-sm-16_32.png
--- a/app/assets/images/ft-icons/accdb/accdb-sm-24_32.png
+++ b/app/assets/images/ft-icons/accdb/accdb-sm-24_32.png
--- a/app/assets/images/ft-icons/accdb/accdb-sm-32_32.png
+++ b/app/assets/images/ft-icons/accdb/accdb-sm-32_32.png
--- a/app/assets/images/ft-icons/accdb/accdb-sm.ico
+++ b/app/assets/images/ft-icons/accdb/accdb-sm.ico
--- a/app/assets/images/ft-icons/accdb/accdb.ico
+++ b/app/assets/images/ft-icons/accdb/accdb.ico
--- a/app/assets/images/ft-icons/avi/avi-128_32.png
+++ b/app/assets/images/ft-icons/avi/avi-128_32.png
--- a/app/assets/images/ft-icons/avi/avi-16_32.png
+++ b/app/assets/images/ft-icons/avi/avi-16_32.png
--- a/app/assets/images/ft-icons/avi/avi-24_32.png
+++ b/app/assets/images/ft-icons/avi/avi-24_32.png
--- a/app/assets/images/ft-icons/avi/avi-256_32.png
+++ b/app/assets/images/ft-icons/avi/avi-256_32.png
--- a/app/assets/images/ft-icons/avi/avi-32_32.png
+++ b/app/assets/images/ft-icons/avi/avi-32_32.png
--- a/app/assets/images/ft-icons/avi/avi-48_32.png
+++ b/app/assets/images/ft-icons/avi/avi-48_32.png
--- a/app/assets/images/ft-icons/avi/avi-64_32.png
+++ b/app/assets/images/ft-icons/avi/avi-64_32.png
--- a/app/assets/images/ft-icons/avi/avi-72_32.png
+++ b/app/assets/images/ft-icons/avi/avi-72_32.png
--- a/app/assets/images/ft-icons/avi/avi-80_32.png
+++ b/app/assets/images/ft-icons/avi/avi-80_32.png
--- a/app/assets/images/ft-icons/avi/avi-96_32.png
+++ b/app/assets/images/ft-icons/avi/avi-96_32.png
--- a/app/assets/images/ft-icons/avi/avi-sm-16_32.png
+++ b/app/assets/images/ft-icons/avi/avi-sm-16_32.png
--- a/app/assets/images/ft-icons/avi/avi-sm-24_32.png
+++ b/app/assets/images/ft-icons/avi/avi-sm-24_32.png
--- a/app/assets/images/ft-icons/avi/avi-sm-32_32.png
+++ b/app/assets/images/ft-icons/avi/avi-sm-32_32.png
--- a/app/assets/images/ft-icons/avi/avi-sm.ico
+++ b/app/assets/images/ft-icons/avi/avi-sm.ico
--- a/app/assets/images/ft-icons/avi/avi.icns
+++ b/app/assets/images/ft-icons/avi/avi.icns
--- a/app/assets/images/ft-icons/avi/avi.ico
+++ b/app/assets/images/ft-icons/avi/avi.ico
--- a/app/assets/images/ft-icons/bmp/bmp-128_32.png
+++ b/app/assets/images/ft-icons/bmp/bmp-128_32.png
--- a/app/assets/images/ft-icons/bmp/bmp-16_32.png
+++ b/app/assets/images/ft-icons/bmp/bmp-16_32.png
--- a/app/assets/images/ft-icons/bmp/bmp-24_32.png
+++ b/app/assets/images/ft-icons/bmp/bmp-24_32.png
--- a/app/assets/images/ft-icons/bmp/bmp-256_32.png
+++ b/app/assets/images/ft-icons/bmp/bmp-256_32.png
--- a/app/assets/images/ft-icons/bmp/bmp-32_32.png
+++ b/app/assets/images/ft-icons/bmp/bmp-32_32.png
--- a/app/assets/images/ft-icons/bmp/bmp-48_32.png
+++ b/app/assets/images/ft-icons/bmp/bmp-48_32.png
--- a/app/assets/images/ft-icons/bmp/bmp-64_32.png
+++ b/app/assets/images/ft-icons/bmp/bmp-64_32.png
--- a/app/assets/images/ft-icons/bmp/bmp-72_32.png
+++ b/app/assets/images/ft-icons/bmp/bmp-72_32.png
--- a/app/assets/images/ft-icons/bmp/bmp-80_32.png
+++ b/app/assets/images/ft-icons/bmp/bmp-80_32.png
--- a/app/assets/images/ft-icons/bmp/bmp-96_32.png
+++ b/app/assets/images/ft-icons/bmp/bmp-96_32.png
--- a/app/assets/images/ft-icons/bmp/bmp-sm-16_32.png
+++ b/app/assets/images/ft-icons/bmp/bmp-sm-16_32.png
--- a/app/assets/images/ft-icons/bmp/bmp-sm-24_32.png
+++ b/app/assets/images/ft-icons/bmp/bmp-sm-24_32.png
--- a/app/assets/images/ft-icons/bmp/bmp-sm-32_32.png
+++ b/app/assets/images/ft-icons/bmp/bmp-sm-32_32.png
--- a/app/assets/images/ft-icons/bmp/bmp-sm.ico
+++ b/app/assets/images/ft-icons/bmp/bmp-sm.ico
--- a/app/assets/images/ft-icons/bmp/bmp.icns
+++ b/app/assets/images/ft-icons/bmp/bmp.icns
--- a/app/assets/images/ft-icons/bmp/bmp.ico
+++ b/app/assets/images/ft-icons/bmp/bmp.ico
--- a/app/assets/images/ft-icons/css/css-128_32.png
+++ b/app/assets/images/ft-icons/css/css-128_32.png
--- a/app/assets/images/ft-icons/css/css-16_32.png
+++ b/app/assets/images/ft-icons/css/css-16_32.png
--- a/app/assets/images/ft-icons/css/css-24_32.png
+++ b/app/assets/images/ft-icons/css/css-24_32.png
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Harry Bomrah	592c8c63fe	added fix for member_attributes text_area	2015-07-20 20:48:28 +08:00
Harry Bomrah	2ccabb64f3	fix for some edit rendering	2015-07-20 19:50:34 +08:00
Harry Bomrah	9ec5e21500	fix for fallback if site cant communicate to store and also fixed edit mode	2015-07-20 17:29:29 +08:00
Harry Bomrah	f9dd55eea2	fixed chinese detection for url.	2015-07-17 14:53:50 +08:00
Harry Bomrah	afe1ffd437	page id validations for link and normal page fixed.	2015-07-16 19:42:05 +08:00
Harry Bomrah	898059c6d2	small fixes for various stuff	2015-07-15 14:00:48 +08:00
Harry Bomrah	8b8dd22e88	small bug fix for feeds if feed module is not present.	2015-07-09 14:20:49 +08:00
Harry Bomrah	bead39d5b4	small fix	2015-07-08 20:17:30 +08:00
Harry Bomrah	93d66b5866	fix for meember role disabled fields and also role will delete all the attribute fields	2015-07-08 20:00:59 +08:00
Harry Bomrah	59a198005d	added some stuff for feeds and utility	2015-07-07 19:55:46 +08:00
Harry Bomrah	f7c377d092	allow ip in url for links	2015-07-06 18:36:14 +08:00
Harry Bomrah	1951c581a2	added meta tag mechanism for facebook	2015-07-03 19:52:05 +08:00
Harry Bomrah	b2056a2ad5	some test mods for feeds	2015-07-01 15:13:28 +08:00
Harry Bomrah	251133748d	fixed zh-cn conversion and also back page from page not available page.	2015-06-25 17:38:23 +08:00
Harry Bomrah	5acfed083a	validation for links	2015-06-25 17:02:50 +08:00
Harry Bomrah	afde19052e	added default hash for links	2015-06-25 15:27:29 +08:00
Harry Bomrah	e168b01f9b	added page not available in language page.	2015-06-25 13:31:05 +08:00
rulingcom	dd3b4f0384	sdk update for groups and orbit_bootstrap by joshua	2015-06-24 18:09:59 +08:00
Harry Bomrah	4068d8488a	language switch for orbit bar can be enabled or disabled from backend.	2015-06-24 18:00:09 +08:00
Harry Bomrah	94f1de8de9	changed fields for member roles	2015-06-24 16:54:44 +08:00
Harry Bomrah	3dc625e34f	modified dob for member profile	2015-06-24 01:38:12 +08:00
rulingcom	ed24126648	joshuas update for sdk and grou	2015-06-05 19:05:01 +08:00
Harry Bomrah	cfda81a546	added site bar settings for logo and title in frontend, fixed role status disbale enable and also added br to text area	2015-06-05 18:55:28 +08:00
Harry Bomrah	e594d345cc	added sync and sorting for members	2015-06-05 14:21:34 +08:00
rulingcom	25eb95672a	joshua mods for calendar accessbility	2015-06-03 18:17:58 +08:00
Harry Bomrah	76c2048a29	small fix	2015-06-02 20:13:30 +08:00
Harry Bomrah	b729e32258	now default modules will be automatically authorized after registering of website.	2015-06-02 19:54:23 +08:00
Harry Bomrah	2508d70883	calendar widget and frontend fix	2015-06-02 17:22:05 +08:00
Harry Bomrah	5977370c98	groups member now available	2015-06-01 16:17:45 +08:00
rulingcom	a3033c548b	mods by joshua for groups and calendar and etc sdk	2015-06-01 16:15:07 +08:00
rulingcom	822a6932cd	joshuas update for groups	2015-05-28 21:19:58 +08:00
Harry Bomrah	1f25dbdfec	version added for mongoid	2015-05-28 20:10:26 +08:00
rulingcom	98ec676197	joshua commit for groups and orbit bar again	2015-05-28 14:27:27 +08:00
Harry Bomrah	e8b727af01	group mods for edit post	2015-05-28 14:19:55 +08:00
Harry Bomrah	2fc15eab29	xss issue fixed	2015-05-26 16:02:16 +08:00
Harry Bomrah	d26a5bedb7	added members page to groups	2015-05-26 15:00:24 +08:00
rulingcom	8099a79918	joshua update for groups and orbit bar	2015-05-26 14:13:38 +08:00
Harry Bomrah	c406951876	delete post, edit groups done	2015-05-23 03:48:07 +08:00
Harry Bomrah	a440076916	fix orbit bar css for the software	2015-05-20 21:13:39 +08:00
Harry Bomrah	8dac8273f7	group mods..	2015-05-20 14:17:00 +08:00
rulingcom	017be3eb3d	joshua commit for groups, sdk and orbit_bar	2015-05-18 16:26:22 +08:00
Harry Bomrah	3772e350ba	now can insert word to ckeditor directly and also fixed looping problem for freego software.	2015-05-15 21:33:11 +08:00
Harry Bomrah	451176b068	text with number of counts	2015-05-13 15:36:42 +08:00
Harry Bomrah	694f839217	added edit mode button in frontend	2015-05-12 17:30:45 +08:00
Harry Bomrah	a160c6b020	child page relocation fixed	2015-05-12 15:51:33 +08:00
Harry Bomrah	bd7e29773f	fix small bug for creating member Please enter the commit message for your changes. Lines starting	2015-05-12 14:08:21 +08:00
Harry Bomrah	6ff99124fd	member profile creation fixed	2015-05-11 19:30:03 +08:00
Harry Bomrah	7180b94bd6	fix language sitemap name	2015-05-05 20:03:09 +08:00
Harry Bomrah	7654fc7f23	language in orbit bar fixed	2015-05-05 18:08:57 +08:00
Harry Bomrah	4638b4bca9	downloaded extensions added	2015-04-30 21:08:52 +08:00
Harry Bomrah	f17f847dbd	url validation added.	2015-04-30 20:32:53 +08:00
Ruling-iMac	d386174c97	add function : redirect to homepage	2015-04-30 18:31:40 +08:00
Harry Bomrah	927b08edeb	fix main forms css and a user profile bug	2015-04-30 14:38:36 +08:00
Harry Bomrah	83656d2362	small fix for member show page	2015-04-29 17:34:57 +08:00
Harry Bomrah	5935a91795	changed member to community	2015-04-28 22:47:56 +08:00
Harry Bomrah	ae785defc2	groups version 2.0	2015-04-28 22:24:25 +08:00
rulingcom	804030751f	big commit from joshua for orbit_bootstrap sdk and groups	2015-04-28 18:34:40 +08:00
Harry Bomrah	70bbe6ac5a	fix for table layout for members	2015-04-28 18:23:59 +08:00
Harry Bomrah	b5d2d7736c	authorization fix for create and update of plugins	2015-04-28 17:54:49 +08:00
Harry Bomrah	a20d446283	cant select empty value in page parts	2015-04-28 15:48:15 +08:00
Harry Bomrah	083b6ace78	removed mobile settings and also removed bundle update from server	2015-04-27 21:39:46 +08:00
Harry Bomrah	057f689526	page id cannot be chinese and also some module update fixes	2015-04-27 20:45:05 +08:00
Harry Bomrah	0380972e5b	small fix for member fields display	2015-04-23 17:19:10 +08:00
Harry Bomrah	c39ca8c360	sorting for role status fixed	2015-04-22 23:05:17 +08:00
Harry Bomrah	37c28fd03e	adding routes file	2015-04-22 22:58:10 +08:00
Harry Bomrah	997a3afd93	now can add or delete fields for the member	2015-04-22 22:51:30 +08:00
Harry Bomrah	cf7e15d4bb	user friendly for editing members	2015-04-22 18:28:14 +08:00
Harry Bomrah	db88b1e553	fixed bug in members frontend and also roles and role statuses sorted on key ascending	2015-04-22 16:30:58 +08:00
Harry Bomrah	573030b119	removed update all button	2015-04-21 17:40:48 +08:00
Harry Bomrah	b1be711fd5	module update stuff added to kernel	2015-04-21 17:19:00 +08:00
Harry Bomrah	25c612ac9e	modified debugging for frontend	2015-04-17 15:54:32 +08:00
Harry Bomrah	54eb8ee766	debug added for modules and widgets frontend	2015-04-15 13:39:46 +08:00
Harry Bomrah	a481be0694	rails menu cache removed	2015-04-14 16:57:44 +08:00
Harry Bomrah	ec4f54fcc4	mongoid fix	2015-04-14 16:18:44 +08:00
rulingcom	5aac9b297d	merged	2015-04-14 15:31:41 +08:00
Harry Bomrah	1cfd6b80f9	lot of changes for groups	2015-04-14 15:18:58 +08:00
Harry Bomrah	7e46bde3bc	fix error for page submit	2015-04-10 18:38:25 +08:00
Harry Bomrah	1fadefa510	fix for cache clear on page part submit	2015-04-10 16:33:47 +08:00
Harry Bomrah	15fec35e3f	groups multifile added and show page working.	2015-04-01 01:02:01 +08:00
rulingcom	60bb2cac1e	group mods by joshua	2015-03-31 15:51:44 +08:00
Harry Bomrah	be61b4488e	temp ignore cache	2015-03-30 18:12:23 +08:00
Harry Bomrah	73147223f8	added downloaded_extension file	2015-03-30 16:48:02 +08:00
Harry Bomrah	35eaf325f2	downloaded extension lock removed	2015-03-30 15:35:38 +08:00
Harry Bomrah	90eba5141e	removed lock file	2015-03-30 15:19:01 +08:00
Harry Bomrah	6d06790159	added expire time to cache.	2015-03-30 15:13:45 +08:00
Harry Bomrah	27222ab6cd	small fix for cache	2015-03-30 15:13:37 +08:00
Harry Bomrah	8b2281ca17	now the caching initialized with engine Conflicts: Gemfile	2015-03-30 15:12:41 +08:00
manson	3262359911	update impression and add cache for page sub-parts, main-menu	2015-03-30 15:11:26 +08:00
Harry Bomrah	4b770b7fd1	group create fix	2015-03-25 15:50:58 +08:00
Harry Bomrah	b290d3653f	groups commit	2015-03-25 15:46:11 +08:00
rulingcom	e1c8d61195	sdk precompile fixed	2015-03-23 17:39:58 +08:00
rulingcom	f9ed19def0	Merge branch 'development' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into development	2015-03-23 13:25:13 +08:00
Harry Bomrah	f52919e4b6	group added	2015-03-19 14:24:40 +08:00
Harry Bomrah	2432a587d5	css mods for archive	2015-03-18 17:59:36 +08:00
Harry Bomrah	fb8c8d4526	fixed omniauth	2015-03-18 15:41:24 +08:00
rulingcom	20350c4e14	Merge branch 'development' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into development	2015-03-13 17:13:35 +08:00
Harry Bomrah	52c78856be	added insert new widgets to kernel	2015-03-13 16:39:09 +08:00
rulingcom	338824a509	addes bootstrap back	2015-03-12 19:06:42 +08:00
Harry Bomrah	c4be6c5f63	visibility of group fixed	2015-03-12 19:05:49 +08:00
Harry Bomrah	f71b5d6bbb	groups started	2015-03-12 19:02:48 +08:00
rulingcom	16dae228b1	sdk updates from joshua	2015-03-11 16:18:56 +08:00
Harry Bomrah	9be667d405	removed desktop	2015-03-06 18:03:43 +08:00
rulingcom	e045025bc6	precompile fixes for orbit mobile template	2015-03-06 17:59:30 +08:00
rulingcom	7aa187497a	sdk changes by joshua wq	2015-03-06 17:21:38 +08:00
Harry Bomrah	dfd7865bd5	new error and success pages for google auth and also spinner fixed for update manager	2015-03-06 17:13:09 +08:00
Harry Bomrah	e881d02bee	fix	2015-03-04 20:43:01 +08:00
Harry Bomrah	b53a7508f5	again small fix for js Conflicts: app/views/admin/members/show.html.erb	2015-03-04 20:37:44 +08:00
Harry Bomrah	8e7319b3c3	fixed js	2015-03-04 20:31:33 +08:00
Harry Bomrah	2942ab8563	small fix in js for google connect	2015-03-04 20:17:39 +08:00
Harry Bomrah	ed3308abbb	google oauth added and also preferences	2015-03-04 18:31:36 +08:00
Harry Bomrah	5773d49218	small fix for datepicker	2015-02-26 14:53:55 +05:30
Harry Bomrah	3e1032f801	fixed date and time for announcement and news	2015-02-26 14:53:55 +05:30
Ray	eb21f6535c	store css	2015-02-26 15:11:38 +08:00
Ray	5f90be20a2	update Templates storn & Module storn UI	2015-02-26 15:09:42 +08:00
Ray	d64dc336a5	use CDN change jquery, Bootstrap and font-awesome url to CDN	2015-02-26 15:06:45 +08:00
Ray	aef48fe890	Merge branch 'development' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into development	2015-02-26 15:01:31 +08:00
Ray	f3e9679e54	增加右上角的新增按鈕使用方式是當 render filter 在最後放個 true 範例：<%= render_filter @filter_fields, "index_table", true %>	2015-02-26 15:01:06 +08:00
JiangRu	17213fb41f	if no data , hide title&table	2015-02-25 11:06:58 +08:00
Harry Bomrah	8c0d94c00a	Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into development	2015-02-09 15:13:52 +05:30
Harry Bomrah	9862722252	url fixed for license	2015-02-09 15:09:16 +05:30
manson	1aa5739380	add all JS and CSS to precompile	2015-02-06 18:05:05 +08:00
manson	0c62c4b994	fix development mode not using precompiled aseets	2015-02-06 17:36:37 +08:00
Harry Bomrah	e1247e6083	Merge branch 'development' of gitlab.tp.rulingcom.com:saurabh/orbit4-5	2015-01-20 14:24:17 +05:30
spen	e616c4b947	fix member pic name	2015-01-20 15:27:43 +08:00
Harry Bomrah	1b4e975548	Merge branch 'development' of gitlab.tp.rulingcom.com:saurabh/orbit4-5	2015-01-12 12:25:20 +05:30
Harry Bomrah	35e203c476	fix	2015-01-12 12:24:28 +05:30
Harry Bomrah	4fd0e2d315	Merge branch 'development' of gitlab.tp.rulingcom.com:saurabh/orbit4-5	2015-01-12 12:20:52 +05:30
Harry Bomrah	3532ec67a9	some error fixed for checking permissions	2015-01-12 12:19:52 +05:30
Harry Bomrah	9be7e13774	Merge branch 'development' of gitlab.tp.rulingcom.com:saurabh/orbit4-5	2015-01-12 11:54:52 +05:30
Harry Bomrah	328277394d	fix for rake...	2015-01-12 11:53:29 +05:30