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