developers
/
Orbit
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

merge into: developers:master
Branches Tags
developers:master
developers:1017_ntu_ga_rss
developers:development
developers:cron
developers:location_widget_category_fix_harry
developers:fgu
developers:1121_new_ui_member_plugins_fix
developers:nkut
developers:1017_ntu_ga_primary
developers:1017_ntu_ga
developers:nkut_footer
developers:some_cool_fixes_harry
developers:ntu_ga_1118_archive_frontend_fix
developers:new_more_button_harry
developers:ntu_cph_1115
developers:1115_new_ui_member_role_js
developers:1115_new_ui_member_frontend_fix
developers:more_button_harry
developers:0917_ntu_mb
developers:0913_ntue
developers:tmu_io
developers:location_frontend_harry
developers:ntu_mb_sso_server
developers:geocoding_harry
developers:location_category_color_added_harry
developers:banner_fix_harry
developers:somthing_fixed_harry
developers:1108_new_ui_faq_fix
developers:announcement_display_fix_harry
developers:gallery_theater_url_fix_harry
developers:page_part_edit_form_load_fix_harry
developers:out_of_names_harry
developers:ntu_ga_1107_fix
developers:no_idea_harry
developers:page_all_category_fix_harry
developers:gallery_full_fix_harry
developers:backend_announcement_fix_harry
developers:1105_ntu_mb_member_fix
developers:link_publish_fix_harry
developers:ntue_1105_fix
developers:gallery_frontend_fix_harry
developers:1105_new_ui_archive_and_link_fix
developers:site_structure_fix_harry
developers:calendar_color_category_harry
developers:development_dashboard_manson
developers:1101_ntu_ga_survey_export_fix
developers:0913_ntu_ga_import
developers:1029_new_ui_announcement_init_data_count_fix
developers:1024_new_ui_announcement_preview_fix
developers:1022_new_ui_bulletin_and_faq_init_fix
developers:1021_new_ui_survey_module_authorization_fix
developers:1021_new_ui_member_account_privilege_fix
developers:1018_new_ui_member_account_previlage_fix
developers:1018_ntu_ga_survey_init_fix
developers:1018_new_ui_member_settings_account
developers:ntu_cph_update
developers:1016_ntue_fix
developers:1016_new_ui_ask_module_fix
developers:jquery_update_development_harry
developers:1015_new_ui_ask_fix
developers:0913_ntu_ga_primary
developers:1015_ntu_ga_primary_survey_b_fix
developers:0913_ntu_ga
developers:0913_ydu
developers:ntu_cph
developers:0913_ntu_ga_co
developers:1007_announcement_sorting_fix
developers:ntue_1004_fix
developers:0913_nhu
developers:fu
developers:isotope_fix_for_plugins_harry
developers:0917_ntu_mb_email_display_harry
developers:0917_ntu_mb_sync_harry
developers:ntu_mb_sso
developers:mtu_ga_
developers:0913_ntu_sa_en
developers:0913_ntu_sa_regular
developers:0913_ntu_sa
developers:0913_ntu_common
developers:desktop_harry_2
developers:ntu_mb_data_backup
developers:desktop_devin
developers:ray_new_ui
developers:lukas/picked_announcement
developers:thu
developers:babel
developers:more_link_fix
developers:orbit_beta
developers:to_master_needs_changes_for_new_ui_4
developers:pick-me-to-product---
developers:to_master_needs_changes_for_new_ui_3
developers:to_master_needs_changes_for_new_ui_2
developers:to_master
developers:to_master_needs_changes_for_new_ui_1
developers:to_master_needs_changes_for_new_ui
developers:master_needs_this_2
developers:master_needs_this_1
developers:default_widget_fix_1
developers:pick-me-to-product--
developers:pick-me-to-product-
developers:pick-me-to-product
developers:last_tested
developers:currently_testing
developers:current_test
developers:daily-0425
developers:latest_desktop
developers:daily-0402
...
pull from: developers:0917_ntu_mb_sync_harry
Branches Tags
developers:1017_ntu_ga_rss
developers:development
developers:cron
developers:location_widget_category_fix_harry
developers:fgu
developers:1121_new_ui_member_plugins_fix
developers:nkut
developers:1017_ntu_ga_primary
developers:1017_ntu_ga
developers:nkut_footer
developers:some_cool_fixes_harry
developers:ntu_ga_1118_archive_frontend_fix
developers:new_more_button_harry
developers:ntu_cph_1115
developers:1115_new_ui_member_role_js
developers:1115_new_ui_member_frontend_fix
developers:more_button_harry
developers:0917_ntu_mb
developers:0913_ntue
developers:tmu_io
developers:location_frontend_harry
developers:ntu_mb_sso_server
developers:geocoding_harry
developers:location_category_color_added_harry
developers:banner_fix_harry
developers:somthing_fixed_harry
developers:1108_new_ui_faq_fix
developers:announcement_display_fix_harry
developers:gallery_theater_url_fix_harry
developers:page_part_edit_form_load_fix_harry
developers:out_of_names_harry
developers:ntu_ga_1107_fix
developers:no_idea_harry
developers:page_all_category_fix_harry
developers:gallery_full_fix_harry
developers:backend_announcement_fix_harry
developers:1105_ntu_mb_member_fix
developers:link_publish_fix_harry
developers:ntue_1105_fix
developers:gallery_frontend_fix_harry
developers:1105_new_ui_archive_and_link_fix
developers:site_structure_fix_harry
developers:calendar_color_category_harry
developers:development_dashboard_manson
developers:1101_ntu_ga_survey_export_fix
developers:0913_ntu_ga_import
developers:1029_new_ui_announcement_init_data_count_fix
developers:1024_new_ui_announcement_preview_fix
developers:1022_new_ui_bulletin_and_faq_init_fix
developers:1021_new_ui_survey_module_authorization_fix
developers:1021_new_ui_member_account_privilege_fix
developers:1018_new_ui_member_account_previlage_fix
developers:1018_ntu_ga_survey_init_fix
developers:1018_new_ui_member_settings_account
developers:ntu_cph_update
developers:1016_ntue_fix
developers:1016_new_ui_ask_module_fix
developers:jquery_update_development_harry
developers:1015_new_ui_ask_fix
developers:0913_ntu_ga_primary
developers:1015_ntu_ga_primary_survey_b_fix
developers:0913_ntu_ga
developers:0913_ydu
developers:ntu_cph
developers:master
developers:0913_ntu_ga_co
developers:1007_announcement_sorting_fix
developers:ntue_1004_fix
developers:0913_nhu
developers:fu
developers:isotope_fix_for_plugins_harry
developers:0917_ntu_mb_email_display_harry
developers:0917_ntu_mb_sync_harry
developers:ntu_mb_sso
developers:mtu_ga_
developers:0913_ntu_sa_en
developers:0913_ntu_sa_regular
developers:0913_ntu_sa
developers:0913_ntu_common
developers:desktop_harry_2
developers:ntu_mb_data_backup
developers:desktop_devin
developers:ray_new_ui
developers:lukas/picked_announcement
developers:thu
developers:babel
developers:more_link_fix
developers:orbit_beta
developers:to_master_needs_changes_for_new_ui_4
developers:pick-me-to-product---
developers:to_master_needs_changes_for_new_ui_3
developers:to_master_needs_changes_for_new_ui_2
developers:to_master
developers:to_master_needs_changes_for_new_ui_1
developers:to_master_needs_changes_for_new_ui
developers:master_needs_this_2
developers:master_needs_this_1
developers:default_widget_fix_1
developers:pick-me-to-product--
developers:pick-me-to-product-
developers:pick-me-to-product
developers:last_tested
developers:currently_testing
developers:current_test
developers:daily-0425
developers:latest_desktop
developers:daily-0402

