Christophe Vilayphiou
c4d7079059
Fix's Matt code for not showing bulletins in index
2012-05-21 18:10:03 +08:00
Christophe Vilayphiou
815e6a8361
Fix matt's code and add it to filters
2012-05-19 03:19:55 +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
0f354b8ccc
fix ad_image size hints. fix orbit backend controller error when changing language.
2012-05-17 06:44:14 +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
82d78acbad
First version of app and object auth for web_resource module. Basic fund is ok. backend need to be secued
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
0647698012
fix ad_image size hints. fix orbit backend controller error when changing language.
2012-05-16 17:16:48 +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
Harry Bomrah
75cbae049b
few experiments…
2012-05-16 11:18:54 +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
Matthew K. Fu JuYuan
551e1ef740
Reflect login method. LDAP,MidSite connection. The Mysql connection now is build on fly.
2012-05-15 11:28:24 +08:00
Christophe Vilayphiou
8fcb8ef8de
Change the way links are displayed in menus in front-end
2012-05-14 21:43:10 +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
4ae8299949
Add custom title to widgets
...
Fix pagination conflict with main_content and widgets
2012-05-13 22:35:00 +08:00
Christophe Vilayphiou
281cfa6518
Changes for widgets
2012-05-13 21:55:39 +08:00
Christophe Vilayphiou
82fa85def8
Clean the parsers code
2012-05-13 19:32:05 +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
6a443f0976
Add mongoid-tree to Item
2012-05-11 16:16:09 +08:00
Harry Bomrah
2c3637e9b4
very important update for widgets management..
2012-05-11 15:27:16 +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
Matthew K. Fu JuYuan
083963af65
Test version for DB sync schedule job
2012-05-08 19:20:53 +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
Harry Bomrah
2083e0bf4f
widget structure improvised…
2012-05-07 19:00:50 +08:00
Christophe Vilayphiou
1fb6c20b86
Add site_info
2012-05-07 00:54:18 +08:00
Christophe Vilayphiou
48f8fbde7f
Fix site_locale_default_head and active for current locale
2012-05-07 00:53:52 +08:00
Christophe Vilayphiou
ce1fecaf93
Add position ordering and hiding page for i18n
2012-05-06 00:35:13 +08:00
Christophe Vilayphiou
f190ce18ee
Put sorting in web_link, page_context and design
2012-05-05 21:20:20 +08:00
Christophe Vilayphiou
b48099d752
Fix bug in is_admin?
...
Fix bug in helpers for news and announcement
2012-05-05 17:40:07 +08:00
Harry Bomrah
fcc875bb5d
app store page added… and few other changes..
2012-05-04 20:28:12 +08:00
Christophe Vilayphiou
8f1ce78ab4
Fix bug when homepage
2012-05-04 15:51:51 +08:00
Matthew K. Fu JuYuan
453cb21066
Announcement preivew
2012-05-04 15:50:45 +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
f427c3803f
clean up useless flash msgs. add i18n vars for app auth and object auth
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
Harry Bomrah
a3a1e4b92e
controller change, views working and db for paper and journals
2012-05-03 21:30:12 +08:00
Harry Bomrah
d6cbbff9de
connection page working now..
2012-05-03 14:40:54 +08:00
Christophe Vilayphiou
45e21f9569
Fix filter category in news
2012-05-02 17:55:02 +08:00
Harry Bomrah
769a67f026
the group more structured and also demo connecting with gmail account..
2012-04-30 21:17:20 +08:00
Harry Bomrah
aacd9da9fb
auto login encryption done…
2012-04-30 14:29:42 +08:00
Christophe Vilayphiou
fe54c6ae71
Fix bug when id or single object
2012-04-30 14:23:41 +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
Christophe Vilayphiou
32faef0c70
DRY code for sorting
2012-04-30 06:30:52 +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
Matthew K. Fu JuYuan
6b151b1fb6
403 for unauth apps
2012-04-30 00:24:11 +08:00
Harry Bomrah
c158375d02
with connection and some save settings…
2012-04-26 21:30:13 +08:00
Harry Bomrah
c2ac682787
updates for connections
2012-04-26 17:23:47 +08:00
Harry Bomrah
64be61d61b
with gmail widget..
2012-04-26 14:47:49 +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
Harry Bomrah
a298cbd5f6
Publication started
2012-04-24 16:45:26 +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
Harry Bomrah
670ec2a40e
Themes from db fixed..
2012-04-23 21:04:02 +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
nccu
fe9032787c
NCCU ldap debug
2012-04-23 10:13:44 +08:00
Harry Bomrah
3eaf97babe
title and heading and welcome msg…
2012-04-19 20:26:21 +08:00
Harry Bomrah
4bad25e682
Msg box added and background image saving complete
2012-04-18 22:01:12 +08:00
Harry Bomrah
95a1e266ae
Custom thème done and theme id done…
2012-04-17 21:15:40 +08:00
Harry Bomrah
02c6933d0b
Tiles position saved in db and also change them from section manager
2012-04-17 16:33:41 +08:00
Harry Bomrah
193cee2df7
new icons and widgets
2012-04-12 22:18:58 +08:00
Christophe Vilayphiou
198825a309
Merge branch 'master' 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
vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb
2012-04-12 18:50:48 +08:00
Harry Bomrah
01af32aa60
added divs with id
2012-04-12 16:52:32 +08:00
Harry Bomrah
48323ac1af
lot of changes in fetching
2012-04-12 14:44:08 +08:00
Harry Bomrah
25ca29403c
section page added
2012-04-11 17:58:52 +08:00
Harry Bomrah
5a6541a592
Setting page update
2012-04-11 17:26:25 +08:00
Harry Bomrah
edf6089e0c
Devin complete
2012-04-11 15:34:19 +08:00
Harry Bomrah
4875b339f8
Fetching desktop from db
2012-04-11 15:31:10 +08:00
Harry Bomrah
32a1be624b
Fully updated..
2012-04-09 17:55:03 +08:00
Harry Bomrah
35567c2139
Widgets Loading dynamically and semi structured
2012-04-06 23:48:03 +08:00
Harry Bomrah
e1ef2b28e7
theme changes
2012-04-06 17:49:22 +08:00
Harry Bomrah
7309d9c446
Dock change and getting values from db
2012-04-06 17:49:22 +08:00
Harry Bomrah
f5c080efd4
Model commit
2012-04-06 17:47:04 +08:00
Harry Bomrah
ddf6a606a2
with notifications and other changes
2012-04-06 17:47:03 +08:00
Harry Bomrah
6158799a47
Stupid theme
2012-04-06 17:47:03 +08:00
Harry Bomrah
77b2919d8c
Desktop Commit
2012-04-06 17:47:02 +08:00
Harry Bomrah
39e1bc8948
new setting page
2012-04-05 20:09:11 +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
Harry Bomrah
aa3997f7cf
with notifications and other changes
2012-03-29 19:50:23 +08:00
Harry Bomrah
176597f5af
Stupid theme
2012-03-29 15:23:48 +08:00
Harry Bomrah
2e283a039d
Desktop Commit
2012-03-28 18:53:30 +08:00
Christophe Vilayphiou
cf297fc424
Changed inherited controller in module_apps to OrbitBackendController
2012-03-27 18:58:04 +08:00
Christophe Vilayphiou
f5fd3dec7a
Trying nokogiri
2012-03-27 18:42:22 +08:00
nccu
a1034f90ba
close alpha on nccu
2012-03-20 14:38:01 +08:00
Christophe Vilayphiou
5fcd3cd783
Merge branch 'master' into ldap
2012-03-20 14:27:04 +08:00
Christophe Vilayphiou
e953344965
Fix before_filter order for object_auth
2012-03-20 14:17:28 +08:00
Christophe Vilayphiou
47215693c4
Merge branch 'master' into ldap
...
Conflicts:
Gemfile
Gemfile.lock
config/application.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-03-19 14:27:15 +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
Christophe Vilayphiou
b6d49df145
Change Obit to Orbit
2012-03-16 11:54:31 +08:00
Matt Fu
13b6892f87
code for new fact check
2012-03-16 11:09:44 +08:00
Christophe Vilayphiou
4dd9b7ffa4
Fix announcement pagination in front-end
2012-03-07 18:16:59 +08:00
Christophe Vilayphiou
0b1f83c042
Fix extra loaded js: the widgets only need to render layout when they need js.
2012-03-07 18:16:59 +08:00
Matt Fu
d5a2de5476
LDAP with sync rake task
2012-03-06 16:41:06 +08:00
Matt Fu
7f05f21930
Merge commit '7c55f6fb8850ef426978dd422fa782358f9ec2fe' into ldap
...
Conflicts:
config/environments/development.rb
2012-03-01 10:13:49 +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
2e58c63ff7
fix bugs with token
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
Matt Fu
9a40ecd1d9
Merge branch 'design_team' into ldap for NCCU 0229 demo on Redmine
...
Conflicts:
app/views/devise/passwords/new.html.erb
app/views/devise/sessions/new.html.erb
2012-02-29 13:07:21 +08:00
Matt Fu
b84b7bad63
ldap config for 0229 nccu demo
2012-02-29 12:35:54 +08:00
Christophe Vilayphiou
9aa4173933
Change orbit-bar for language but bug when user name is too long
2012-02-29 04:21:56 +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
7f9a7edc98
Changes in bulletins widget and front-end, add categories to link
2012-02-28 04:24:09 +08:00
Christophe Vilayphiou
f13ebc6c46
Fix bugs and changes for nccu
2012-02-27 18:50:56 +08:00
Matt Fu
3209f9aa27
Complete for 229 check.
2012-02-24 19:07:47 +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
Matt Fu
678f1eabef
LDAP connection and modified Devise
2012-02-22 14:43:24 +08:00
unknown
9b001aa6c3
new page_content app
2012-02-21 19:22:42 +08:00
Christophe Vilayphiou
a3f152b200
Changes for jquery 1.7 (.live -> .on), create module_layout
2012-02-20 03:24:05 +08:00
Christophe Vilayphiou
44a346ffe9
Changes for orbit bar, login
2012-02-19 16:33:22 +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
Christophe Vilayphiou
e0accbecaa
Changes into page_part edition.
...
Can choose between 'text', 'public_r_tag' and 'widget'
2012-02-16 13:09:09 +08:00
unknown
edf236c1c7
edit tags
2012-02-15 15:38:27 +08:00
Christophe Vilayphiou
af3a2547e1
Change ModuleAppTag into "Module name"Tag.
2012-02-15 15:18:11 +08:00
Christophe Vilayphiou
d0c2856a3a
Fix relations error in tags
2012-02-15 11:42:19 +08:00
Christophe Vilayphiou
3e70634add
Announcement modifications and tags
2012-02-15 00:34:22 +08:00
Christophe Vilayphiou
55ae7de01c
Orbit-bar in front-end and back-end, side-bar and drop-down menu
2012-02-15 00:34:22 +08:00
Matthew Kaito Juyuan Fu
436f039c1b
build interface to work with object auth. Go to panel/new_blog/back_end/posts/ ,click New Auth link
2012-02-15 00:34:21 +08:00
Matthew Kaito Juyuan Fu
e20739e32b
Object Auth. Now object can be included with "include OrbitCoreLib::ObjectAuthable" to use kernel method,such as
...
1.Object.authed_for_user(user,title_of_object_auth). title_of_object_auth is optional
2.object.authed_users(user,title_of_object_auth) . title_of_object_auth is optional
if title_of_object_auth is not given,then it will return calculation across all possiblity.
2012-02-15 00:34:21 +08:00
Matthew Kaito Juyuan Fu
3ed9b81df9
first commit for object auth,will take new_blog for experiment
2012-02-15 00:34:21 +08:00
Christophe Vilayphiou
872a00b6a2
Forgot to change title in key in pages_controller
2012-02-06 22:09:33 +08:00
Matthew Kaito Juyuan Fu
a980847eb3
Basic function for AdBanner
2012-02-01 14:27:51 +08:00
Christophe Vilayphiou
4906894fb5
Page edit wasn't showing when module_app was nil
2012-01-31 16:35:40 +08:00
Christophe Vilayphiou
762c2f5e8a
Add key in module_app.rb to use instead of title for authorization
2012-01-30 18:12:18 +08:00
Christophe Vilayphiou
46db173e0b
Modifications in the Design code: the uploader works but the edit is broken
2012-01-26 12:05:25 +08:00
Christophe Vilayphiou
783eae4597
Change "NewBlog" folders into "new_blog" in assets
...
Modify routes and pages handling for clean front-end urls
2012-01-24 18:16:58 +08:00
Matthew Fu
afbb9e266a
User role and sub_role simple interface complete
2012-01-24 12:28:33 +08:00
Matthew Fu
959f3e8b2f
put setup APP var setup into Orbit class
2012-01-24 12:28:32 +08:00
Matthew Fu
4ed8a2164c
First complete with manager and submanager
2012-01-24 12:28:32 +08:00
Matthew Fu
4df8ab6cc3
Add methods to work with manager role,add task to build user test data
2012-01-24 12:28:32 +08:00
Matthew Fu
18a82d7f47
Manger and SubManager
2012-01-24 12:28:32 +08:00
Christophe Vilayphiou
9fcf8280fa
Change "_filename" to "_identifier" for carrierwave
2012-01-24 11:57:27 +08:00
Christophe Vilayphiou
5518ae362d
Ray's modification before redesign
2012-01-24 11:57:27 +08:00
unknown
4cfae9c107
announcement widget query
2012-01-18 21:34:26 +08:00
chris2tof
4be97f6ea6
Merge branch 'fix_it'
...
Conflicts:
app/assets/javascripts/page_edit.js
app/assets/javascripts/rss.js
app/assets/stylesheets/admin.css.erb
app/assets/stylesheets/admin_back_end.css.erb
app/controllers/admin/app_auths_controller.rb
app/controllers/admin/module_apps_controller.rb
app/controllers/admin/users_controller.rb
app/controllers/application_controller.rb
app/models/app_auth.rb
app/models/user/user.rb
app/views/admin/app_auths/index.html.erb
app/views/admin/attributes/_attribute_field.html.erb
app/views/admin/designs/_new.html.erb
app/views/admin/designs/new.html.erb
app/views/admin/infos/_form.html.erb
app/views/admin/module_apps/_app_selector.html.erb
app/views/admin/module_apps/index.html.erb
app/views/admin/pages/_form.html.erb
app/views/admin/roles/_form.html.erb
app/views/admin/roles/_sub_role.html.erb
app/views/admin/users/_form.html.erb
app/views/admin/users/_show_sub_role.html.erb
app/views/admin/users/_sub_role.html.erb
app/views/admin/users/edit.html.erb
app/views/admin/users/index.html.erb
app/views/admin/users/new.html.erb
app/views/admin/users/show.html.erb
app/views/layouts/admin.html.erb
lib/fraisier/layout.html
lib/parsers/parser_back_end.rb
lib/parsers/parser_layout.rb
lib/tasks/dev.rake
spec/models/app_auth_basic.rb
vendor/built_in_modules/NewBlog/.gitignore
vendor/built_in_modules/NewBlog/Gemfile
vendor/built_in_modules/NewBlog/Gemfile.lock
vendor/built_in_modules/NewBlog/MIT-LICENSE
vendor/built_in_modules/NewBlog/NewBlog.gemspec
vendor/built_in_modules/NewBlog/README.rdoc
vendor/built_in_modules/NewBlog/Rakefile
vendor/built_in_modules/NewBlog/app/assets/images/NewBlog/.gitkeep
vendor/built_in_modules/NewBlog/app/assets/javascripts/NewBlog/.gitkeep
vendor/built_in_modules/NewBlog/app/assets/stylesheets/NewBlog/.gitkeep
vendor/built_in_modules/NewBlog/app/assets/stylesheets/NewBlog/application.css
vendor/built_in_modules/NewBlog/app/assets/stylesheets/NewBlog/production.css
vendor/built_in_modules/NewBlog/app/controllers/.gitkeep
vendor/built_in_modules/NewBlog/app/controllers/application_controller.rb
vendor/built_in_modules/NewBlog/app/controllers/panel/blog/back_end/posts_controller.rb
vendor/built_in_modules/NewBlog/app/helpers/.gitkeep
vendor/built_in_modules/NewBlog/app/helpers/application_helper.rb
vendor/built_in_modules/NewBlog/app/mailers/.gitkeep
vendor/built_in_modules/NewBlog/app/models/.gitkeep
vendor/built_in_modules/NewBlog/app/models/comment.rb
vendor/built_in_modules/NewBlog/app/models/post.rb
vendor/built_in_modules/NewBlog/app/views/.gitkeep
vendor/built_in_modules/NewBlog/app/views/layouts/application.html.erb
vendor/built_in_modules/NewBlog/app/views/layouts/edit_view.html.erb
vendor/built_in_modules/NewBlog/app/views/layouts/production.html.erb
vendor/built_in_modules/NewBlog/app/views/panel/blog/back_end/posts/_form.html.erb
vendor/built_in_modules/NewBlog/app/views/panel/blog/back_end/posts/index.html.erb
vendor/built_in_modules/NewBlog/app/views/panel/blog/back_end/posts/latest_post.html.erb
vendor/built_in_modules/NewBlog/app/views/panel/blog/back_end/posts/new.html.erb
vendor/built_in_modules/NewBlog/app/views/panel/blog/back_end/posts/show.html.erb
vendor/built_in_modules/NewBlog/app/views/panel/blog/front_end/posts/show.html.erb
vendor/built_in_modules/NewBlog/app/views/panel/blog/widget/posts/index.html.erb
vendor/built_in_modules/NewBlog/app/views/panel/blog/widget/posts/latest_post.html.erb
vendor/built_in_modules/NewBlog/config/locales/en.yml
vendor/built_in_modules/NewBlog/lib/NewBlog.rb
vendor/built_in_modules/NewBlog/lib/NewBlog/engine.rb
vendor/built_in_modules/NewBlog/lib/NewBlog/version.rb
vendor/built_in_modules/NewBlog/lib/tasks/NewBlog_tasks.rake
vendor/built_in_modules/NewBlog/script/rails
vendor/built_in_modules/NewBlog/test/NewBlog_test.rb
vendor/built_in_modules/NewBlog/test/dummy/Rakefile
vendor/built_in_modules/NewBlog/test/dummy/app/assets/javascripts/application.js
vendor/built_in_modules/NewBlog/test/dummy/app/assets/stylesheets/application.css
vendor/built_in_modules/NewBlog/test/dummy/app/controllers/application_controller.rb
vendor/built_in_modules/NewBlog/test/dummy/app/helpers/application_helper.rb
vendor/built_in_modules/NewBlog/test/dummy/app/mailers/.gitkeep
vendor/built_in_modules/NewBlog/test/dummy/app/models/.gitkeep
vendor/built_in_modules/NewBlog/test/dummy/app/views/layouts/application.html.erb
vendor/built_in_modules/NewBlog/test/dummy/config.ru
vendor/built_in_modules/NewBlog/test/dummy/config/application.rb
vendor/built_in_modules/NewBlog/test/dummy/config/boot.rb
vendor/built_in_modules/NewBlog/test/dummy/config/database.yml
vendor/built_in_modules/NewBlog/test/dummy/config/environment.rb
vendor/built_in_modules/NewBlog/test/dummy/config/environments/development.rb
vendor/built_in_modules/NewBlog/test/dummy/config/environments/production.rb
vendor/built_in_modules/NewBlog/test/dummy/config/environments/test.rb
vendor/built_in_modules/NewBlog/test/dummy/config/initializers/backtrace_silencers.rb
vendor/built_in_modules/NewBlog/test/dummy/config/initializers/inflections.rb
vendor/built_in_modules/NewBlog/test/dummy/config/initializers/mime_types.rb
vendor/built_in_modules/NewBlog/test/dummy/config/initializers/secret_token.rb
vendor/built_in_modules/NewBlog/test/dummy/config/initializers/session_store.rb
vendor/built_in_modules/NewBlog/test/dummy/config/initializers/wrap_parameters.rb
vendor/built_in_modules/NewBlog/test/dummy/config/locales/en.yml
vendor/built_in_modules/NewBlog/test/dummy/config/mongoid.yml
vendor/built_in_modules/NewBlog/test/dummy/config/routes.rb
vendor/built_in_modules/NewBlog/test/dummy/lib/assets/.gitkeep
vendor/built_in_modules/NewBlog/test/dummy/log/.gitkeep
vendor/built_in_modules/NewBlog/test/dummy/public/404.html
vendor/built_in_modules/NewBlog/test/dummy/public/422.html
vendor/built_in_modules/NewBlog/test/dummy/public/500.html
vendor/built_in_modules/NewBlog/test/dummy/public/favicon.ico
vendor/built_in_modules/NewBlog/test/dummy/script/rails
vendor/built_in_modules/NewBlog/test/integration/navigation_test.rb
vendor/built_in_modules/NewBlog/test/test_helper.rb
vendor/built_in_modules/blog/app/controllers/application_controller.rb
vendor/built_in_modules/blog/app/controllers/panel/blog/posts_controller.rb
vendor/built_in_modules/blog/app/helpers/application_helper.rb
vendor/built_in_modules/blog/app/models/comment.rb
vendor/built_in_modules/blog/app/models/post.rb
vendor/built_in_modules/blog/app/views/layouts/application.html.erb
vendor/built_in_modules/blog/app/views/panel/blog/posts/_form.html.erb
vendor/built_in_modules/blog/app/views/panel/blog/posts/index.html.erb
vendor/built_in_modules/blog/app/views/panel/blog/posts/show.html.erb
vendor/built_in_modules/blog/config/initializers/backtrace_silencers.rb
vendor/built_in_modules/blog/config/initializers/inflections.rb
vendor/built_in_modules/blog/config/initializers/mime_types.rb
vendor/built_in_modules/blog/public/404.html
vendor/built_in_modules/blog/public/422.html
vendor/built_in_modules/blog/public/500.html
vendor/built_in_modules/blog/public/favicon.ico
vendor/built_in_modules/blog/public/stylesheets/.gitkeep
vendor/built_in_modules/blog/script/rails
vendor/built_in_modules/blog/vendor/plugins/.gitkeep
vendor/built_in_modules/new_blog/.gitignore
vendor/built_in_modules/new_blog/Gemfile
vendor/built_in_modules/new_blog/Gemfile.lock
vendor/built_in_modules/new_blog/MIT-LICENSE
vendor/built_in_modules/new_blog/README.rdoc
vendor/built_in_modules/new_blog/Rakefile
vendor/built_in_modules/new_blog/app/assets/images/NewBlog/.gitkeep
vendor/built_in_modules/new_blog/app/assets/javascripts/NewBlog/.gitkeep
vendor/built_in_modules/new_blog/app/assets/stylesheets/NewBlog/.gitkeep
vendor/built_in_modules/new_blog/app/assets/stylesheets/NewBlog/application.css
vendor/built_in_modules/new_blog/app/assets/stylesheets/NewBlog/production.css
vendor/built_in_modules/new_blog/app/controllers/.gitkeep
vendor/built_in_modules/new_blog/app/controllers/application_controller.rb
vendor/built_in_modules/new_blog/app/controllers/panel/new_blog/back_end/posts_controller.rb
vendor/built_in_modules/new_blog/app/helpers/.gitkeep
vendor/built_in_modules/new_blog/app/mailers/.gitkeep
vendor/built_in_modules/new_blog/app/models/.gitkeep
vendor/built_in_modules/new_blog/app/models/comment.rb
vendor/built_in_modules/new_blog/app/models/post.rb
vendor/built_in_modules/new_blog/app/views/.gitkeep
vendor/built_in_modules/new_blog/app/views/layouts/application.html.erb
vendor/built_in_modules/new_blog/app/views/layouts/edit_view.html.erb
vendor/built_in_modules/new_blog/app/views/layouts/production.html.erb
vendor/built_in_modules/new_blog/app/views/panel/new_blog/back_end/posts/_form.html.erb
vendor/built_in_modules/new_blog/app/views/panel/new_blog/back_end/posts/index.html.erb
vendor/built_in_modules/new_blog/app/views/panel/new_blog/back_end/posts/latest_post.html.erb
vendor/built_in_modules/new_blog/app/views/panel/new_blog/back_end/posts/new.html.erb
vendor/built_in_modules/new_blog/app/views/panel/new_blog/back_end/posts/show.html.erb
vendor/built_in_modules/new_blog/app/views/panel/new_blog/front_end/posts/show.html.erb
vendor/built_in_modules/new_blog/app/views/panel/new_blog/widget/posts/index.html.erb
vendor/built_in_modules/new_blog/app/views/panel/new_blog/widget/posts/latest_post.html.erb
vendor/built_in_modules/new_blog/config/locales/en.yml
vendor/built_in_modules/new_blog/lib/new_blog/version.rb
vendor/built_in_modules/new_blog/lib/tasks/NewBlog_tasks.rake
vendor/built_in_modules/new_blog/new_blog.gemspec
vendor/built_in_modules/new_blog/script/rails
vendor/built_in_modules/new_blog/test/NewBlog_test.rb
vendor/built_in_modules/new_blog/test/dummy/Rakefile
vendor/built_in_modules/new_blog/test/dummy/app/assets/javascripts/application.js
vendor/built_in_modules/new_blog/test/dummy/app/assets/stylesheets/application.css
vendor/built_in_modules/new_blog/test/dummy/app/controllers/application_controller.rb
vendor/built_in_modules/new_blog/test/dummy/app/helpers/application_helper.rb
vendor/built_in_modules/new_blog/test/dummy/app/mailers/.gitkeep
vendor/built_in_modules/new_blog/test/dummy/app/models/.gitkeep
vendor/built_in_modules/new_blog/test/dummy/app/views/layouts/application.html.erb
vendor/built_in_modules/new_blog/test/dummy/config.ru
vendor/built_in_modules/new_blog/test/dummy/config/application.rb
vendor/built_in_modules/new_blog/test/dummy/config/boot.rb
vendor/built_in_modules/new_blog/test/dummy/config/database.yml
vendor/built_in_modules/new_blog/test/dummy/config/environment.rb
vendor/built_in_modules/new_blog/test/dummy/config/environments/development.rb
vendor/built_in_modules/new_blog/test/dummy/config/environments/production.rb
vendor/built_in_modules/new_blog/test/dummy/config/environments/test.rb
vendor/built_in_modules/new_blog/test/dummy/config/initializers/backtrace_silencers.rb
vendor/built_in_modules/new_blog/test/dummy/config/initializers/inflections.rb
vendor/built_in_modules/new_blog/test/dummy/config/initializers/mime_types.rb
vendor/built_in_modules/new_blog/test/dummy/config/initializers/secret_token.rb
vendor/built_in_modules/new_blog/test/dummy/config/initializers/session_store.rb
vendor/built_in_modules/new_blog/test/dummy/config/initializers/wrap_parameters.rb
vendor/built_in_modules/new_blog/test/dummy/config/locales/en.yml
vendor/built_in_modules/new_blog/test/dummy/config/mongoid.yml
vendor/built_in_modules/new_blog/test/dummy/config/routes.rb
vendor/built_in_modules/new_blog/test/dummy/lib/assets/.gitkeep
vendor/built_in_modules/new_blog/test/dummy/log/.gitkeep
vendor/built_in_modules/new_blog/test/dummy/public/404.html
vendor/built_in_modules/new_blog/test/dummy/public/422.html
vendor/built_in_modules/new_blog/test/dummy/public/500.html
vendor/built_in_modules/new_blog/test/dummy/public/favicon.ico
vendor/built_in_modules/new_blog/test/dummy/script/rails
vendor/built_in_modules/new_blog/test/integration/navigation_test.rb
vendor/built_in_modules/new_blog/test/test_helper.rb
vendor/plugins/NewBlog/.gitignore
vendor/plugins/NewBlog/Gemfile
vendor/plugins/NewBlog/Gemfile.lock
vendor/plugins/NewBlog/MIT-LICENSE
vendor/plugins/NewBlog/NewBlog.gemspec
vendor/plugins/NewBlog/README.rdoc
vendor/plugins/NewBlog/Rakefile
vendor/plugins/NewBlog/app/assets/images/NewBlog/.gitkeep
vendor/plugins/NewBlog/app/assets/javascripts/NewBlog/.gitkeep
vendor/plugins/NewBlog/app/assets/stylesheets/NewBlog/.gitkeep
vendor/plugins/NewBlog/app/assets/stylesheets/NewBlog/application.css
vendor/plugins/NewBlog/app/assets/stylesheets/NewBlog/production.css
vendor/plugins/NewBlog/app/controllers/.gitkeep
vendor/plugins/NewBlog/app/helpers/.gitkeep
vendor/plugins/NewBlog/app/mailers/.gitkeep
vendor/plugins/NewBlog/app/models/.gitkeep
vendor/plugins/NewBlog/app/views/.gitkeep
vendor/plugins/NewBlog/app/views/layouts/edit_view.html.erb
vendor/plugins/NewBlog/app/views/layouts/production.html.erb
vendor/plugins/NewBlog/app/views/panel/blog/posts/index.html.erb
vendor/plugins/NewBlog/app/views/panel/blog/posts/latest_post.html.erb
vendor/plugins/NewBlog/app/views/panel/blog/posts/new.html.erb
vendor/plugins/NewBlog/app/views/panel/blog/posts/show.html.erb
vendor/plugins/NewBlog/app/views/panel/blog/posts/widget_index.html.erb
vendor/plugins/NewBlog/app/views/panel/blog/posts/widget_latest_post.html.erb
vendor/plugins/NewBlog/config/locales/en.yml
vendor/plugins/NewBlog/lib/NewBlog/version.rb
vendor/plugins/NewBlog/lib/tasks/NewBlog_tasks.rake
vendor/plugins/NewBlog/script/rails
vendor/plugins/NewBlog/test/NewBlog_test.rb
vendor/plugins/NewBlog/test/dummy/Rakefile
vendor/plugins/NewBlog/test/dummy/app/assets/javascripts/application.js
vendor/plugins/NewBlog/test/dummy/app/assets/stylesheets/application.css
vendor/plugins/NewBlog/test/dummy/app/controllers/application_controller.rb
vendor/plugins/NewBlog/test/dummy/app/mailers/.gitkeep
vendor/plugins/NewBlog/test/dummy/app/models/.gitkeep
vendor/plugins/NewBlog/test/dummy/app/views/layouts/application.html.erb
vendor/plugins/NewBlog/test/dummy/config.ru
vendor/plugins/NewBlog/test/dummy/config/application.rb
vendor/plugins/NewBlog/test/dummy/config/boot.rb
vendor/plugins/NewBlog/test/dummy/config/database.yml
vendor/plugins/NewBlog/test/dummy/config/environment.rb
vendor/plugins/NewBlog/test/dummy/config/environments/development.rb
vendor/plugins/NewBlog/test/dummy/config/environments/production.rb
vendor/plugins/NewBlog/test/dummy/config/environments/test.rb
vendor/plugins/NewBlog/test/dummy/config/initializers/secret_token.rb
vendor/plugins/NewBlog/test/dummy/config/initializers/session_store.rb
vendor/plugins/NewBlog/test/dummy/config/initializers/wrap_parameters.rb
vendor/plugins/NewBlog/test/dummy/config/locales/en.yml
vendor/plugins/NewBlog/test/dummy/config/mongoid.yml
vendor/plugins/NewBlog/test/dummy/config/routes.rb
vendor/plugins/NewBlog/test/integration/navigation_test.rb
vendor/plugins/NewBlog/test/test_helper.rb
2012-01-12 18:15:43 +08:00
Matthew Fu
c0efb5d1bc
Listing for Module-apps
2012-01-12 14:13:41 +08:00
Matthew Fu
cae3daa9c4
Change NewBlog to new_blog
2012-01-10 18:29:11 +08:00
Matthew Fu
79f778ad8c
creating for disabling widgets and frontend
2012-01-05 16:21:33 +08:00
Matthew Fu
7b40706aed
fixing for app_auth
2012-01-05 16:20:51 +08:00
chris2tof
ea19f11fe2
Integrate Harry's modifications to reload pop-up content
2011-12-29 14:09:06 +08:00
chris2tof
245def9cb6
Integration of pop-up and generic js.erb
2011-12-28 20:49:53 +08:00
chris2tof
62aaf79491
Merge with sub_roles
2011-12-23 18:34:21 +08:00
Matthew Fu
d3ca1647be
fix page form bugs
2011-12-23 13:54:28 +08:00