saurabh
/
orbit-basic
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,314 Commits 5 Branches 0 Tags 52 MiB
Commit Graph

1196 Commits

Author SHA1 Message Date
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
devin chen 874819266d minor update 2013-07-30 16:42:23 +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 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
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 f60c190a11 Page module new UI 2013-07-25 17:37:11 +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 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
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
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 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
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
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 62288a71ca Fix category_id in forms 
Fix statuses list
 2013-07-16 11:41:22 +08:00
chris 1c4b66f1cb Fix approval in index 2013-07-10 16:42:25 +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
Spen 07b3857465 archive app Category Authorization fix 2013-06-26 17:44:31 +08:00
Spen 8751b15385 archive app add Module Authorization & Category Authorization 2013-06-26 15:35:35 +08:00
Harry Bomrah 465d417c35 fixed updated method of events.. was having week error when updating events 2013-06-26 12:27:23 +08:00
Harry Bomrah eaf7577810 small syntax error missed out yesterday fixed. 2013-06-26 12:26:52 +08:00
Harry Bomrah 22358bd862 Small change for creating events when calendar is not selected 2013-06-26 12:26:24 +08:00
Harry Bomrah 300de76c3a Calendar fixed... all views fixed plus event loading fixed and also agenda view fixed. 2013-06-26 12:25:58 +08:00
iCross 96fc5ceea3 survey module: ensure the commit 2013-06-14 15:25:58 +08:00
iCross e48a1ffece archive module: add sort to frontend module 
Conflicts:

	vendor/built_in_modules/archive/app/controllers/panel/archive/front_end/archive_files_controller.rb
	vendor/built_in_modules/archive/app/views/panel/archive/front_end/archive_files/index.html.erb

Conflicts:
	vendor/built_in_modules/archive/app/views/panel/archive/front_end/archive_files/index.html.erb

Conflicts:
	vendor/built_in_modules/archive/app/views/panel/archive/front_end/archive_files/index.html.erb
 2013-06-14 15:25:49 +08:00
iCross 2f7389ae24 ask module change mail view: <p>此為系統自動發信，請勿直接回覆</p> 2013-06-07 13:04:00 +08:00
iCross c7effcc96c ask module: create.js.erb 2013-06-07 13:04:00 +08:00
iCross e353961b21 ask moudule: add ask.css 2013-06-07 13:04:00 +08:00
iCross 75e27ed849 ask module: default status 2013-06-07 13:04:00 +08:00
iCross 8541033ba9 ask module: send mail on development 2013-06-07 13:04:00 +08:00
iCross 467c2e8a3c ask module: fix 2013-06-07 13:04:00 +08:00
iCross b0640f925b ask module: fix some 2013-06-07 13:04:00 +08:00
iCross 841fa10c55 ask module: add rescue ackknowledgement 2013-06-07 13:04:00 +08:00
iCross dcc5fc39a7 ask module: dropdown, icon, big5 encoding, redirect, admin, send mail 2013-06-07 13:03:59 +08:00
iCross 97df100c64 remove department 2013-06-07 13:03:59 +08:00
iCross ce180839f0 finish ask module 2013-06-07 13:03:59 +08:00
iCross b6c8a88b73 Merge branch 'lukas/picked_archive' into development 2013-06-06 22:27:08 +08:00
iCross 5b7ac1a22b archive module: add sort feature to achive files 2013-06-06 22:20:27 +08:00
Matt K. Fu d5109c837c Merge branch 'lukas/picked_ques' into development 2013-06-06 19:59:30 +08:00
iCross c63ac751ea archive module: sort for backend/frontend. move get_sorted_and_filtered from orbit_backend_controller.rb to application_controller.rb 2013-06-06 19:20:21 +08:00
iCross 8c1e65994a Merge branch 'clean_development' into lukas/picked_ques 2013-06-06 19:08:59 +08:00
iCross f9a148c901 survey module: move down/up i18n 
Conflicts:

	vendor/built_in_modules/survey/app/views/panel/survey/back_end/surveys/_form_survey_question.html.erb
 2013-06-06 18:46:52 +08:00
iCross 5ea0c5bd5c survey module: result chart display only other 
Conflicts:

	config/environments/production.rb
 2013-06-06 18:45:29 +08:00
iCross ec173c4ce1 fix 2013-06-06 18:42:12 +08:00
iCross ba7d6558ee fix 2013-06-06 18:42:00 +08:00
iCross 88c57e0b0c fix 2013-06-06 18:41:48 +08:00
iCross d4962d20b3 fix 2013-06-06 18:41:36 +08:00
iCross 21bf3a0ccd standalone css and icon 2013-06-06 18:41:27 +08:00
iCross cf0d7cfc64 new export csv table 
Conflicts:

	vendor/built_in_modules/survey/app/controllers/panel/survey/back_end/surveys_controller.rb
 2013-06-06 18:40:28 +08:00
iCross 15347f25dc fix 2013-06-06 18:38:59 +08:00