Christophe Vilayphiou
|
6728c35023
|
Fix side_bar.
In the case of tags, take the uri instead of controller name
|
2012-04-12 18:14:00 +08:00 |
|
Christophe Vilayphiou
|
015c0cb452
|
Delete useless code in items
|
2012-04-12 18:13:10 +08:00 |
|
Christophe Vilayphiou
|
93ac99d235
|
Add missing css in "inc"
|
2012-04-12 18:12:46 +08:00 |
Matthew K. Fu JuYuan
|
b54578ce1e
|
ad banner preview
|
2012-04-12 07:14:06 +08:00 |
|
Matthew K. Fu JuYuan
|
83b4443910
|
add pic and js for permission checkbox and filter
|
2012-04-12 07:14:06 +08:00 |
|
Matthew K. Fu JuYuan
|
57402b8602
|
add permission-checkbox js
|
2012-04-12 07:14:06 +08:00 |
|
Matthew K. Fu JuYuan
|
e4c41ab54c
|
A filter UI for permission select. with Harry's JS
|
2012-04-12 07:14:06 +08:00 |
|
Christophe Vilayphiou
|
5417c6fec0
|
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
Conflicts:
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter.html.erb
|
2012-04-12 07:13:13 +08:00 |
Christophe Vilayphiou
|
7bca339a5b
|
Ray's fix for columns width in bulletins
|
2012-04-12 07:01:34 +08:00 |
|
Christophe Vilayphiou
|
486845460c
|
Filter and delete for bulletins
|
2012-04-12 06:50:36 +08:00 |
|
Christophe Vilayphiou
|
963a0cb604
|
Change filter to js with history for bulletins
|
2012-04-07 00:20:52 +08:00 |
|
Christophe Vilayphiou
|
253f4bcb54
|
Ray's changes for orbit bar
|
2012-04-06 18:06:57 +08:00 |
|
Christophe Vilayphiou
|
6f9363ef54
|
Fix bugs in upload design and missing menu
|
2012-04-06 17:37:45 +08:00 |
|
Christophe Vilayphiou
|
ad740b0daf
|
Missing end tag in side_bar
|
2012-04-05 18:13:52 +08:00 |
|
Christophe Vilayphiou
|
894f8764d8
|
Merge branch 'ad_banner' of github.com:Rulingcom/orbit into ad_banner
Conflicts:
app/views/layouts/_side_bar.html.erb
|
2012-04-05 17:42:55 +08:00 |
|
Matthew K. Fu JuYuan
|
01bda515a6
|
fact_check with Ray's permission check.
needs Ray's new css
|
2012-04-05 17:41:43 +08:00 |
|
Christophe Vilayphiou
|
ef8eb0450b
|
Changes in tinymce bar
|
2012-04-05 17:28:21 +08:00 |
unknown
|
d45725cf3b
|
fix announcement & add lang tab
|
2012-04-05 15:23:20 +08:00 |
|
Matthew K. Fu JuYuan
|
ef88c2dbc2
|
fact_check with Ray's permission check.
needs Ray's new css
|
2012-04-05 15:06:01 +08:00 |
|
Christophe Vilayphiou
|
1259d62249
|
Fix mainTablePosition in js -> remove the notable class
|
2012-04-05 14:55:41 +08:00 |
|
Christophe Vilayphiou
|
cedd782e7f
|
Sidebar fix for ad_banner
|
2012-04-05 13:55:03 +08:00 |
|
Matthew K. Fu JuYuan
|
d8b20ae993
|
fix ad_banner sidebar
|
2012-04-05 11:11:48 +08:00 |
|
Matthew K. Fu JuYuan
|
a9988a0d5c
|
Change for interface,form.
|
2012-04-02 11:00:51 +08:00 |
|
Matthew K. Fu JuYuan
|
8f28d45379
|
The new AdBanner.
|
2012-04-02 03:04:38 +08:00 |
|
Matthew K. Fu JuYuan
|
b17cd7570f
|
changing to new admin_layout
|
2012-04-02 02:58:02 +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
|
503f71e554
|
Ray's changes in tags, css and js
|
2012-04-02 02:55:36 +08:00 |
|
Christophe Vilayphiou
|
6c50aa5243
|
Add pagination to bulletin index and remove ajax to make it simple
|
2012-04-02 02:55:36 +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
|
d6e4da6dad
|
Ray's fix for margin-top
|
2012-03-28 11:31:07 +08:00 |
|
Christophe Vilayphiou
|
cf297fc424
|
Changed inherited controller in module_apps to OrbitBackendController
|
2012-03-27 18:58:04 +08:00 |
|
Christophe Vilayphiou
|
d02bbdbaa5
|
Nokogiri in parsers
|
2012-03-27 18:58:04 +08:00 |
|
Christophe Vilayphiou
|
55d12e50f2
|
Ray's changes in announcenment back-end
|
2012-03-27 18:58:03 +08:00 |
Matt Fu
|
3ba89ecbcf
|
Fact check program completed,Lin checked
|
2012-03-27 18:54:03 +08:00 |
|
Christophe Vilayphiou
|
f5fd3dec7a
|
Trying nokogiri
|
2012-03-27 18:42:22 +08:00 |
|
Christophe Vilayphiou
|
f9c5ee5d18
|
Merge branch 'dashboard' of github.com:Rulingcom/orbit into dashboard
Conflicts:
app/assets/javascripts/bulletin_form.js.erb
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/show.html.erb
vendor/built_in_modules/announcement/config/routes.rb
|
2012-03-27 18:37:14 +08:00 |
|
unknown
|
e8d1352890
|
fix announcement
|
2012-03-27 14:29:11 +08:00 |
|
unknown
|
a30bc499c7
|
fix announcement & links
|
2012-03-27 14:19:58 +08:00 |
|
unknown
|
42519d9f78
|
fix announcement & links
|
2012-03-23 18:04:11 +08:00 |
|
Christophe Vilayphiou
|
61698f3f2c
|
Remove quick_edit on bulletin index load
|
2012-03-23 17:32:59 +08:00 |
|
Christophe Vilayphiou
|
a126935d2c
|
Clean the parsers and introduce the metas
|
2012-03-21 18:30:12 +08:00 |
|
Christophe Vilayphiou
|
472744fc87
|
Changes for IE9 with html5
|
2012-03-21 15:51:55 +08:00 |
|
Christophe Vilayphiou
|
3aa7c5120d
|
Put tinymce in its own js file.
To use on a text area just add the class "tinymce_textarea".
|
2012-03-21 12:41:32 +08:00 |
|
Christophe Vilayphiou
|
e953344965
|
Fix before_filter order for object_auth
|
2012-03-20 14:17:28 +08:00 |
|
Christophe Vilayphiou
|
7cc075e124
|
Change the monkey picture
|
2012-03-19 15:49:40 +08:00 |
|
unknown
|
a755eb184b
|
fix announcement links & files
|
2012-03-16 16:49:25 +08:00 |
|
unknown
|
7d553acaec
|
fix announcement link & files
|
2012-03-16 15:53:57 +08:00 |
|
Christophe Vilayphiou
|
07edf44643
|
Merge branches 'design_team' and 'design_team' of github.com:Rulingcom/orbit into design_team
|
2012-03-16 15:13:06 +08:00 |
|
Christophe Vilayphiou
|
29ec36130e
|
css and js changes
|
2012-03-16 15:06:45 +08:00 |