Matthew K. Fu JuYuan
|
e0260542d3
|
fix code
|
2012-05-22 16:11:52 +08:00 |
|
Matthew K. Fu JuYuan
|
99bcdf6e1e
|
clean up unless code
|
2012-05-22 14:59:54 +08:00 |
|
Matthew K. Fu JuYuan
|
79f67208fa
|
js for preventing user do stupid things durning ajax
|
2012-05-22 14:59:54 +08:00 |
Christophe Vilayphiou
|
27cf99462e
|
Fix bug in page and news
|
2012-05-22 14:42:19 +08:00 |
Christophe Vilayphiou
|
815e6a8361
|
Fix matt's code and add it to filters
|
2012-05-19 03:19:55 +08:00 |
|
Christophe Vilayphiou
|
db410b9c50
|
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
|
2012-05-18 19:44:18 +08:00 |
|
Christophe Vilayphiou
|
4d33c7a56d
|
Changes for dat and time format
Impression bug when some i18n missing in impressionable object
JS bug in ad_banner edit title
|
2012-05-18 19:42:36 +08:00 |
|
Matthew K. Fu JuYuan
|
661fcafe70
|
Merge branch 'design_team' of https://github.com/Rulingcom/orbit into design_team
Conflicts:
vendor/built_in_modules/news/app/helpers/panel/news/back_end/news_bulletins_helper.rb
|
2012-05-18 18:50:10 +08:00 |
|
Matthew K. Fu JuYuan
|
6ce6577e83
|
fix news approve and preview
|
2012-05-18 18:47:18 +08:00 |
|
Christophe Vilayphiou
|
d9c12ea5a4
|
Proof authed_users for case when no category
|
2012-05-18 10:50:51 +08:00 |
|
Christophe Vilayphiou
|
8ad7f70822
|
Proof i18n_variable for categories
|
2012-05-18 10:28:28 +08:00 |
|
Matthew K. Fu JuYuan
|
16ada34585
|
fix ad_banner. new ad_image with best size from ad_banner. content editable at tab
|
2012-05-17 23:35:46 +08:00 |
|
Christophe Vilayphiou
|
4467bc5e48
|
Change Date to DateTime
Fix filename error
|
2012-05-17 09:59:49 +08:00 |
|
Matthew K. Fu JuYuan
|
7f2564a81e
|
Fix sidebar and hide some links by roles
|
2012-05-17 06:43:39 +08:00 |
|
Matthew K. Fu JuYuan
|
82d78acbad
|
First version of app and object auth for web_resource module. Basic fund is ok. backend need to be secued
|
2012-05-17 06:43:39 +08:00 |
|
Matthew K. Fu JuYuan
|
f663985a40
|
starting ad_banner auth
|
2012-05-17 06:42:33 +08:00 |
|
Christophe Vilayphiou
|
be7ce0bf45
|
Redmine change's
|
2012-05-17 06:25:38 +08:00 |
|
Christophe Vilayphiou
|
0b0916179f
|
Change assets
|
2012-05-16 11:07:11 +08:00 |
|
Christophe Vilayphiou
|
42881553a8
|
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
|
2012-05-15 22:48:40 +08:00 |
|
Christophe Vilayphiou
|
5e9b55e08e
|
Ray took out 'default' tags
|
2012-05-15 22:47:28 +08:00 |
|
Christophe Vilayphiou
|
3462c0e319
|
Add each page name to page_context index
|
2012-05-15 21:31:54 +08:00 |
|
Christophe Vilayphiou
|
e54f4409fb
|
Add impressionist
|
2012-05-15 21:26:09 +08:00 |
|
Matthew K. Fu JuYuan
|
9ba4c2cf2f
|
Change to apply page to had object_auth
|
2012-05-14 12:40:50 +08:00 |
|
Christophe Vilayphiou
|
039e837fff
|
Merge branch 'nccu_0509' of github.com:Rulingcom/orbit into nccu_0509
Conflicts:
app/views/admin/object_auths_new_interface/_privilege_user.html.erb
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_category_setting/_modal_list.html.erb
vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletin_category_setting/setting.html.erb
|
2012-05-14 00:51:53 +08:00 |
|
Matthew K. Fu JuYuan
|
b804ba4d96
|
Fix for manager and admin can see all post in announcement. Haven't applied to news
|
2012-05-14 00:50:36 +08:00 |
|
Matthew K. Fu JuYuan
|
7a6d30ad62
|
Remove unless files and change routes.
|
2012-05-14 00:50:36 +08:00 |
|
Matthew K. Fu JuYuan
|
0119ab1a74
|
New Interface for App Auth and Object Auth
|
2012-05-14 00:50:12 +08:00 |
|
Matthew K. Fu JuYuan
|
8b42c595b3
|
Don't display admin in any premission select. Fix not necessary header for UT data
|
2012-05-14 00:49:22 +08:00 |
|
Christophe Vilayphiou
|
e40c76bf5f
|
Fix new page form
Redirect to home when not authorized
Get only module_apps with app_pages for new and edit page
Change web_resource.json
|
2012-05-13 23:48:34 +08:00 |
|
Christophe Vilayphiou
|
62e9a772f6
|
Fix titles for widgets
Add translations
|
2012-05-13 23:09:48 +08:00 |
|
Christophe Vilayphiou
|
4ae8299949
|
Add custom title to widgets
Fix pagination conflict with main_content and widgets
|
2012-05-13 22:35:00 +08:00 |
|
Christophe Vilayphiou
|
281cfa6518
|
Changes for widgets
|
2012-05-13 21:55:39 +08:00 |
|
Matthew K. Fu JuYuan
|
e696516aae
|
Fix for manager and admin can see all post in announcement. Haven't applied to news
|
2012-05-11 17:07:21 +08:00 |
|
Matthew K. Fu JuYuan
|
0a34f0277e
|
Remove unless files and change routes.
|
2012-05-11 16:46:36 +08:00 |
|
Matthew K. Fu JuYuan
|
20a1a6e30f
|
New Interface for App Auth and Object Auth
|
2012-05-11 16:44:40 +08:00 |
|
Christophe Vilayphiou
|
6a443f0976
|
Add mongoid-tree to Item
|
2012-05-11 16:16:09 +08:00 |
|
Christophe Vilayphiou
|
63f904d3b0
|
Fix tinymce js load
Change to full_name for page_context index
|
2012-05-10 20:36:19 +08:00 |
|
Matthew K. Fu JuYuan
|
4f1e47bb82
|
Don't display admin in any premission select. Fix not necessary header for UT data
|
2012-05-10 14:43:05 +08:00 |
|
Matthew K. Fu JuYuan
|
07815eee8f
|
fix display for announcement and remove ut field
|
2012-05-10 10:29:18 +08:00 |
|
Christophe Vilayphiou
|
99c4e94729
|
Fix for home_list widget
|
2012-05-10 10:28:29 +08:00 |
|
Matthew K. Fu JuYuan
|
f13e006e4d
|
fix display for announcement and remove ut field
|
2012-05-10 10:27:01 +08:00 |
|
Christophe Vilayphiou
|
bc5e975fab
|
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
|
2012-05-10 00:29:22 +08:00 |
|
Christophe Vilayphiou
|
13587306bc
|
Add list widgets for announcement, news and links with categories and tags
|
2012-05-10 00:25:30 +08:00 |
|
Christophe Vilayphiou
|
6727f27181
|
Change for 0509 Nccu check
|
2012-05-09 16:58:12 +08:00 |
|
Matthew K. Fu JuYuan
|
9a6b66c57d
|
Merge branch 'design_team' of https://github.com/Rulingcom/orbit into nccu_0509
|
2012-05-09 15:54:59 +08:00 |
|
Matthew K. Fu JuYuan
|
93946c37f4
|
fix wrong link
|
2012-05-09 15:54:00 +08:00 |
|
Matthew K. Fu JuYuan
|
a9c241658a
|
Repeat code for news module
|
2012-05-09 15:28:02 +08:00 |
|
Matthew K. Fu JuYuan
|
c82d701b55
|
Permission setting for announcement for bulletin cate
|
2012-05-09 15:28:02 +08:00 |
|
Matthew K. Fu JuYuan
|
618e4f4047
|
Repeat code for news module
|
2012-05-09 15:22:15 +08:00 |
|
Christophe Vilayphiou
|
50edfdd02f
|
Changes for tag key in side_bar announcement and news, fix ad_banner css for dot
|
2012-05-09 14:59:06 +08:00 |