chris
00010867a4
Fix link in structure
2013-10-30 18:53:23 +08:00
chris
36ddbf68e0
Fix menu_enabled_for
2013-10-29 14:39:23 +08:00
chris
f2508e79cb
Fix edit_title for nil module_app
2013-10-29 14:00:56 +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
chris
f3b3c94b42
Item control iframe dom
...
Css for preview
2013-10-26 18:58:53 +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
saurabhbhatia
cf89ed108a
Fixed Site Preferences Language
2013-10-21 17:46:29 +08:00
saurabhbhatia
e42cf8720e
Updated Site Preferences with language fix
2013-10-21 16:53:11 +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
saurabhbhatia
14fea3638f
Updated with some locale fixes in site preferences
2013-10-18 15:26:41 +08:00
chris
a76164465e
Fix editing a tag module
2013-10-16 23:34:51 +08:00
saurabhbhatia
155039ac16
Updated fixes for site info - desktop openess, title always displayed
2013-10-16 18:33:57 +08:00
chris
279ac774d4
Migrate form old ui to new ui (categories, tags and authorizations)
2013-10-15 23:38:44 +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
5328a26440
Fix structure position
2013-10-08 12:33:24 +08:00
chris
061225f56c
Override mongoid-tree callback condition for default position
2013-10-07 18:23:54 +08:00
chris
43cf6b70b7
Fix structure reorder position
2013-10-04 15:07:24 +08:00
chris
433c8d5da6
Fix link in category for authorization, fix update of auth users
2013-10-02 12:18:20 +08:00
chris
f81894af90
User ordering
...
Run the task new_ui:save_users
2013-09-26 19:00:13 +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
f920a4f6ba
filemanager and some update for file uploader . added file uploader to kernel
2013-09-11 14:03:06 +08:00
chris
06203d27b9
Fix for user and role relationship
2013-09-11 14:00:41 +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
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
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
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
42615f02ea
new feature in desktop for uploading wallpapers or putting url link
2013-08-02 19:32:41 +08:00
chris
d632439f80
Add class for Ray's check-box
...
Fix some typos
Change the default index for auth
Add some hard code in object_auth.rb to handle page_context
A user cannot select himself in authorisation
2013-07-31 00:08:15 +08:00
Harry Bomrah
f7dbbf1bca
new themes added to desktop plus theme uploader created
2013-07-30 16:43:32 +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
devin chen
3cde26ca4a
gridster update
2013-07-30 16:42:53 +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
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
6cf249ccfb
Change ckeditor gem and kaminari in gemfile
2013-07-22 17:26:32 +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
saurabhbhatia
7ea9945af0
Location - category fixes
...
Conflicts:
app/models/category.rb
vendor/built_in_modules/location/init.rb
2013-07-22 12:17:29 +08:00
saurabhbhatia
91b1cf6edc
Merge branch 'development' of https://github.com/Rulingcom/orbit into development
2013-07-11 17:18:58 +08:00
chris
1c4b66f1cb
Fix approval in index
2013-07-10 16:42:25 +08:00
saurabhbhatia
72861f05a6
Merge branch 'development' of https://github.com/Rulingcom/orbit into development
...
Conflicts:
config/mongoid.yml
2013-07-09 14:40:39 +08:00