c474fa063f
New authorization
2013-08-21 13:42:29 +08:00
d24bd176cc
Changes in datetimepicker to accepts formats in options
2013-08-21 13:42:29 +08:00
6c514770bc
solved conflict for member_new_ui
2013-08-12 15:40:34 +08:00
Harry Bomrah
55670e6318
icons and theme minicolors fixed
2013-08-12 12:28:32 +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
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
2fea428b67
Changed mongoid production back to test_site
2013-07-30 17:17:17 +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
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
Harry Bomrah
ed22a4d303
apps update -- app upload and activation
2013-07-30 16:42:50 +08:00
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
2d616ab7a8
solved desktop conflict during cherry pick
2013-07-30 16:42:26 +08:00
d190a50046
Breadcrumb for dashboard (tags and categories cannot link to original module index)
2013-07-29 17:34:03 +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
da1d70efcb
Change authorization to accept other than category
2013-07-25 17:36:55 +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
0d0f85e7ad
Fix tooltip in form
...
Change form_file
2013-07-22 20:54:40 +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
408bebaa4b
Ray's changes in structure
2013-07-22 14:06:58 +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
91b1cf6edc
Merge branch 'development' of https://github.com/Rulingcom/orbit into development
2013-07-11 17:18:58 +08:00
1c4b66f1cb
Fix approval in index
2013-07-10 16:42:25 +08:00
72861f05a6
Merge branch 'development' of https://github.com/Rulingcom/orbit into development
...
Conflicts:
config/mongoid.yml
2013-07-09 14:40:39 +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
869f3b6815
fix object de-authorize failed.
2013-06-26 12:28:00 +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
c5ced8cf16
remove useless setting for solar
2013-06-20 17:50:18 +08:00
e037507b0e
fix solr setting
2013-06-20 17:50:18 +08:00
2f01b72ed0
fix solr name
2013-06-20 17:50:18 +08:00
cd6dd40f45
add god to monit sold
2013-06-20 17:50:18 +08:00
345c471fc9
from now on the rescue namespace will be decided by site object field: resque_namespace
2013-06-20 17:50:17 +08:00
ed06be93d6
fix rescue scheduler space error
2013-06-20 17:50:17 +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
b674f47528
Remove Syslog
2013-06-14 15:30:22 +08:00
e20df41db5
add user log link at site page
2013-06-14 15:24:04 +08:00
110eab0496
ask module: add global smtp setting
2013-06-07 13:04:00 +08:00
8541033ba9
ask module: send mail on development
2013-06-07 13:04:00 +08:00
d5109c837c
Merge branch 'lukas/picked_ques' into development
2013-06-06 19:59:30 +08:00
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
8c1e65994a
Merge branch 'clean_development' into lukas/picked_ques
2013-06-06 19:08:59 +08:00
5ea0c5bd5c
survey module: result chart display only other
...
Conflicts:
config/environments/production.rb
2013-06-06 18:45:29 +08:00
adc15951bb
questionnaire stuff
...
Conflicts:
vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb
vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/index.html.erb
2013-06-06 18:29:58 +08:00
253cca06cc
New widget for tag cloud
2013-06-06 17:17:45 +08:00
54a35b30be
fix design index bug when start start from blank DB.
...
add delay impressionist.
add several i18n vars
2013-05-23 12:07:43 +08:00
chris
Spen
Harry Bomrah
saurabhbhatia
devin chen
rulingcom
Matt K. Fu
iCross