saurabhbhatia
d636248073
Updated Sidebar, Application Controllers
2013-11-01 16:42:39 +08:00
chris
c541e84254
Remove include of ParserBackEnd
2013-10-31 16:17:51 +08:00
chris
00010867a4
Fix link in structure
2013-10-30 18:53:23 +08:00
Manson Wang
a885313e75
Dashboard with HighChart
2013-10-30 18:23:46 +08:00
saurabhbhatia
3aac221c4e
removed site restart after site preferences update
2013-10-30 14:18:03 +08:00
chris
36ddbf68e0
Fix menu_enabled_for
2013-10-29 14:39:23 +08:00
chris
6bc00ce3a3
Use module_app label instead of title
2013-10-29 11:17:02 +08:00
chris
a14d69211b
PagePart widgets for "system widget"
...
Delete useless code
2013-10-28 16:29:23 +08:00
chris
218cb03641
PagePart widgets except "system widget"
2013-10-28 16:29:23 +08:00
chris
42d0afe65c
Page form with front end style
2013-10-28 16:29:23 +08:00
Spen
254f926093
fix new ui announcement preview
2013-10-24 15:03:20 +08:00
chris
8ebfac2b99
Structure link with json
2013-10-23 18:39:40 +08:00
chris
a4d1c68299
Structure page with json
2013-10-23 18:39:35 +08:00
chris
94c1d7d5a0
Fix homepage in structure, ajaxStop for structure edit, setForm in pageslide.js
2013-10-23 18:39:21 +08:00
saurabhbhatia
e42cf8720e
Updated Site Preferences with language fix
2013-10-21 16:53:11 +08:00
Spen
c76adc1896
new ui member account privilege fix
2013-10-21 10:42:50 +08:00
chris
f9f2232259
Add setForm and resetForm to pageslide.js
...
Category, AdBanner and Tag are using js to load the values in the form
2013-10-21 06:34:55 +08:00
chris
2530dace02
Change the parser_front_end to be used in the structure for page edit, new_ui:save_pages must be run
2013-10-20 18:44:04 +08:00
chris
fea86ba3a9
Page slide does not reload from server for ad_banner
2013-10-19 19:17:24 +08:00
chris
92d2af13f2
changes for ad_banner
2013-10-19 19:17:04 +08:00
chris
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
chris
f694134150
Remove useless code
...
Add data-title
2013-10-19 19:14:07 +08:00
Spen
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
Spen
14d2b0cc76
fix new ui member account privilege
2013-10-18 19:52:36 +08:00
saurabhbhatia
3e491380cd
Revert "new ui member settings account data"
...
This reverts commit e1f4ee464b
.
2013-10-18 19:51:02 +08:00
Spen
e1f4ee464b
new ui member settings account data
2013-10-18 19:12:27 +08:00
saurabhbhatia
14fea3638f
Updated with some locale fixes in site preferences
2013-10-18 15:26:41 +08:00
saurabhbhatia
155039ac16
Updated fixes for site info - desktop openess, title always displayed
2013-10-16 18:33:57 +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
chris
279ac774d4
Migrate form old ui to new ui (categories, tags and authorizations)
2013-10-15 23:38:44 +08:00
Manson Wang
76ba7087b2
Fix Ad_Banner frontend for IE8
...
Fix backend bug in editing banner
Translation Added
2013-10-15 19:37:12 +08:00
saurabhbhatia
96c3be68f7
Fixed Enable and Disable, Sitemap and Terms of Use for header and footer
2013-10-15 10:37:49 +08:00
saurabhbhatia
4120be6f8e
fixes in sitemap, site preference
2013-10-14 16:48:50 +08:00
saurabhbhatia
55fa1cef4f
Added Enable and disable terms of use, sitemap
2013-10-11 13:14:37 +00:00
chris
08a8d668ec
Display de page contexts in the mobile version as set in structure
2013-10-08 18:11:29 +08:00
chris
cce68beff1
Quick fix for front end reloading
2013-10-08 14:52:24 +08:00
chris
5328a26440
Fix structure position
2013-10-08 12:33:24 +08:00
chris
fe1869199e
Fix typo, it wasn't executing the filtering on tags
2013-10-07 19:01:59 +08:00
saurabhbhatia
b3e16ce23b
Updated desktop widgets controller
2013-10-07 18:13:55 +08:00
saurabhbhatia
fad191aefe
Updated Desktop Inheritence class
2013-10-07 17:47:13 +08:00
chris
21db2a2cba
Drag and drop to reorder users
2013-10-07 15:53:54 +08:00
Manson Wang
831bd722b8
Fix site preference openness problem
2013-10-07 14:37:52 +08:00
Manson Wang
792785f7ba
Fix relation for Ad_banner and Ad_image
...
Update site.rake for New UI
2013-10-04 19:20:04 +08:00
chris
43cf6b70b7
Fix structure reorder position
2013-10-04 15:07:24 +08:00
chris
dfec6f7642
Fix for user order
2013-09-27 12:46:19 +08:00
Spen
9186978551
new ui member plugin sort fix and user show avatar fix
2013-09-27 11:04:52 +08:00
Spen
028c689739
Change User.all to User.not_guest_user
2013-09-26 19:46:14 +08:00
chris
f81894af90
User ordering
...
Run the task new_ui:save_users
2013-09-26 19:00:13 +08:00
Harry Bomrah
1d0ea6718f
brief added to desktop for all plugins
2013-09-25 18:23:44 +08:00
Harry Bomrah
58fb2d1c73
external links and link widget fixed for development
2013-09-24 15:37:40 +08:00
Spen
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
Harry Bomrah
9e10a3c944
editing for the assets are done with replacable files and description
2013-09-11 14:03:13 +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
saurabhbhatia
fa857cfeea
Default Locale
2013-09-06 18:00:36 +08:00
saurabhbhatia
6e032a8757
Add Preference and search engine
2013-09-06 18:00:23 +08:00
saurabhbhatia
9e4686a565
Fixed Site Info completely and added search engine page
2013-09-06 18:00:18 +08:00
saurabhbhatia
fef7cc4ed2
Updated Site info
2013-09-06 18:00:10 +08:00
Spen
3123c5de0a
new ui member bug and interface fix
2013-09-02 11:22:17 +08:00
saurabhbhatia
b970ea1e0e
Updated Authorization for member, link, tag, archive
2013-08-27 10:14:39 +08:00
chris
45e987d6f5
Fix for authorization
...
Dashboard and page authorisation
2013-08-23 12:08:33 +08:00
saurabhbhatia
53e5c57970
Commented Dashboard Public Visibility and fall back on no-filter defined authorization
2013-08-22 16:43:11 +08:00
saurabhbhatia
4c217ec12f
Updated Authorizations for Adbanner, Calendar, Location
2013-08-22 15:20:50 +08:00
saurabhbhatia
452da1b8ec
Updated Desktop Themes controller
2013-08-22 14:14:19 +08:00
chris
c474fa063f
New authorization
2013-08-21 13:42:29 +08:00
Spen
6c514770bc
solved conflict for member_new_ui
2013-08-12 15:40:34 +08:00
saurabhbhatia
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
saurabhbhatia
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
saurabhbhatia
e12b14311e
Updated Desktop with new UI
2013-07-30 16:43:41 +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
38194311ab
some changes again
2013-07-30 16:43:18 +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
devin chen
f2ada14b7a
app manager's view update
2013-07-30 16:42:46 +08:00
Harry Bomrah
2d616ab7a8
solved desktop conflict during cherry pick
2013-07-30 16:42:26 +08:00
Harry Bomrah
dc94283af9
duplicate error fixed and css inside widgets fixed, duplicate location fixed
2013-07-30 16:41:38 +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
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
d190a50046
Breadcrumb for dashboard (tags and categories cannot link to original module index)
2013-07-29 17:34:03 +08:00
chris
da1d70efcb
Change authorization to accept other than category
2013-07-25 17:36:55 +08:00
chris
1ba1703e90
Fix get_viewable
2013-07-22 17:41:52 +08:00
chris
1db324d1a2
Fix get_sorted_and_filtered
2013-07-19 17:38:43 +08:00
chris
5190c1160a
Fix get_sorted_and_filtered, accepts 3 arguments and works for category
2013-07-16 14:43:56 +08:00
chris
62288a71ca
Fix category_id in forms
...
Fix statuses list
2013-07-16 11:41:22 +08:00
chris
1c4b66f1cb
Fix approval in index
2013-07-10 16:42:25 +08:00
chris
2c331bf1a5
Revert non rulingcom email constraint
2013-07-04 14:20:13 +08:00
chris
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
Matthew K. Fu JuYuan
d3f0a10187
fix default setting for partial category selection error,due to API changing.
2013-06-17 15:26:43 +08:00
Matt K. Fu
e20df41db5
add user log link at site page
2013-06-14 15:24:04 +08:00
iCross
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
Matt K. Fu
dd206437d8
apply tags and cates for fronted. from now app developer can use param category_id and tag_id freely.
2013-06-06 17:39:36 +08:00
Matt K. Fu
7729161123
fix for passing args. code in complete,fronted controller need to take care params,too. backend parser need to catch up.
2013-06-06 17:38:17 +08:00
Matthew K. Fu JuYuan
5c94200b77
fix argument passing problem for more link and tag cloud, incomplete code.
2013-06-06 17:21:27 +08:00
chris
253cca06cc
New widget for tag cloud
2013-06-06 17:17:45 +08:00
Matt K. Fu
06fd305bf9
default widget show search
2013-06-05 13:00:21 +08:00
Matt K. Fu
c0f1614cb9
fix uploading error due to user action decoder can not handle uploading file
2013-05-30 10:17:28 +08:00
Matt K. Fu
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
Matt K. Fu
37aa950028
user action
2013-05-23 11:55:57 +08:00
Matt K. Fu
ef2c732d2e
make blank site working better
2013-05-14 11:26:35 +08:00
Matt K. Fu
1096db79b6
blank site now can be start from rake site:build
2013-05-14 10:32:53 +08:00
chris
127ab3845c
Changes for queries
2013-05-03 12:12:19 +08:00
chris
aefd62da2a
Add tagged_ids to taggable
2013-05-03 12:12:19 +08:00
Matt K. Fu
3e567223e3
fix for Spen's translation and Chris's tag error
2013-04-26 15:37:27 +08:00
Matthew K. Fu JuYuan
d047a3d62a
chris tags update
2013-04-26 11:26:10 +08:00
Spen
697944a029
user id set & user fields set & role set & member frontend list & user translation & create new member bug fix
2013-04-25 19:59:59 +08:00
Matt K. Fu
a0478f2a8f
fix page name repeated error when page creating
2013-04-25 12:19:25 +08:00
Matt K. Fu
b198b1a17b
system preference
2013-04-24 19:21:11 +08:00
Matt K. Fu
5ff7dfbac6
fronted open switch and backend openness
2013-04-23 18:48:18 +08:00
Matt K. Fu
3098496083
widget link followed by setting
2013-04-17 14:19:32 +08:00
Matt K. Fu
425a320c02
fix widget and fronted setting interface. checked with Spen
2013-04-17 14:16:24 +08:00
Harry Bomrah
bc0477a5ed
widget and gridster fixes
2013-04-17 14:16:24 +08:00
Matt K. Fu
0781779ac0
solved conflicts
2013-04-17 14:14:24 +08:00
Harry Bomrah
793d739726
features and widgets added
...
Conflicts:
app/assets/javascripts/orbitdesktop.js
2013-04-17 14:14:23 +08:00
Matt K. Fu
0f6f5aafce
fix for both part and page part settings
...
Conflicts:
app/helpers/admin/page_parts_helper.rb
app/views/admin/pages/reload_front_end_setting.js.erb
app/views/admin/pages/reload_frontend_pages.js.erb
2013-04-17 14:12:52 +08:00
Fu Matthew
f6b600df59
deliver API
2013-04-17 14:09:01 +08:00
chris
6af375efa4
Fix bug in setup_app_frontend_and_style
2013-04-17 14:09:00 +08:00
Fu Matthew
1709773b0a
style for front end
2013-04-17 14:08:01 +08:00
Fu Matthew
6efef253a6
add conditions for making multi cates and tags more stable
2013-04-17 11:08:57 +08:00
Harry Bomrah
b8ee2fd559
compatibility page added and tinyscrollbar drag event fixed..
2013-04-17 11:07:20 +08:00
Fu Matthew
4a08a1992b
1.make module app forbid unearthed access except from admin
...
2.override sidebar link when it's object_auth or app_auth.
2013-04-17 10:56:15 +08:00
Fu Matthew
8e98cb3ec9
put add admin pages using orbit back end controller
2013-04-17 10:54:38 +08:00
chris
3e96cfe514
Changes for FAQ to work with not latest but stable code
2013-03-28 15:05:52 +08:00
chris
da8a5123c2
Change in announcement init for query
...
Change in default widget query
2013-03-27 16:31:42 +08:00
chris
d01968dcd0
Changes in query for default widget
2013-03-21 02:29:56 +08:00
chris
617ebfd43a
Revert "Fix query for top in bulletin"
...
This reverts commit 332481f9f1a5802ae652bb401d0dd409196ab00f.
2013-03-19 23:44:02 +08:00
chris
b55988af33
Fix query for top in bulletin
2013-03-19 23:44:02 +08:00
chris
9684189258
Fix query for date in bulletin
2013-03-19 23:43:59 +08:00
chris
8374bc8d12
Set I18n from browser
2013-03-19 23:43:31 +08:00
chris
9cf8c2b72b
Revert "Page front end stay in the same page when a link is clicked (category)"
...
This reverts commit 14d856b4d6
.
2013-03-19 20:00:16 +08:00
chris
14d856b4d6
Page front end stay in the same page when a link is clicked (category)
2013-03-19 19:44:04 +08:00
chris
37a38369e7
Fix typo in default widget not showing objects in front end
2013-03-19 18:41:03 +08:00
chris
ff30b3d05e
Fix link not showing for default front end
2013-03-19 18:23:35 +08:00
chris
f3c809fd58
Fix link switch not showing for default front end
2013-03-19 17:49:46 +08:00
chris
5e4e3ac560
Fix link for default widget
...
Convert single id to array to find item
2013-03-19 17:14:01 +08:00
chris
7dcea95dd4
Fix query for multi categories and tags (empty array)
2013-03-19 15:10:31 +08:00
chris
ef2a32be4c
Fix query for multi categories and tags
2013-03-18 22:01:08 +08:00
chris
157935e7eb
Page front end stay in the same page when a link is clicked (title or pagination)
2013-03-18 21:54:06 +08:00
chris
e208e99a73
Fix page part update when no tag or category
2013-03-13 15:45:30 +08:00
Spen
d7d480ac12
archive edit & plugins edit
2013-03-07 21:12:31 +08:00
chris
147b7b9292
Fix update when no tag or category
2013-03-07 17:30:49 +08:00
Fu Matthew
dc3966be81
fix cates and tags
2013-03-05 18:34:41 +08:00
Fu Matthew
626b2a7bca
fix default failed when cate or tags set to empty
2013-03-05 11:48:20 +08:00
Fu Matthew
285119a5f3
fix for multi select cates and tags
2013-03-04 19:29:45 +08:00
chris
ca946fc881
Merge branch 'development' of github.com:Rulingcom/orbit into development
...
Conflicts:
lib/tasks/migrate.rake
2013-02-27 11:03:52 +08:00
Fu Matthew
0dabd5b95f
fix widget field reload
2013-02-27 10:51:41 +08:00
Fu Matthew
8a8bfcb8fb
fix default widget link
2013-02-27 10:50:47 +08:00
Fu Matthew
99e67c8719
first version of multi categories and tags
2013-02-27 10:49:48 +08:00