Commit Graph

1137 Commits

Author SHA1 Message Date
saurabhbhatia b487740035 Fixed Pagination Errors in member module 2013-09-18 16:11:17 +08:00
Harry Bomrah 1e3cffee0a add page completed with attributes and reordering 2013-09-17 15:34:34 +08:00
Harry Bomrah e4a16eab3a commit for survey questions 2013-09-17 15:34:23 +08:00
Harry Bomrah e45b7e09a0 half survey module form changed to new ui plus one calendar fix 2013-09-16 12:25:58 +08:00
Harry Bomrah bd3462df7f small change left in last commit. commiting for gallery widget 2013-09-16 11:19:24 +08:00
Harry Bomrah f5f1822f0a no data file added 2013-09-16 11:19:18 +08:00
Harry Bomrah d532ded8e4 widget code for gallery rewritten for new_ui 2013-09-16 11:19:11 +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
Harry Bomrah 3595c59810 some unmerged code i pushd 3 months back not update by chris 2013-09-13 15:58:42 +08:00
chris 911cfdc980 Move js into a file for status in form 2013-09-11 18:38:56 +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 7216676c40 Updated Sidebar and Preferences 2013-09-09 10:18:14 +08:00
Harry Bomrah 335991e152 by mistake pushed code with debugger 2013-09-05 12:51:15 +08:00
Harry Bomrah 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
Harry Bomrah 4209356e9d new features in gallery image view.. and also tags for gallery completed. 2013-09-02 11:23:01 +08:00
Harry Bomrah 82b6be483a isotope embedded inside desktop kernel 2013-08-30 10:58:08 +08:00
Harry Bomrah 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
Harry Bomrah 399dfad392 faq authorization completed. 2013-08-22 18:00:05 +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
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
Harry Bomrah 897ed49d2e new ui for faq and announcement status fixed. 2013-08-20 18:22:11 +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
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
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 d0ef862f85 language changes and conferences add/edit bug fixed 2013-08-12 12:28:46 +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 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 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