unknown
|
c0cac812c5
|
demo site widget
|
2012-07-26 16:39:29 +08:00 |
Matthew K. Fu JuYuan
|
2ae6b54a45
|
fix for not working cache
|
2012-07-13 18:32:17 +08:00 |
|
Matthew K. Fu JuYuan
|
4daf36908c
|
working cache
|
2012-07-13 15:36:10 +08:00 |
|
Matthew K. Fu JuYuan
|
49862e70f9
|
hide category at front end
|
2012-07-09 12:05:21 +08:00 |
|
Matthew K. Fu JuYuan
|
11247ce84c
|
Clean up code , cache other auths. Fix sidebar
|
2012-05-29 17:17:26 +08:00 |
|
Matthew K. Fu JuYuan
|
1f1868a75f
|
cache privilege user list.
|
2012-05-29 17:17:26 +08:00 |
|
Matthew K. Fu JuYuan
|
4f484599b7
|
Clean up code , cache other auths. Fix sidebar
|
2012-05-29 15:23:50 +08:00 |
|
Matthew K. Fu JuYuan
|
6f0cf0e92e
|
cache privilege user list.
|
2012-05-29 15:23:50 +08:00 |
Christophe Vilayphiou
|
f1c8bed29d
|
Merge branch 'design_team' into ldap
Conflicts:
vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_approvals_controller.rb
vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_news_bulletin.html.erb
|
2012-05-22 20:33:07 +08:00 |
|
Christophe Vilayphiou
|
5e9836f371
|
Changes for structure
|
2012-05-22 14:45:49 +08:00 |
Matt
|
6a022c90da
|
Changes on nccu
|
2012-05-18 15:20:45 +08:00 |
|
Matthew K. Fu JuYuan
|
5f6696a358
|
fix view for different_user for ad_banner. add field 'best size' for ad_banner within form
|
2012-05-18 14:19:13 +08:00 |
|
Christophe Vilayphiou
|
7c6b807170
|
Change impression count to exclude when :referrer is nil
|
2012-05-18 14:13:11 +08:00 |
|
Christophe Vilayphiou
|
a4afd5c1d3
|
Merge branch 'design_team' into ldap
|
2012-05-18 10:36:32 +08:00 |
|
Christophe Vilayphiou
|
8ad7f70822
|
Proof i18n_variable for categories
|
2012-05-18 10:28:28 +08:00 |
|
Christophe Vilayphiou
|
17b6a70506
|
Merge branch 'design_team' into ldap
|
2012-05-17 23:36:24 +08:00 |
|
Matthew K. Fu JuYuan
|
16ada34585
|
fix ad_banner. new ad_image with best size from ad_banner. content editable at tab
|
2012-05-17 23:35:46 +08:00 |
|
Christophe Vilayphiou
|
79f484300e
|
Merge branch 'design_team' into ldap
|
2012-05-17 18:32:06 +08:00 |
|
Christophe Vilayphiou
|
c9cbec4239
|
Asset changes, add description
|
2012-05-17 18:31:40 +08:00 |
|
Christophe Vilayphiou
|
eba4671733
|
Merge branch 'design_team' into ldap
|
2012-05-17 06:46:29 +08:00 |
|
Christophe Vilayphiou
|
cd1640482a
|
Merge branch 'nccu_0509' of github.com:Rulingcom/orbit into nccu_0509
Conflicts:
app/views/layouts/_side_bar.html.erb
|
2012-05-17 06:45:30 +08:00 |
|
Matthew K. Fu JuYuan
|
a3acd865d7
|
AdBanner reopen new banner and delete. Rename title with content editable tag.
|
2012-05-17 06:44:14 +08:00 |
|
Matthew K. Fu JuYuan
|
7f2564a81e
|
Fix sidebar and hide some links by roles
|
2012-05-17 06:43:39 +08:00 |
|
Matthew K. Fu JuYuan
|
03387d3c07
|
Object auth for ad_banner
|
2012-05-17 06:42:33 +08:00 |
|
Christophe Vilayphiou
|
6b9c8eb15d
|
Merge branch 'design_team' into ldap
|
2012-05-17 06:31:57 +08:00 |
|
Christophe Vilayphiou
|
26292f0dcc
|
Asset upload
|
2012-05-17 06:28:29 +08:00 |
|
Christophe Vilayphiou
|
9129835f23
|
Add tags to assets
|
2012-05-16 18:19:41 +08:00 |
|
Matthew K. Fu JuYuan
|
befd3bcdec
|
AdBanner reopen new banner and delete. Rename title with content editable tag.
|
2012-05-16 16:42:43 +08:00 |
Harry Bomrah
|
617a683d00
|
image insertion completed..
|
2012-05-16 16:22:50 +08:00 |
|
Harry Bomrah
|
30137b50b4
|
popup fix..
|
2012-05-16 15:33:54 +08:00 |
|
Matthew K. Fu JuYuan
|
a31a9c4792
|
Merge branch 'design_team' of https://github.com/Rulingcom/orbit into nccu_0509
Conflicts:
app/controllers/admin/object_auths_new_interface_controller.rb
app/helpers/application_helper.rb
app/models/ad_banner.rb
|
2012-05-16 12:13:07 +08:00 |
|
Matthew K. Fu JuYuan
|
88a26cc6a1
|
Fix sidebar and hide some links by roles
|
2012-05-16 12:10:16 +08:00 |
|
Christophe Vilayphiou
|
0b0916179f
|
Change assets
|
2012-05-16 11:07:11 +08:00 |
|
Christophe Vilayphiou
|
f950f77f36
|
Merge branch 'design_team' into ldap
Conflicts:
Gemfile
app/models/ad_banner.rb
|
2012-05-15 23:02:22 +08:00 |
|
Christophe Vilayphiou
|
e54f4409fb
|
Add impressionist
|
2012-05-15 21:26:09 +08:00 |
|
Matthew K. Fu JuYuan
|
3f744dab05
|
First version of app and object auth for web_resource module. Basic fund is ok. backend need to be secued
|
2012-05-15 18:55:16 +08:00 |
|
Matthew K. Fu JuYuan
|
b23b5e8ec5
|
Object auth for ad_banner
|
2012-05-15 16:39:23 +08:00 |
|
Christophe Vilayphiou
|
59b55d1574
|
Merge branch 'design_team' into ldap
|
2012-05-14 12:42:06 +08:00 |
|
Matthew K. Fu JuYuan
|
9ba4c2cf2f
|
Change to apply page to had object_auth
|
2012-05-14 12:40:50 +08:00 |
|
Matthew K. Fu JuYuan
|
2cd67356a5
|
Merge branch 'nccu_0509' of https://github.com/Rulingcom/orbit into nccu_0509
Conflicts:
config/locales/zh_tw.yml
|
2012-05-14 12:36:09 +08:00 |
|
Matthew K. Fu JuYuan
|
e1450ec748
|
Change to apply page to had object_auth
|
2012-05-14 12:34:15 +08:00 |
|
Christophe Vilayphiou
|
ebc8dd33ec
|
Merge branch 'design_team' into ldap
Conflicts:
Gemfile.lock
app/controllers/admin/module_apps_controller.rb
app/controllers/application_controller.rb
vendor/built_in_modules/web_resource/web_resource.json
|
2012-05-14 00:57:17 +08:00 |
|
Matthew K. Fu JuYuan
|
7a6d30ad62
|
Remove unless files and change routes.
|
2012-05-14 00:50:36 +08:00 |
|
Matthew K. Fu JuYuan
|
0119ab1a74
|
New Interface for App Auth and Object Auth
|
2012-05-14 00:50:12 +08:00 |
|
Matthew K. Fu JuYuan
|
8b42c595b3
|
Don't display admin in any premission select. Fix not necessary header for UT data
|
2012-05-14 00:49:22 +08:00 |
|
Christophe Vilayphiou
|
cf8d20dc84
|
Add category and tag to pages
|
2012-05-14 00:33:52 +08:00 |
|
Christophe Vilayphiou
|
e40c76bf5f
|
Fix new page form
Redirect to home when not authorized
Get only module_apps with app_pages for new and edit page
Change web_resource.json
|
2012-05-13 23:48:34 +08:00 |
|
Christophe Vilayphiou
|
17b486f9e9
|
Fix bugs for shift_to and change items.rake for the missing position in db
|
2012-05-11 17:56:26 +08:00 |
|
Matthew K. Fu JuYuan
|
0a34f0277e
|
Remove unless files and change routes.
|
2012-05-11 16:46:36 +08:00 |
|
Matthew K. Fu JuYuan
|
20a1a6e30f
|
New Interface for App Auth and Object Auth
|
2012-05-11 16:44:40 +08:00 |
|
Christophe Vilayphiou
|
fd52d00187
|
Add drag and drop to structure side_bar
|
2012-05-11 10:00:45 +08:00 |
|
Matthew K. Fu JuYuan
|
4f1e47bb82
|
Don't display admin in any premission select. Fix not necessary header for UT data
|
2012-05-10 14:43:05 +08:00 |
|
Christophe Vilayphiou
|
5eba2638ce
|
Merge branch 'design_team' into ldap
|
2012-05-10 14:17:38 +08:00 |
|
Matthew K. Fu JuYuan
|
b6aad17681
|
Appauth new interface for setting managers. Fix showing sidebar for News and Announcement when setting managers at module app page.
|
2012-05-10 14:16:37 +08:00 |
|
Matthew K. Fu JuYuan
|
87ebcc48e7
|
Appauth new interface for setting managers. Fix showing sidebar for News and Announcement when setting managers at module app page.
|
2012-05-10 11:51:44 +08:00 |
|
Christophe Vilayphiou
|
de739d7d20
|
Merge branch 'design_team' into ldap
Conflicts:
vendor/built_in_modules/web_resource/web_resource.json
|
2012-05-10 00:34:23 +08:00 |
|
Christophe Vilayphiou
|
13587306bc
|
Add list widgets for announcement, news and links with categories and tags
|
2012-05-10 00:25:30 +08:00 |
|
Christophe Vilayphiou
|
d88d4e58dc
|
Merge branch 'design_team' into ldap
Conflicts:
config/environments/development.rb
|
2012-05-09 13:51:00 +08:00 |
|
Christophe Vilayphiou
|
2b03263fb7
|
Dashboard partial implementation
|
2012-05-09 05:53:07 +08:00 |
|
Christophe Vilayphiou
|
26a50cc862
|
Add sub_menu to children
|
2012-05-09 04:15:45 +08:00 |
|
Christophe Vilayphiou
|
2b9190a49e
|
Merge branch 'design_team' into ldap
Conflicts:
config/locales/zh_tw.yml
vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb
|
2012-05-08 11:40:38 +08:00 |
|
Christophe Vilayphiou
|
1fb6c20b86
|
Add site_info
|
2012-05-07 00:54:18 +08:00 |
|
Christophe Vilayphiou
|
f190ce18ee
|
Put sorting in web_link, page_context and design
|
2012-05-05 21:20:20 +08:00 |
|
Matthew K. Fu JuYuan
|
bff3cefbc7
|
Apply app_auth to ad_banner. From now,ad_banner can only be viewed for at least manager.
|
2012-05-04 15:40:43 +08:00 |
|
Matthew K. Fu JuYuan
|
05ded8de03
|
Fix for NCCU 0430 all functions ok with two submanagers but different behavors
|
2012-05-04 15:38:18 +08:00 |
|
Christophe Vilayphiou
|
20504b2205
|
Merge branch 'design_team' into ldap
Conflicts:
app/controllers/admin/page_parts_controller.rb
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter.html.erb
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_sort_headers.html.erb
|
2012-04-30 07:57:20 +08:00 |
|
Christophe Vilayphiou
|
b8f52fa1ec
|
Separate announcement and news
|
2012-04-30 06:31:46 +08:00 |
|
Matthew K. Fu JuYuan
|
a46a8898d7
|
Integrate App & Object Auth to announcement with i18n variables. Also changed Role and SubRole i18n var. Checked with Allen
|
2012-04-30 00:24:11 +08:00 |
|
Christophe Vilayphiou
|
1f4fe65430
|
Merge branch 'design_team' into ldap
Conflicts:
app/views/devise/sessions/new.html.erb
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/_privilege_user.html.erb
|
2012-04-25 16:45:04 +08:00 |
|
Matthew K. Fu JuYuan
|
7f285f4719
|
Change ad_banner preview from using title to id
|
2012-04-25 16:10:11 +08:00 |
|
Christophe Vilayphiou
|
70f6c7b540
|
Merge branch 'design_team' into ldap
Conflicts:
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_sort_headers.html.erb
|
2012-04-24 15:28:52 +08:00 |
|
Matthew K. Fu JuYuan
|
bbcdaf00e7
|
Disable ad_banner_preview. Just show window
|
2012-04-24 14:37:06 +08:00 |
|
Matthew K. Fu JuYuan
|
e7bb9ea86b
|
Fix ad image date selector
|
2012-04-24 14:37:06 +08:00 |
|
Christophe Vilayphiou
|
d4aea664e2
|
Merge branch 'design_team' into ldap
Conflicts:
vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
|
2012-04-24 02:37:03 +08:00 |
|
Christophe Vilayphiou
|
a5b13e680f
|
Add sub_menu in r_tags
|
2012-04-24 02:30:40 +08:00 |
|
Christophe Vilayphiou
|
2eeb530422
|
Merge branch 'master' into ldap
Conflicts:
app/assets/stylesheets/new_admin.css.erb
|
2012-04-23 14:13:37 +08:00 |
|
Matthew K. Fu JuYuan
|
0c46b4da23
|
AdImage and AnBanner JS fixed
|
2012-04-23 14:07:13 +08:00 |
|
Matthew K. Fu JuYuan
|
81b0046f42
|
Preview now can be use at both ad_banner and ad_image,however it won't run correctly if user change its ad_banner at ad_image.
|
2012-04-23 14:07:13 +08:00 |
|
Matthew K. Fu JuYuan
|
e353afb5ac
|
fix i18n vars in ad_banner
|
2012-04-23 14:07:13 +08:00 |
|
Matthew K. Fu JuYuan
|
1b70852ff7
|
realtime preview is working. but save to object when preview
|
2012-04-23 14:06:37 +08:00 |
|
Matthew K. Fu JuYuan
|
ff472714de
|
AdBanner i18n vars patch
|
2012-04-23 14:05:18 +08:00 |
|
Matthew K. Fu JuYuan
|
f55b3a4374
|
Merge branch 'master' of https://github.com/Rulingcom/orbit into ldap
Conflicts:
Gemfile
Gemfile.lock
app/views/admin/attributes/_app_selector.html.erb
app/views/admin/module_apps/_app_selector.html.erb
app/views/admin/pages/_app_selector.html.erb
config/application.rb
vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb
vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
vendor/built_in_modules/new_blog/app/controllers/panel/new_blog/widget/posts_controller.rb
vendor/built_in_modules/page_content/app/controllers/panel/page_content/front_end/page_contexts_controller.rb
vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/front_end/web_links_controller.rb
vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/widget/web_links_controller.rb
|
2012-04-19 14:06:00 +08:00 |
|
Matthew K. Fu JuYuan
|
8f28d45379
|
The new AdBanner.
|
2012-04-02 03:04:38 +08:00 |
|
Matthew K. Fu JuYuan
|
928c642840
|
change layout from old admin to new_admin. not complete code
|
2012-04-02 02:58:01 +08:00 |
|
Christophe Vilayphiou
|
e953344965
|
Fix before_filter order for object_auth
|
2012-03-20 14:17:28 +08:00 |
|
Christophe Vilayphiou
|
f4fda08e86
|
Replace PrototypeR4 by Orbit.
Move session into mongoid_store.
Reset session when sing_in.
|
2012-03-16 14:58:32 +08:00 |
|
Matt Fu
|
d5a2de5476
|
LDAP with sync rake task
|
2012-03-06 16:41:06 +08:00 |
|
Matt Fu
|
cceb785a8d
|
change view and action for announcement ,Lin checked. Also add validation for object_auth make sure for each object,the object will be unique for each action.
|
2012-02-29 18:58:33 +08:00 |
Matthew Kaito Juyuan Fu
|
8932615f05
|
add "all_user" for app&object auth
|
2012-02-29 18:56:42 +08:00 |
|
Matthew Kaito Juyuan Fu
|
cc550c5745
|
First version for App and Object auth.Taking Announcement as experiment
|
2012-02-29 18:55:55 +08:00 |
|
Matthew Kaito Juyuan Fu
|
3bcd7ea349
|
Exp with object_auth
|
2012-02-29 18:50:23 +08:00 |
|
Christophe Vilayphiou
|
18617850e5
|
Add categories for all the widgets
|
2012-02-28 22:00:05 +08:00 |
|
Christophe Vilayphiou
|
fdf4cfad2d
|
Add category for announcement widget
|
2012-02-28 14:08:57 +08:00 |
Christophe Vilayphiou
|
f13ebc6c46
|
Fix bugs and changes for nccu
|
2012-02-27 18:50:56 +08:00 |
|
Christophe Vilayphiou
|
8f531a6fe5
|
Fix bus for pages and page content
|
2012-02-24 15:14:23 +08:00 |
|
Christophe Vilayphiou
|
63d7810b35
|
Add isotope, categories for announcement page, sort for announcement
|
2012-02-23 15:52:58 +08:00 |
|
unknown
|
9b001aa6c3
|
new page_content app
|
2012-02-21 19:22:42 +08:00 |
|
Christophe Vilayphiou
|
0b71714d44
|
Improve code in items, pages, links
|
2012-02-17 14:54:11 +08:00 |
|
Christophe Vilayphiou
|
cf4a6c0b35
|
Remove useless destroy methods
|
2012-02-17 12:26:03 +08:00 |
|
Christophe Vilayphiou
|
9cd3cbc478
|
Modifications for design, pages, page_parts…
Move orbit_bar out of kernel.js
|
2012-02-17 02:09:32 +08:00 |