d636248073
Updated Sidebar, Application Controllers
2013-11-01 16:42:39 +08:00
a885313e75
Dashboard with HighChart
2013-10-30 18:23:46 +08:00
a14d69211b
PagePart widgets for "system widget"
...
Delete useless code
2013-10-28 16:29:23 +08:00
218cb03641
PagePart widgets except "system widget"
2013-10-28 16:29:23 +08:00
f3b3c94b42
Item control iframe dom
...
Css for preview
2013-10-26 18:58:53 +08:00
13da6fc6a1
Added a new rake task with arguments
2013-10-25 21:59:03 +08:00
8ebfac2b99
Structure link with json
2013-10-23 18:39:40 +08:00
a4d1c68299
Structure page with json
2013-10-23 18:39:35 +08:00
c76adc1896
new ui member account privilege fix
2013-10-21 10:42:50 +08:00
92d2af13f2
changes for ad_banner
2013-10-19 19:17:04 +08:00
68a379f8a4
Some fixes for tags: authorization, translation…
...
can_use now takes all the open_for into account
2013-10-19 19:14:31 +08:00
00e9a5df5b
new ui member settings account data
...
Conflicts:
app/controllers/admin/users_new_interface_controller.rb
app/views/admin/users_new_interface/show.html.erb
config/locales/en.yml
config/routes.rb
2013-10-18 22:28:27 +08:00
14d2b0cc76
fix new ui member account privilege
2013-10-18 19:52:36 +08:00
3e491380cd
Revert "new ui member settings account data"
...
This reverts commit e1f4ee464b
2013-10-18 19:51:02 +08:00
e1f4ee464b
new ui member settings account data
2013-10-18 19:12:27 +08:00
14fea3638f
Updated with some locale fixes in site preferences
2013-10-18 15:26:41 +08:00
Harry Bomrah
fbea249782
jquery update and also fixed app manager bug .. jquery updated to 1.10.2 and jquery ui updated to 1.10.0 .. gem jquery-rails vs 2.1.4 changed to 3.0.4 and jquery-ui-rails changed to 4.0.5
2013-10-16 09:37:33 +08:00
4120be6f8e
fixes in sitemap, site preference
2013-10-14 16:48:50 +08:00
55fa1cef4f
Added Enable and disable terms of use, sitemap
2013-10-11 13:14:37 +00:00
cf7f7aa29c
Fix tag page slide issues
2013-10-08 12:47:31 +08:00
21db2a2cba
Drag and drop to reorder users
2013-10-07 15:53:54 +08:00
f81894af90
User ordering
...
Run the task new_ui:save_users
2013-09-26 19:00:13 +08:00
dc3593c162
zh-tw for new ui
2013-09-26 17:13:17 +08:00
a067bcd304
Add Brief intro. for all personal plugins
...
Add Share Setting for Personal Plugins ( if have old data must be add default value "field: is_hidden => false " )
Apply New UI to Member Plugin Edit Page
Personal Plugin Summary fix
Academic Info. list fix
2013-09-18 18:55:40 +08:00
bb8bc9a529
Added missing translation for gallery
2013-09-12 10:10:37 +08:00
6430e60577
Added the missing translations in config/locales/en.yml and zh_tw.yml
...
Conflicts:
config/locales/en.yml
config/locales/zh_tw.yml
2013-09-12 09:30:07 +08:00
Harry Bomrah
f920a4f6ba
filemanager and some update for file uploader . added file uploader to kernel
2013-09-11 14:03:06 +08:00
6e032a8757
Add Preference and search engine
2013-09-06 18:00:23 +08:00
9e4686a565
Fixed Site Info completely and added search engine page
2013-09-06 18:00:18 +08:00
4078d426a6
new ui personal front_end page(member app) & users_new_interface show sub_roles fix
2013-08-21 14:13:36 +08:00
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
saurabhbhatia
Manson Wang
chris
Spen
Harry Bomrah
devin chen