Commit Graph

836 Commits

Author SHA1 Message Date
Harry Bomrah 16b695200a gallery_album to album 2013-11-19 09:31:49 +08:00
Harry Bomrah 369bbe4d72 category click, event click and more button fix 2013-11-18 17:15:36 +08:00
Harry Bomrah 4888195566 more button works according to categories 2013-11-15 22:35:20 +08:00
saurabhbhatia a38cf6304e Fix for More link 2013-11-15 17:32:00 +08:00
Spen 20e2f07b26 add Member frontend page selection options and fix backend role filter page 2013-11-15 17:08:45 +08:00
saurabhbhatia ce8e9c0a5f Revert "more button fix and also new way to select more page."
This reverts commit e129b25554.
2013-11-15 16:58:27 +08:00
saurabhbhatia dc5ef21516 Revert "add Member frontend page selection options and fix backend role filter page"
This reverts commit ea3f9c8163.
2013-11-15 16:58:11 +08:00
Spen ea3f9c8163 add Member frontend page selection options and fix backend role filter page 2013-11-15 16:16:39 +08:00
Harry Bomrah e129b25554 more button fix and also new way to select more page. 2013-11-15 15:13:58 +08:00
saurabhbhatia 635f82db2f Updated Approvable to work for submanager role also 2013-11-13 10:35:03 +08:00
saurabhbhatia c575dbd33a Fixed Desktop Openness 2013-11-11 17:40:51 +08:00
Harry Bomrah ed569601c3 two major fix for site setting and bulletin controller 2013-11-08 16:38:17 +08:00
Harry Bomrah c51dd81d2b fixed page setting select all bug 2013-11-07 19:27:04 +08:00
Harry Bomrah d17953ab86 partial is rendered when editing a page part 2013-11-07 17:23:15 +08:00
Harry Bomrah 49217d4705 fixed all button for page settings and also filter display after page refresh 2013-11-06 22:36:59 +08:00
saurabhbhatia 591a3e0bc4 Updated redirect path after saving a page 2013-11-06 17:20:40 +08:00
saurabhbhatia 9760100b69 Removed the logger 2013-11-06 16:38:55 +08:00
saurabhbhatia ef67941ba5 Fix for widgets edit form 2013-11-06 15:11:09 +08:00
Harry Bomrah 3c4f22234b fixed template updation from site preferences 2013-11-05 20:50:05 +08:00
Harry Bomrah bae1c0da7d now only approved announcement can be viewed when backend is open 2013-11-05 20:50:02 +08:00
rulingcom b1867dd47a new code logic for saving tree.. should work fine even if the node positions fail 2013-11-04 22:20:50 +08:00
saurabhbhatia 1f3f9831ad Fixed Openness Issue 2013-11-04 15:44:51 +08:00
saurabhbhatia d636248073 Updated Sidebar, Application Controllers 2013-11-01 16:42:39 +08:00
chris c541e84254 Remove include of ParserBackEnd 2013-10-31 16:17:51 +08:00
chris 00010867a4 Fix link in structure 2013-10-30 18:53:23 +08:00
Manson Wang a885313e75 Dashboard with HighChart 2013-10-30 18:23:46 +08:00
saurabhbhatia 3aac221c4e removed site restart after site preferences update 2013-10-30 14:18:03 +08:00
chris 36ddbf68e0 Fix menu_enabled_for 2013-10-29 14:39:23 +08:00
chris 6bc00ce3a3 Use module_app label instead of title 2013-10-29 11:17:02 +08:00
chris a14d69211b PagePart widgets for "system widget"
Delete useless code
2013-10-28 16:29:23 +08:00
chris 218cb03641 PagePart widgets except "system widget" 2013-10-28 16:29:23 +08:00
chris 42d0afe65c Page form with front end style 2013-10-28 16:29:23 +08:00
Spen 254f926093 fix new ui announcement preview 2013-10-24 15:03:20 +08:00
chris 8ebfac2b99 Structure link with json 2013-10-23 18:39:40 +08:00
chris a4d1c68299 Structure page with json 2013-10-23 18:39:35 +08:00
chris 94c1d7d5a0 Fix homepage in structure, ajaxStop for structure edit, setForm in pageslide.js 2013-10-23 18:39:21 +08:00
saurabhbhatia e42cf8720e Updated Site Preferences with language fix 2013-10-21 16:53:11 +08:00
Spen c76adc1896 new ui member account privilege fix 2013-10-21 10:42:50 +08:00
chris f9f2232259 Add setForm and resetForm to pageslide.js
Category, AdBanner and Tag are using js to load the values in the form
2013-10-21 06:34:55 +08:00
chris 2530dace02 Change the parser_front_end to be used in the structure for page edit, new_ui:save_pages must be run 2013-10-20 18:44:04 +08:00
chris fea86ba3a9 Page slide does not reload from server for ad_banner 2013-10-19 19:17:24 +08:00
chris 92d2af13f2 changes for ad_banner 2013-10-19 19:17:04 +08:00
chris 68a379f8a4 Some fixes for tags: authorization, translation…
can_use now takes all the open_for into account
2013-10-19 19:14:31 +08:00
chris f694134150 Remove useless code
Add data-title
2013-10-19 19:14:07 +08:00
Spen 00e9a5df5b new ui member settings account data
Conflicts:
	app/controllers/admin/users_new_interface_controller.rb
	app/views/admin/users_new_interface/show.html.erb
	config/locales/en.yml
	config/routes.rb
