unknown
|
ccb0110b77
|
fix announcement & add lang tab
|
2012-04-05 14:48:31 +08:00 |
Harry Bomrah
|
a0d5e847e0
|
Merge branch 'desktop_devin' into desktop_harry
|
2012-04-05 14:29:04 +08:00 |
Christophe Vilayphiou
|
7bf50d6c52
|
Move the audit block to the bottom
|
2012-04-05 14:08:03 +08:00 |
|
Christophe Vilayphiou
|
1b79400f44
|
Fix menu for frontend
|
2012-04-05 14:06:58 +08:00 |
|
Harry Bomrah
|
e0f5583f43
|
route fixed.
|
2012-04-05 13:58:58 +08:00 |
Christophe Vilayphiou
|
cedd782e7f
|
Sidebar fix for ad_banner
|
2012-04-05 13:55:03 +08:00 |
|
Harry Bomrah
|
07dadbef70
|
commit temp
|
2012-04-05 13:54:49 +08:00 |
Matthew K. Fu JuYuan
|
d8b20ae993
|
fix ad_banner sidebar
|
2012-04-05 11:11:48 +08:00 |
devin
|
c61a4d7939
|
add icons
|
2012-04-05 10:38:47 +08:00 |
|
devin
|
a7d84e8583
|
add tinyscrollbar
|
2012-04-05 02:31:32 +08:00 |
|
devin
|
c4b9a9e275
|
dock effect
|
2012-04-04 05:53:49 +08:00 |
unknown
|
e05a834a5b
|
update icons
|
2012-04-03 18:32:42 +08:00 |
|
Harry Bomrah
|
4250c26c88
|
Model commit
|
2012-04-03 18:25:41 +08:00 |
|
unknown
|
11d3906951
|
new icons
|
2012-04-03 18:06:16 +08:00 |
|
Christophe Vilayphiou
|
2c39a7db54
|
Merge branch 'ad_banner' of github.com:Rulingcom/orbit into ad_banner
|
2012-04-02 11:01:08 +08:00 |
|
Matthew K. Fu JuYuan
|
a9988a0d5c
|
Change for interface,form.
|
2012-04-02 11:00:51 +08:00 |
|
Christophe Vilayphiou
|
7e922d8ed4
|
Fic bug from merge
|
2012-04-02 10:54:48 +08:00 |
|
Matthew K. Fu JuYuan
|
2fddfd367a
|
Change for interface,form.
|
2012-04-02 10:50:39 +08:00 |
|
Christophe Vilayphiou
|
7f3ae19454
|
Merge branch 'ad_banner' of github.com:Rulingcom/orbit into ad_banner
Conflicts:
lib/parsers/parser_back_end.rb
lib/parsers/parser_front_end.rb
|
2012-04-02 03:06:25 +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
|
a549fb71a0
|
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
Conflicts:
vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
|
2012-04-02 02:56:51 +08:00 |
|
Christophe Vilayphiou
|
9c1c70b598
|
Fix sorting in annoucement
|
2012-04-02 02:55:36 +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
|
f7dafbc0cd
|
Ray's changes in tags, css and js
|
2012-04-02 02:46:34 +08:00 |
|
Christophe Vilayphiou
|
ecc789c248
|
Add missing load ofr meta folder
|
2012-04-02 02:45:23 +08:00 |
|
Christophe Vilayphiou
|
32519f308f
|
Fix several bus when there is no design
|
2012-04-02 02:41:42 +08:00 |
|
Matthew K. Fu JuYuan
|
2747fc42f5
|
The new AdBanner.
|
2012-04-01 23:39:49 +08:00 |
|
Harry Bomrah
|
bbd2c23b3d
|
Themes fixed…
|
2012-03-30 18:06:06 +08:00 |
|
Christophe Vilayphiou
|
32b7d95669
|
Fix parser_back_end & side_bar & meta
|
2012-03-30 15:51:29 +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 |
|
Christophe Vilayphiou
|
25c24c03f9
|
Add pagination to bulletin index and remove ajax to make it simple
|
2012-03-28 19:40:12 +08:00 |
|
Harry Bomrah
|
2e283a039d
|
Desktop Commit
|
2012-03-28 18:53:30 +08:00 |
|
Harry Bomrah
|
4798cd43c1
|
Desktop commit
|
2012-03-28 18:53:06 +08:00 |
|
Christophe Vilayphiou
|
e7fdcfffa0
|
Fix sidebar
|
2012-03-28 12:12:23 +08:00 |
|
Christophe Vilayphiou
|
fd26b7cd90
|
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
|
2012-03-28 11:31:23 +08:00 |
|
Christophe Vilayphiou
|
d6e4da6dad
|
Ray's fix for margin-top
|
2012-03-28 11:31:07 +08:00 |
|
Christophe Vilayphiou
|
649f343e6f
|
Ray's fix for margin-top
|
2012-03-28 11:17:59 +08:00 |
|
Christophe Vilayphiou
|
c645c1b5df
|
Remove extra code in bulletin form
|
2012-03-28 10:51:14 +08:00 |
|
Christophe Vilayphiou
|
172d3d7847
|
Remove bad references to NewBlog
|
2012-03-27 19:42:07 +08:00 |
|
Christophe Vilayphiou
|
212730fd8a
|
Add missing end tag in bulletin _form
|
2012-03-27 19:37:47 +08:00 |
|
Christophe Vilayphiou
|
b587b7ca6b
|
Remove limit(1) to bulletins index action
|
2012-03-27 19:22:50 +08:00 |
|
Christophe Vilayphiou
|
5aad133b6c
|
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
Conflicts:
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/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link_qe.html.erb
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/edit.html.erb
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/new.html.erb
|
2012-03-27 19:15:13 +08:00 |
|
Christophe Vilayphiou
|
50be40f7b3
|
Ray's changes in announcenment back-end
|
2012-03-27 19:10:35 +08:00 |
Matt Fu
|
1e60acaa11
|
Fact check program completed,Lin checked
|
2012-03-27 19:06:28 +08:00 |
|
Christophe Vilayphiou
|
77f53cfd6b
|
Merge branch 'nokogiri' of github.com:Rulingcom/orbit into nokogiri
|
2012-03-27 19:00:26 +08:00 |
|
Christophe Vilayphiou
|
717e50a25e
|
Add rake task for layout with nokogiri
|
2012-03-27 19:00:03 +08:00 |