Christophe Vilayphiou
|
2362e1cfdd
|
Merge branch 'design_team' into ldap
|
2012-04-27 15:28:32 +08:00 |
|
Christophe Vilayphiou
|
3beb035101
|
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
|
2012-04-27 11:11:56 +08:00 |
Christophe Vilayphiou
|
5aca3db95f
|
Ray's changes for structure and web_links
|
2012-04-27 11:02:56 +08:00 |
|
Christophe Vilayphiou
|
7d6b82d9dd
|
Merge branch 'ad_banner' into ldap
|
2012-04-26 17:15:44 +08:00 |
Matthew K. Fu JuYuan
|
4af2068c1f
|
Fix ad_banner sec and msec
|
2012-04-26 17:11:06 +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 |
|
Christophe Vilayphiou
|
f05b7db73a
|
Fix for parser sub_menu
Add style to the sub_menu
|
2012-04-24 11:26:36 +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 |
nccu
|
fe9032787c
|
NCCU ldap debug
|
2012-04-23 10:13:44 +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 |
|
Christophe Vilayphiou
|
6f9363ef54
|
Fix bugs in upload design and missing menu
|
2012-04-06 17:37:45 +08:00 |
unknown
|
d45725cf3b
|
fix announcement & add lang tab
|
2012-04-05 15:23:20 +08:00 |
|
Christophe Vilayphiou
|
1b79400f44
|
Fix menu for frontend
|
2012-04-05 14:06:58 +08:00 |
|
Christophe Vilayphiou
|
7e922d8ed4
|
Fic bug from merge
|
2012-04-02 10:54:48 +08:00 |
|
Matthew K. Fu JuYuan
|
8f28d45379
|
The new AdBanner.
|
2012-04-02 03:04:38 +08:00 |
|
Christophe Vilayphiou
|
32519f308f
|
Fix several bus when there is no design
|
2012-04-02 02:41:42 +08:00 |
|
Christophe Vilayphiou
|
32b7d95669
|
Fix parser_back_end & side_bar & meta
|
2012-03-30 15:51:29 +08:00 |
|
Christophe Vilayphiou
|
717e50a25e
|
Add rake task for layout with nokogiri
|
2012-03-27 19:00:03 +08:00 |
|
Christophe Vilayphiou
|
c5f6dbc1c4
|
Nokogiri in parsers
|
2012-03-27 19:00:03 +08:00 |
|
Christophe Vilayphiou
|
0f60ab9fc2
|
Add ad_banner to nokogiri
|
2012-03-27 18:58:48 +08:00 |
|
Christophe Vilayphiou
|
7eff06a378
|
Trying nokogiri
|
2012-03-27 18:58:48 +08:00 |
|
Christophe Vilayphiou
|
d02bbdbaa5
|
Nokogiri in parsers
|
2012-03-27 18:58:04 +08:00 |
Matt Fu
|
3ba89ecbcf
|
Fact check program completed,Lin checked
|
2012-03-27 18:54:03 +08:00 |
|
Christophe Vilayphiou
|
7efaddf57c
|
Add ad_banner to nokogiri
|
2012-03-27 18:42:22 +08:00 |
|
Christophe Vilayphiou
|
f5fd3dec7a
|
Trying nokogiri
|
2012-03-27 18:42:22 +08:00 |
|
Christophe Vilayphiou
|
a126935d2c
|
Clean the parsers and introduce the metas
|
2012-03-21 18:30:12 +08:00 |
|
Matt Fu
|
13b6892f87
|
code for new fact check
|
2012-03-16 11:09:44 +08:00 |
|
Christophe Vilayphiou
|
3e22c6e61b
|
Add bootstrap-orbit.css in front-end
|
2012-03-07 18:16:59 +08:00 |
|
Christophe Vilayphiou
|
4dd9b7ffa4
|
Fix announcement pagination in front-end
|
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
|
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 |
|
Christophe Vilayphiou
|
6b2aeadde6
|
Changes for nccu
|
2012-02-29 16:01:50 +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 |
|
Christophe Vilayphiou
|
6a30b0a1e4
|
Add RSS event
|
2012-02-28 18:29:13 +08:00 |
|
Christophe Vilayphiou
|
fdf4cfad2d
|
Add category for announcement widget
|
2012-02-28 14:08:57 +08:00 |
|
Christophe Vilayphiou
|
680b28023a
|
Fix ad_banner loading
|
2012-02-27 18:50:56 +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 |
|
unknown
|
20c320961f
|
edit page_content
|
2012-02-23 15:13:36 +08:00 |
|
Christophe Vilayphiou
|
44a346ffe9
|
Changes for orbit bar, login
|
2012-02-19 16:33:22 +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
|
e61aa6b210
|
Modify dev.rake to create the ModuleApp object for web_recsource
|
2012-02-16 13:28:51 +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 |
|
Matthew Kaito Juyuan Fu
|
8ef2d4b02e
|
include ad_banner query code. cleaned up parser
|
2012-02-15 00:34:21 +08:00 |