254 Commits
master ... 0917_ntu_m

Author SHA1 Message Date
Harry Bomrah 638ed73d21 added sync for journal paper books and conference.. and also disabled the icons 2013-09-26 22:26:19 +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
chris 622534e5db Fix user order: 
- gender color
 - add cancel button for input
 2013-09-26 20:18:34 +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
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
Spen 09e0d5bd92 sso for ntu mb all sites 2013-09-26 18:52:32 +08:00
saurabhbhatia 1159375de7 Updated Import to Sync Data for all personal plugins 2013-09-26 18:51:31 +08:00
Manson Wang dc3593c162 zh-tw for new ui 2013-09-26 17:13:17 +08:00
saurabhbhatia 843775a2c0 Fixed the order in Personal Plugin member show page 2013-09-26 16:39:45 +08:00
Manson Wang 16c26e3273 Fix path of jquery.cycle.all.latest.js 2013-09-26 16:11:08 +08:00
saurabhbhatia 1021ac2e9b Merge branch '0917_ntu_mb' of https://github.com/Rulingcom/orbit into 0917_ntu_mb 2013-09-26 14:46:14 +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
saurabhbhatia 7990d4388c Import Announcements, Journal Paper, Conference Data, book data 
Conflicts:
	app/models/user/user.rb