2013-10-18 22:28:27 +08:00
Spen 14d2b0cc76 fix new ui member account privilege 2013-10-18 19:52:36 +08:00
saurabhbhatia 3e491380cd Revert "new ui member settings account data"
This reverts commit e1f4ee464b.
2013-10-18 19:51:02 +08:00
Spen e1f4ee464b new ui member settings account data 2013-10-18 19:12:27 +08:00
saurabhbhatia 14fea3638f Updated with some locale fixes in site preferences 2013-10-18 15:26:41 +08:00
saurabhbhatia 155039ac16 Updated fixes for site info - desktop openess, title always displayed 2013-10-16 18:33:57 +08:00
Harry Bomrah fbea249782 jquery update and also fixed app manager bug .. jquery updated to 1.10.2 and jquery ui updated to 1.10.0 .. gem jquery-rails vs 2.1.4 changed to 3.0.4 and jquery-ui-rails changed to 4.0.5 2013-10-16 09:37:33 +08:00
chris 279ac774d4 Migrate form old ui to new ui (categories, tags and authorizations) 2013-10-15 23:38:44 +08:00
Manson Wang 76ba7087b2 Fix Ad_Banner frontend for IE8
Fix backend bug in editing banner
Translation Added
2013-10-15 19:37:12 +08:00
saurabhbhatia 96c3be68f7 Fixed Enable and Disable, Sitemap and Terms of Use for header and footer 2013-10-15 10:37:49 +08:00
saurabhbhatia 4120be6f8e fixes in sitemap, site preference 2013-10-14 16:48:50 +08:00
saurabhbhatia 55fa1cef4f Added Enable and disable terms of use, sitemap 2013-10-11 13:14:37 +00:00
chris 08a8d668ec Display de page contexts in the mobile version as set in structure 2013-10-08 18:11:29 +08:00
chris cce68beff1 Quick fix for front end reloading 2013-10-08 14:52:24 +08:00
chris 5328a26440 Fix structure position 2013-10-08 12:33:24 +08:00
chris fe1869199e Fix typo, it wasn't executing the filtering on tags 2013-10-07 19:01:59 +08:00
saurabhbhatia b3e16ce23b Updated desktop widgets controller 2013-10-07 18:13:55 +08:00
saurabhbhatia fad191aefe Updated Desktop Inheritence class 2013-10-07 17:47:13 +08:00
chris 21db2a2cba Drag and drop to reorder users 2013-10-07 15:53:54 +08:00
Manson Wang 831bd722b8 Fix site preference openness problem 2013-10-07 14:37:52 +08:00
Manson Wang 792785f7ba Fix relation for Ad_banner and Ad_image
Update site.rake for New UI
2013-10-04 19:20:04 +08:00
chris 43cf6b70b7 Fix structure reorder position 2013-10-04 15:07:24 +08:00
chris dfec6f7642 Fix for user order 2013-09-27 12:46:19 +08:00
Spen 9186978551 new ui member plugin sort fix and user show avatar fix 2013-09-27 11:04:52 +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
Harry Bomrah 1d0ea6718f brief added to desktop for all plugins 2013-09-25 18:23:44 +08:00
Harry Bomrah 58fb2d1c73 external links and link widget fixed for development 2013-09-24 15:37:40 +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
Harry Bomrah 9e10a3c944 editing for the assets are done with replacable files and description 2013-09-11 14:03:13 +08:00
Harry Bomrah f920a4f6ba filemanager and some update for file uploader . added file uploader to kernel 2013-09-11 14:03:06 +08:00
saurabhbhatia fa857cfeea Default Locale 2013-09-06 18:00:36 +08:00
saurabhbhatia 6e032a8757 Add Preference and search engine 2013-09-06 18:00:23 +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
Spen 3123c5de0a new ui member bug and interface fix 2013-09-02 11:22:17 +08:00
saurabhbhatia b970ea1e0e Updated Authorization for member, link, tag, archive 2013-08-27 10:14:39 +08:00
chris 45e987d6f5 Fix for authorization
Dashboard and page authorisation
2013-08-23 12:08:33 +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 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 c474fa063f New authorization 2013-08-21 13:42:29 +08:00
Spen 6c514770bc solved conflict for member_new_ui 2013-08-12 15:40:34 +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 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
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
saurabhbhatia e12b14311e Updated Desktop with new UI 2013-07-30 16:43:41 +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 38194311ab some changes again 2013-07-30 16:43:18 +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
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
Harry Bomrah 2d616ab7a8 solved desktop conflict during cherry pick 2013-07-30 16:42:26 +08:00
Harry Bomrah dc94283af9 duplicate error fixed and css inside widgets fixed, duplicate location fixed 2013-07-30 16:41:38 +08:00