Matthew K. Fu JuYuan
|
e4c41ab54c
|
A filter UI for permission select. with Harry's JS
|
2012-04-12 07:14:06 +08:00 |
|
Matthew K. Fu JuYuan
|
0909156eb4
|
fix i18n var for fact check pending
|
2012-04-12 07:14:06 +08:00 |
|
Matthew K. Fu JuYuan
|
1fd38c8135
|
factcheck status for and
|
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 |
|
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
|
4da03026a4
|
Fix pagination bug in bulletins
|
2012-04-05 15:28:43 +08:00 |
|
Christophe Vilayphiou
|
5f5871d1c2
|
Merge branch 'dashboard' of github.com:Rulingcom/orbit into dashboard
Conflicts:
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb
vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_form.html.erb
|
2012-04-05 15:24:39 +08:00 |
unknown
|
d45725cf3b
|
fix announcement & add lang tab
|
2012-04-05 15:23:20 +08:00 |
|
unknown
|
9382ef6ae8
|
Merge branch 'dashboard' of https://github.com/Rulingcom/orbit into dashboard
Conflicts:
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/_form.html.erb
vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_form.html.erb
|
2012-04-05 15:16:33 +08:00 |
|
Christophe Vilayphiou
|
1259d62249
|
Fix mainTablePosition in js -> remove the notable class
|
2012-04-05 14:55:41 +08:00 |
|
unknown
|
ccb0110b77
|
fix announcement & add lang tab
|
2012-04-05 14:48:31 +08:00 |
|
Christophe Vilayphiou
|
7bf50d6c52
|
Move the audit block to the bottom
|
2012-04-05 14:08:03 +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
|
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
|
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
|
cf297fc424
|
Changed inherited controller in module_apps to OrbitBackendController
|
2012-03-27 18:58:04 +08:00 |
|
Christophe Vilayphiou
|
b134e690e9
|
Delete new_blog
|
2012-03-27 18:58:04 +08:00 |
|
Christophe Vilayphiou
|
07ba457dd7
|
admin now can post without fact check
|
2012-03-27 18:58:03 +08:00 |
|
Christophe Vilayphiou
|
55d12e50f2
|
Ray's changes in announcenment back-end
|
2012-03-27 18:58:03 +08:00 |
|
Christophe Vilayphiou
|
97adf94e15
|
fix with what ray needs for the fact_check form
|
2012-03-27 18:56:18 +08:00 |
|
Matt Fu
|
3ba89ecbcf
|
Fact check program completed,Lin checked
|
2012-03-27 18:54:03 +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 |
|
Christophe Vilayphiou
|
33955b4554
|
Delete files with Chinese characters in name
|
2012-03-27 14:21:32 +08:00 |
|
Christophe Vilayphiou
|
c4299245de
|
Delete files with Chinese characters in name
|
2012-03-27 14:19:58 +08:00 |
|
unknown
|
a30bc499c7
|
fix announcement & links
|
2012-03-27 14:19:58 +08:00 |
|
Christophe Vilayphiou
|
7765f0d2e1
|
Delete files with Chinese characters in name
|
2012-03-27 14:17:48 +08:00 |
|
Christophe Vilayphiou
|
74636fb16d
|
Delete file with Chinese character in the name
|
2012-03-27 14:16:04 +08:00 |
|
Christophe Vilayphiou
|
f37eb5bf43
|
Add missing file
|
2012-03-23 18:27:41 +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
|
0e8f8b3424
|
Add missing category when redirect to front-end for bulletin back-end index
|
2012-03-21 12:58:13 +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
|
5d7202af8b
|
Modify bulletin back-end index to show announcement in front-end
|
2012-03-21 12:37:52 +08:00 |
|
Christophe Vilayphiou
|
c4d541d3b9
|
Remove code from back_end/bulletins/show
|
2012-03-21 12:36:52 +08:00 |
|
Matt Fu
|
6700114955
|
after merge
|
2012-03-19 10:55:58 +08:00 |
|
Matt Fu
|
9c8b0235b0
|
add new files
|
2012-03-19 10:55:58 +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
|
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
|
785ead5209
|
Merge branch 'dashboard' of github.com:Rulingcom/orbit into dashboard
Conflicts:
app/views/layouts/_side_bar.html.erb
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_bulletin_category.html.erb
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb
|
2012-03-16 14:55:21 +08:00 |