Updated import data controller to check for blank user_id

Updated import data controller to check the absense of title data

Updated route to get announcement data

Conflicts:
	config/routes.rb

Updated import data controller

Updated import data controller to import data correctly

Added method for importing page data

Updated import data with pages working

Updated Import data with page data importing successfully

Updated import controller

Updated import data to get complete teacher and announcement data
 2013-09-26 14:45:42 +08:00
saurabhbhatia 367cf67928 Get data from database 
Conflicts:
	app/controllers/admin/import_data_controller.rb

Conflicts:
	app/controllers/admin/import_data_controller.rb
	app/views/admin/import_data/get_teacher_data.html.erb
 2013-09-26 14:45:42 +08:00
Harry Bomrah e7c04c6e6e small add question fix for survey module. 2013-09-26 09:33:25 +08:00
Harry Bomrah 6ac600fb5c brief added to desktop for all plugins 2013-09-26 09:33:18 +08:00
Harry Bomrah 42dcf0a2d2 survey edit completed 2013-09-26 09:33:10 +08:00
Harry Bomrah c35d42d671 external links and link widget fixed for development 2013-09-26 09:33:01 +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
saurabhbhatia 6fc47d7afd Updated show to remove test code 2013-09-25 17:33:05 +08:00
Harry Bomrah 04ff345b94 survey edit completed 2013-09-25 17:29:38 +08:00
saurabhbhatia 79c4cd2075 Fixed Personal Plugins tabs for en locale 2013-09-25 17:07:15 +08:00
saurabhbhatia 2a41e3440e Fixed Import data to import journal level types, fixed writing journal 2013-09-25 12:58:37 +08:00
saurabhbhatia e29b08d0dc Journal title being imported correctly now 2013-09-24 17:13:00 +08:00
Harry Bomrah 58fb2d1c73 external links and link widget fixed for development 2013-09-24 15:37:40 +08:00
saurabhbhatia d5bb2a1889 Updated Books,Conference, Journal to display properly in the frontend 2013-09-24 15:07:49 +08:00
saurabhbhatia b535f2cf9c Updated Data import and sync code 2013-09-23 16:18:07 +08:00
saurabhbhatia f2a27c6b40 Updated Import method in teachers to make all false positives. 2013-09-23 09:52:33 +08:00
Spen 9613a52305 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:56:36 +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
saurabhbhatia dc8815d619 Fixed Pagination Errors in member module 2013-09-18 16:10:39 +08:00
Harry Bomrah b5b416d531 add page completed with attributes and reordering 2013-09-18 12:27:01 +08:00
Harry Bomrah f27f96b994 commit for survey questions 2013-09-18 12:26:52 +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
saurabhbhatia cd1d4356fb Updated import data to get complete teacher and announcement data 2013-09-17 11:36:50 +08:00
saurabhbhatia d5357ea63c Updated import controller 2013-09-17 11:36:45 +08:00
saurabhbhatia 50bb2a870c Updated Import data with page data importing successfully 2013-09-17 11:36:41 +08:00
saurabhbhatia a93945cd45 Updated import data with pages working 2013-09-17 11:36:38 +08:00
saurabhbhatia 249644e72c Added method for importing page data 2013-09-17 11:36:35 +08:00
saurabhbhatia f16d1908be Updated import data controller to import data correctly 2013-09-17 11:36:31 +08:00
saurabhbhatia c8be884291 Updated import data controller 2013-09-17 11:36:29 +08:00
saurabhbhatia 6280fdfba0 Updated route to get announcement data 
Conflicts:
	config/routes.rb
 2013-09-17 11:36:26 +08:00
