Commit Graph

1164 Commits

Author SHA1 Message Date
saurabhbhatia e22cbbd029 Added Automatic Synchronize 2013-11-21 16:08:42 +08:00
Manson Wang 7519533107 Fix Gallery frontend controller crash when albun.tag_ids is empty 2013-11-15 09:53:24 +08:00
Manson Wang 827a5e52e7 Fix gallery front end when display all categories 2013-11-14 10:34:18 +08:00
Harry Bomrah 9ea8b536b5 changed the frontend loading to more rails specific. and also fixed the filter reload in thumbnali and summary view of members
Conflicts:
	vendor/built_in_modules/gallery/app/assets/javascripts/galleryAPI_frontend.js.erb
	vendor/built_in_modules/gallery/app/controllers/panel/gallery/front_end/albums_controller.rb
	vendor/built_in_modules/gallery/app/views/panel/gallery/front_end/albums/index.html.erb
	vendor/built_in_modules/gallery/app/views/panel/gallery/front_end/albums/show.html.erb
2013-11-14 10:20:02 +08:00
Manson Wang 3f2c729528 Fix Peg_content,Annoucement authorization bug 2013-11-13 17:05:45 +08:00
Harry Bomrah 4e02c688b5 gallery all bugs fixed.. 2013-11-13 17:03:46 +08:00
Spen 20a9f60c09 fix new ui announcement init data count 2013-10-29 15:05:13 +08:00
Spen 12a5c5617e Fix new ui [app_name]_category_with_title and change announcement & faq init 2013-10-25 21:29:26 +08:00
saurabhbhatia 4b56866d23 Updated file name in writing conferences front end 2013-09-27 15:09:18 +08:00
saurabhbhatia 8ec129f559 Updated order for zh_tw translation 2013-09-27 14:36:06 +08:00
Harry Bomrah fd77230247 email hide show facility available 2013-09-27 12:34:43 +08:00
saurabhbhatia 250a03f074 Fixed order of Teacher Show page 2013-09-27 12:02:28 +08:00
saurabhbhatia 471987f800 Merge branch 'development' of https://github.com/Rulingcom/orbit into 0917_ntu_mb
Conflicts:
	vendor/built_in_modules/member/app/views/panel/member/front_end/member_lists/show.html.erb
2013-09-27 11:10:07 +08:00
Spen 9186978551 new ui member plugin sort fix and user show avatar fix 2013-09-27 11:04:52 +08:00
Harry Bomrah 9a03e7a6b2 added sync for journal paper books and conference.. and also disabled the icons 2013-09-26 22:29:21 +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
Harry Bomrah 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
saurabhbhatia 1159375de7 Updated Import to Sync Data for all personal plugins 2013-09-26 18:51:31 +08:00
saurabhbhatia 843775a2c0 Fixed the order in Personal Plugin member show page 2013-09-26 16:39:45 +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
Harry Bomrah 5332162646 small add question fix for survey module. 2013-09-26 09:31:52 +08:00
Harry Bomrah 1d0ea6718f brief added to desktop for all plugins 2013-09-25 18:23:44 +08:00
Harry Bomrah 04ff345b94 survey edit completed 2013-09-25 17:29:38 +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
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