Harry Bomrah
897ed49d2e
new ui for faq and announcement status fixed.
2013-08-20 18:22:11 +08:00
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
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
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
6269c6d1e6
Updated init.rb
2013-08-09 15:22:12 +08:00
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
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
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
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
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
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
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
b3cdffb59e
Fix typo
2013-07-27 15:57:14 +08:00
fd432f30ba
Fix cktext_area and removing of files and links
2013-07-27 15:50:34 +08:00
f60c190a11
Page module new UI
2013-07-25 17:37:11 +08:00
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
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
af0ab9f0d3
removed categories reference in event categories
2013-07-23 19:16:21 +08:00
9144622c41
Fixed index page for categories color
2013-07-23 19:01:56 +08:00
06ab24374b
Gallery - categories, module_authorization and tags to new_ui
2013-07-23 18:16:19 +08:00
c7cf7e1ce4
removed category_customizable
2013-07-23 12:27:01 +08:00
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
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
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
0d0f85e7ad
Fix tooltip in form
...
Change form_file
2013-07-22 20:54:40 +08:00
5d3bc07488
archive and web_resouce for new ui
...
Conflicts:
app/assets/stylesheets/lib/main-forms.css
2013-07-22 18:14:33 +08:00
2265b0b404
Fix no file in bulletin form
2013-07-22 17:41:21 +08:00
6cf249ccfb
Change ckeditor gem and kaminari in gemfile
2013-07-22 17:26:32 +08:00
92faeccdb6
Revert change in main-form and change class name of form_file
2013-07-22 17:24:58 +08:00
5284571300
Add tooltip to bulletin form and remove file
2013-07-22 16:55:02 +08:00
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
7ea9945af0
Location - category fixes
...
Conflicts:
app/models/category.rb
vendor/built_in_modules/location/init.rb
2013-07-22 12:17:29 +08:00
Harry Bomrah
saurabhbhatia
Spen
devin chen
chris