saurabhbhatia 2a9948868f Updated import data controller to check the absense of title data 2013-09-17 11:36:24 +08:00
saurabhbhatia e4514a353a Updated import data controller to check for blank user_id 2013-09-17 11:36:07 +08:00
saurabhbhatia d2a07d9ffb Import Announcements, Journal Paper, Conference Data, book data 
Conflicts:
	app/models/user/user.rb
 2013-09-17 11:36:05 +08:00
saurabhbhatia 93909eeca0 Get data from database 
Conflicts:
	app/controllers/admin/import_data_controller.rb

Conflicts:
	app/controllers/admin/import_data_controller.rb
	app/views/admin/import_data/get_teacher_data.html.erb
 2013-09-17 11:36:02 +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 8456a91968 Fix structure edit 2013-09-14 17:26:16 +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
chris c1cbfddf4b Fix for user and role relationship (from role and sub-role side) 2013-09-13 17:39:01 +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
Harry Bomrah 789e02e313 ad_banner banner load fixed for test site 2013-09-13 14:23:44 +08:00
Manson Wang bb8bc9a529 Added missing translation for gallery 2013-09-12 10:10:37 +08:00
Manson 6430e60577 Added the missing translations in config/locales/en.yml and zh_tw.yml 
Conflicts:
	config/locales/en.yml
	config/locales/zh_tw.yml
 2013-09-12 09:30:07 +08:00
chris 17d7912e07 Ray's js code for status in form 2013-09-11 19:24:58 +08:00
chris 911cfdc980 Move js into a file for status in form 2013-09-11 18:38:56 +08:00
Harry Bomrah 579bc3c245 some very small fix for image alternative text and browse files manager 2013-09-11 14:03:25 +08:00
Harry Bomrah 8c98645a69 small bug fix for inserting and delete button. 2013-09-11 14:03:19 +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
chris 3328a41b55 Put back js that was deleted by mistake 2013-09-11 14:01:06 +08:00
chris 06203d27b9 Fix for user and role relationship 2013-09-11 14:00:41 +08:00
saurabhbhatia 865be29b37 Updated Preference Page 2013-09-09 11:29:46 +08:00
saurabhbhatia 0eeb7db1a8 Updated preference UI 2013-09-09 11:02:58 +08:00
saurabhbhatia 7216676c40 Updated Sidebar and Preferences 2013-09-09 10:18:14 +08:00
saurabhbhatia fa857cfeea Default Locale 2013-09-06 18:00:36 +08:00
saurabhbhatia a3f1b8d54a Updated Preferences in Site Info 2013-09-06 18:00:30 +08:00
saurabhbhatia e9d6fa8787 Preference Page 2013-09-06 18:00:28 +08:00
saurabhbhatia 6e032a8757 Add Preference and search engine 2013-09-06 18:00:23 +08:00
saurabhbhatia 1558cfdb4e Updated Sitebar with Search Engine 2013-09-06 18:00:21 +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
saurabhbhatia 7f0821ea84 Updated Site info page to new ui 2013-09-06 17:59:56 +08:00
saurabhbhatia 2c0761aafb Updated Sitemap to New UI 2013-09-06 17:59:54 +08:00
saurabhbhatia 1e5ad750cd Updated Site bar with correct links 2013-09-06 17:59:43 +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
Matt K. Fu 00ddd94314 fix design index 2013-09-03 15:20:48 +08:00
chris 8045a18230 Change modal delete to take an "remote" option 2013-09-03 15:04:05 +08:00
Spen 81a89d2d7c new ui member image js fix 2013-09-02 14:37:35 +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
Spen 3123c5de0a new ui member bug and interface fix 2013-09-02 11:22:17 +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 53e5c57970 Commented Dashboard Public Visibility and fall back on no-filter defined authorization 2013-08-22 16:43:11 +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
saurabhbhatia 452da1b8ec Updated Desktop Themes controller 2013-08-22 14:14:19 +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
chris d24bd176cc Changes in datetimepicker to accepts formats in options 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 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
2986 changed files with 137110 additions and 35753 deletions
Show Stats Expand all files Collapse all files

