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
109b891b27
Merge branch 'development' of https://github.com/Rulingcom/orbit into development
2013-07-19 17:39:55 +08:00
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
e6c411b8e1
Updated tagging with galleries in new ui
2013-07-19 17:38:33 +08:00
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
62288a71ca
Fix category_id in forms
...
Fix statuses list
2013-07-16 11:41:22 +08:00
1c4b66f1cb
Fix approval in index
2013-07-10 16:42:25 +08:00
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
07b3857465
archive app Category Authorization fix
2013-06-26 17:44:31 +08:00
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
96fc5ceea3
survey module: ensure the commit
2013-06-14 15:25:58 +08:00
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
2f7389ae24
ask module change mail view: <p>此為系統自動發信，請勿直接回覆</p>
2013-06-07 13:04:00 +08:00
c7effcc96c
ask module: create.js.erb
2013-06-07 13:04:00 +08:00
e353961b21
ask moudule: add ask.css
2013-06-07 13:04:00 +08:00
75e27ed849
ask module: default status
2013-06-07 13:04:00 +08:00
8541033ba9
ask module: send mail on development
2013-06-07 13:04:00 +08:00
467c2e8a3c
ask module: fix
2013-06-07 13:04:00 +08:00
b0640f925b
ask module: fix some
2013-06-07 13:04:00 +08:00
Harry Bomrah
chris
saurabhbhatia
Spen
iCross