0c4f1d91f7
Merge branch 'ad_banner' into ldap
2012-04-24 16:46:04 +08:00
db46803cda
R4-Billingual
2012-04-24 16:43:45 +08:00
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
33640de184
Changes for Billingual
2012-04-24 14:37:06 +08:00
c57ba305e9
Fix ad_banner
2012-04-24 14:37:06 +08:00
c856b4cdce
Fix for upload image component in announcement
2012-04-24 12:41:28 +08:00
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
a5b13e680f
Add sub_menu in r_tags
2012-04-24 02:30:40 +08:00
2eeb530422
Merge branch 'master' into ldap
...
Conflicts:
app/assets/stylesheets/new_admin.css.erb
2012-04-23 14:13:37 +08:00
8eedbc951e
add i18n vars
2012-04-23 14:07:14 +08:00
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
e353afb5ac
fix i18n vars in ad_banner
2012-04-23 14:07:13 +08:00
1b70852ff7
realtime preview is working. but save to object when preview
2012-04-23 14:06:37 +08:00
ff472714de
AdBanner i18n vars patch
2012-04-23 14:05:18 +08:00
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
1a6242edbd
fix ad_banner sidebar
2012-04-05 17:41:43 +08:00
d8b20ae993
fix ad_banner sidebar
2012-04-05 11:11:48 +08:00
a9988a0d5c
Change for interface,form.
2012-04-02 11:00:51 +08:00
8f28d45379
The new AdBanner.
2012-04-02 03:04:38 +08:00
32b7d95669
Fix parser_back_end & side_bar & meta
2012-03-30 15:51:29 +08:00
a1034f90ba
close alpha on nccu
2012-03-20 14:38:01 +08:00
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
b58db48d26
Changes in Gemfile
2012-03-19 14:04:28 +08:00
f4fda08e86
Replace PrototypeR4 by Orbit.
...
Move session into mongoid_store.
Reset session when sing_in.
2012-03-16 14:58:32 +08:00
d5a2de5476
LDAP with sync rake task
2012-03-06 16:41:06 +08:00
7f05f21930
Merge commit '7c55f6fb8850ef426978dd422fa782358f9ec2fe' into ldap
...
Conflicts:
config/environments/development.rb
2012-03-01 10:13:49 +08:00
2e58c63ff7
fix bugs with token
2012-02-29 18:56:42 +08:00
cc550c5745
First version for App and Object auth.Taking Announcement as experiment
2012-02-29 18:55:55 +08:00
6b2aeadde6
Changes for nccu
2012-02-29 16:01:50 +08:00
819f815023
for different database for demo
2012-02-29 13:15:25 +08:00
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
b84b7bad63
ldap config for 0229 nccu demo
2012-02-29 12:35:54 +08:00
10fd8ce455
Change locales for orbit
2012-02-29 10:48:15 +08:00
4b7b57bb3d
Add some missing translations
2012-02-29 04:48:21 +08:00
3209f9aa27
Complete for 229 check.
2012-02-24 19:07:47 +08:00
53ed4b0404
Initial changes in announcement for sorting and filtering
2012-02-23 15:51:33 +08:00
ba4d71a026
Changes in orbit_bar and js in announcements
2012-02-23 15:51:33 +08:00
678f1eabef
LDAP connection and modified Devise
2012-02-22 14:43:24 +08:00
44a346ffe9
Changes for orbit bar, login
2012-02-19 16:33:22 +08:00
4389f0cf28
Add new created files to previous commit
2012-02-16 13:09:09 +08:00
e0accbecaa
Changes into page_part edition.
...
Can choose between 'text', 'public_r_tag' and 'widget'
2012-02-16 13:09:09 +08:00
a0f58b543b
Remove ckeditor
2012-02-15 01:05:24 +08:00
3e70634add
Announcement modifications and tags
2012-02-15 00:34:22 +08:00
55ae7de01c
Orbit-bar in front-end and back-end, side-bar and drop-down menu
2012-02-15 00:34:22 +08:00
dcc6a53430
brief starting for dashboard,adds i18n vars
2012-02-15 00:34:21 +08:00
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
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
3ed9b81df9
first commit for object auth,will take new_blog for experiment
2012-02-15 00:34:21 +08:00
e02c675595
Put back exception notifications
2012-02-06 16:25:33 +08:00
f097f83f2b
announcement_category edit
2012-02-06 16:20:51 +08:00
Christophe Vilayphiou
Matthew K. Fu JuYuan
nccu
Matt Fu
Matthew Kaito Juyuan Fu
Christophe Vilayphiou
unknown