1
.gitignore vendored
View File

@ -22,3 +22,4 @@ uploads/**/*
.sass-cache/* .sass-cache/*
*.supported *.supported
mongoid.yml mongoid.yml
*.

8
Gemfile
View File

@ -14,7 +14,10 @@ gem 'execjs'
gem 'jquery-rails', '2.1.4' gem 'jquery-rails', '2.1.4'
gem 'jquery-ui-rails' gem 'jquery-ui-rails'
gem "select2-rails", '3.3.1' 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 "memcached", "~> 1.4.3"
# gem "memcache-client" # gem "memcache-client"
@ -46,7 +49,8 @@ gem 'sinatra'
gem 'sprockets' gem 'sprockets'
gem 'social-share-button' gem 'social-share-button'
gem 'tinymce-rails' gem 'ckeditor'
# gem 'tinymce-rails', "~> 3.5.8"
gem 'therubyracer' if RUBY_PLATFORM.downcase.include?("linux") gem 'therubyracer' if RUBY_PLATFORM.downcase.include?("linux")
gem 'libv8', '~> 3.11.8' if RUBY_PLATFORM.downcase.include?("linux") gem 'libv8', '~> 3.11.8' if RUBY_PLATFORM.downcase.include?("linux")
gem 'mongoid-encryptor', :require => 'mongoid/encryptor' gem 'mongoid-encryptor', :require => 'mongoid/encryptor'

0
app/assets/images/75.png → app/assets/Archive/images/75.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 923 B

After

Width:  |  Height:  |  Size: 923 B

0
app/assets/images/Jobs.jpg → app/assets/Archive/images/Jobs.jpg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 43 KiB

After

Width:  |  Height:  |  Size: 43 KiB

0
app/assets/images/PIE.htc → app/assets/Archive/images/PIE.htc
View File

0
app/assets/images/Thumbs.db → app/assets/Archive/images/Thumbs.db
View File

0
app/assets/images/add_mamber.png → app/assets/Archive/images/add_mamber.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

0
app/assets/images/ajax-loader.gif → app/assets/Archive/images/ajax-loader.gif
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 8.0 KiB

After

Width:  |  Height:  |  Size: 8.0 KiB

0
app/assets/images/ar1.png → app/assets/Archive/images/ar1.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 209 B

After

Width:  |  Height:  |  Size: 209 B

0
app/assets/images/background.jpg → app/assets/Archive/images/background.jpg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 44 KiB

After

Width:  |  Height:  |  Size: 44 KiB

0
app/assets/images/bar_bg.png → app/assets/Archive/images/bar_bg.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 157 B

After

Width:  |  Height:  |  Size: 157 B

0
app/assets/images/bar_border.png → app/assets/Archive/images/bar_border.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 211 B

After

Width:  |  Height:  |  Size: 211 B

0
app/assets/images/bar_btn.png → app/assets/Archive/images/bar_btn.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 393 B

After

Width:  |  Height:  |  Size: 393 B

0
app/assets/images/bar_id.png → app/assets/Archive/images/bar_id.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 499 B

After

Width:  |  Height:  |  Size: 499 B

0
app/assets/images/bar_orbit.png → app/assets/Archive/images/bar_orbit.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.3 KiB

After

Width:  |  Height:  |  Size: 6.3 KiB

0
app/assets/images/bar_pw.png → app/assets/Archive/images/bar_pw.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 504 B

After

Width:  |  Height:  |  Size: 504 B

0
app/assets/images/body.jpg → app/assets/Archive/images/body.jpg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 724 KiB

After

Width:  |  Height:  |  Size: 724 KiB

0
app/assets/images/bought_btn.png → app/assets/Archive/images/bought_btn.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

0
app/assets/images/buy_btn.png → app/assets/Archive/images/buy_btn.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 798 B

After

Width:  |  Height:  |  Size: 798 B

0
app/assets/images/check.png → app/assets/Archive/images/check.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

0
app/assets/images/connection/Thumbs.db → app/assets/Archive/images/connection/Thumbs.db
View File

0
app/assets/images/connection/facebook.png → app/assets/Archive/images/connection/facebook.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 820 B

After

Width:  |  Height:  |  Size: 820 B

0
app/assets/images/connection/gmail.png → app/assets/Archive/images/connection/gmail.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

0
app/assets/images/connection/twitter.png → app/assets/Archive/images/connection/twitter.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

0
app/assets/images/default-img.png → app/assets/Archive/images/default-img.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 778 B

After

Width:  |  Height:  |  Size: 778 B

BIN
app/assets/Archive/images/desktop/chrome.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.7 KiB

BIN
app/assets/Archive/images/desktop/compatibility_bg.jpg Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 104 KiB

BIN
app/assets/Archive/images/desktop/firefox.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.6 KiB

BIN
app/assets/Archive/images/desktop/ie.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
app/assets/Archive/images/desktop/opera.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

BIN
app/assets/Archive/images/desktop/safari.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.2 KiB

BIN
app/assets/Archive/images/desktop/select2/select2.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 824 B

BIN
app/assets/Archive/images/desktop/select2/select2x2.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 845 B

BIN
app/assets/Archive/images/desktop/select2/spinner.gif Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.8 KiB

0
app/assets/images/dropdown_ad.png → app/assets/Archive/images/dropdown_ad.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 548 B

After

Width:  |  Height:  |  Size: 548 B

0
app/assets/images/editicon.png → app/assets/Archive/images/editicon.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 2.9 KiB

0
app/assets/images/f1.jpg → app/assets/Archive/images/f1.jpg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 54 KiB

After

Width:  |  Height:  |  Size: 54 KiB

0
app/assets/images/f2.jpg → app/assets/Archive/images/f2.jpg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 36 KiB

After

Width:  |  Height:  |  Size: 36 KiB

0
app/assets/images/f3.jpg → app/assets/Archive/images/f3.jpg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 46 KiB

After

Width:  |  Height:  |  Size: 46 KiB

0
app/assets/images/facebook.png → app/assets/Archive/images/facebook.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.0 KiB

After

Width:  |  Height:  |  Size: 7.0 KiB

BIN
app/assets/Archive/images/ft-icons/Small Icons/accdb.ico Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 13 KiB

BIN
app/assets/Archive/images/ft-icons/Small Icons/avi.ico Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 13 KiB

BIN
app/assets/Archive/images/ft-icons/Small Icons/bmp.ico Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 13 KiB

BIN
app/assets/Archive/images/ft-icons/Small Icons/css.ico Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 13 KiB

0
app/assets/images/ft-icons/docx_mac/docx_mac-sm.ico → app/assets/Archive/images/ft-icons/Small Icons/docx_mac.ico
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 13 KiB

BIN
app/assets/Archive/images/ft-icons/Small Icons/docx_win.ico Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 13 KiB

BIN
app/assets/Archive/images/ft-icons/Small Icons/eml.ico Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 13 KiB

BIN
app/assets/Archive/images/ft-icons/Small Icons/eps.ico Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 13 KiB

BIN
app/assets/Archive/images/ft-icons/Small Icons/fla.ico Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 13 KiB

BIN
app/assets/Archive/images/ft-icons/Small Icons/gif.ico Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 13 KiB

BIN
app/assets/Archive/images/ft-icons/Small Icons/html.ico Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 13 KiB

BIN
app/assets/Archive/images/ft-icons/Small Icons/ind.ico Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 13 KiB

BIN
app/assets/Archive/images/ft-icons/Small Icons/ini.ico Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 13 KiB

BIN
app/assets/Archive/images/ft-icons/Small Icons/jpeg.ico Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 13 KiB

BIN
app/assets/Archive/images/ft-icons/Small Icons/jsf.ico Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 13 KiB

BIN
app/assets/Archive/images/ft-icons/Small Icons/midi.ico Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 13 KiB

BIN
app/assets/Archive/images/ft-icons/Small Icons/mov.ico Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 13 KiB

BIN
app/assets/Archive/images/ft-icons/Small Icons/mp3.ico Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 13 KiB

BIN
app/assets/Archive/images/ft-icons/Small Icons/mpeg.ico Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 13 KiB

BIN
app/assets/Archive/images/ft-icons/Small Icons/pdf.ico Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 13 KiB

BIN
app/assets/Archive/images/ft-icons/Small Icons/png.ico Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 13 KiB

0
app/assets/images/ft-icons/pptx_mac/pptx_mac-sm.ico → app/assets/Archive/images/ft-icons/Small Icons/pptx_mac.ico
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 13 KiB

BIN
app/assets/Archive/images/ft-icons/Small Icons/pptx_win.ico Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 13 KiB

BIN
app/assets/Archive/images/ft-icons/Small Icons/proj.ico Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 13 KiB

BIN
app/assets/Archive/images/ft-icons/Small Icons/psd.ico Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 13 KiB

BIN
app/assets/Archive/images/ft-icons/Small Icons/pst.ico Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 13 KiB

BIN
app/assets/Archive/images/ft-icons/Small Icons/pub.ico Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 13 KiB

BIN
app/assets/Archive/images/ft-icons/Small Icons/rar.ico Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 13 KiB

BIN
app/assets/Archive/images/ft-icons/Small Icons/readme.ico Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 13 KiB

BIN
app/assets/Archive/images/ft-icons/Small Icons/settings.ico Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 13 KiB

BIN
app/assets/Archive/images/ft-icons/Small Icons/text.ico Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 13 KiB

BIN
app/assets/Archive/images/ft-icons/Small Icons/tiff.ico Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 13 KiB

BIN
app/assets/Archive/images/ft-icons/Small Icons/url.ico Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 13 KiB

BIN
app/assets/Archive/images/ft-icons/Small Icons/vsd.ico Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 13 KiB

BIN
app/assets/Archive/images/ft-icons/Small Icons/wav.ico Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 13 KiB

BIN
app/assets/Archive/images/ft-icons/Small Icons/wma.ico Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 13 KiB

BIN
app/assets/Archive/images/ft-icons/Small Icons/wmv.ico Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 13 KiB

0
app/assets/images/ft-icons/xlsx_mac/xlsx_mac-sm.ico → app/assets/Archive/images/ft-icons/Small Icons/xlsx_mac.ico
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 13 KiB

BIN
app/assets/Archive/images/ft-icons/Small Icons/xlsx_win.ico Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 13 KiB

BIN
app/assets/Archive/images/ft-icons/Small Icons/zip.ico Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 13 KiB

BIN
app/assets/Archive/images/ft-icons/accdb/accdb-128_32.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 17 KiB

BIN
app/assets/Archive/images/ft-icons/accdb/accdb-16_32.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 918 B

BIN
app/assets/Archive/images/ft-icons/accdb/accdb-24_32.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
app/assets/Archive/images/ft-icons/accdb/accdb-256_32.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 44 KiB

BIN
app/assets/Archive/images/ft-icons/accdb/accdb-32_32.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.4 KiB

BIN
app/assets/Archive/images/ft-icons/accdb/accdb-48_32.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.8 KiB

BIN
app/assets/Archive/images/ft-icons/accdb/accdb-64_32.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.2 KiB

BIN
app/assets/Archive/images/ft-icons/accdb/accdb-72_32.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 8.6 KiB

BIN
app/assets/Archive/images/ft-icons/accdb/accdb-80_32.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 10 KiB

BIN
app/assets/Archive/images/ft-icons/accdb/accdb-96_32.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 14 KiB

BIN
app/assets/Archive/images/ft-icons/accdb/accdb-sm-16_32.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 735 B

BIN
app/assets/Archive/images/ft-icons/accdb/accdb-sm-24_32.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
app/assets/Archive/images/ft-icons/accdb/accdb-sm-32_32.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
app/assets/Archive/images/ft-icons/accdb/accdb-sm.ico Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 13 KiB

BIN
app/assets/Archive/images/ft-icons/accdb/accdb.ico Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 228 KiB

BIN
app/assets/Archive/images/ft-icons/avi/avi-128_32.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 14 KiB

BIN
app/assets/Archive/images/ft-icons/avi/avi-16_32.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 927 B

BIN
app/assets/Archive/images/ft-icons/avi/avi-24_32.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
app/assets/Archive/images/ft-icons/avi/avi-256_32.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 27 KiB

BIN
app/assets/Archive/images/ft-icons/avi/avi-32_32.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.4 KiB

Some files were not shown because too many files have changed in this diff Show More