Christophe Vilayphiou
|
ad9ac5f3f7
|
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/announcement/app/views/panel/announcement/back_end/bulletins/_form_bulletin_file.html.erb
vendor/built_in_modules/page_content/app/controllers/panel/page_content/back_end/page_contexts_controller.rb
vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/index.html.erb
vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/back_end/web_links_controller.rb
vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/index.html.erb
|
2012-05-16 01:31:16 +08:00 |
unknown
|
ab616fc3b5
|
announcement edit to view file
|
2012-05-16 01:15:00 +08:00 |
|
unknown
|
cc02ea511c
|
archive checkbox
|
2012-05-16 01:13:39 +08:00 |
|
unknown
|
cf5e6c1a96
|
new archive
|
2012-05-16 01:09:21 +08:00 |
|
unknown
|
4e9bb1b583
|
new archive
|
2012-05-16 01:06:26 +08:00 |
|
Christophe Vilayphiou
|
80e84c10ba
|
Remove link from dashboard
|
2012-05-15 23:01:00 +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
|
a8c1cbdbba
|
Add vendor/impressionist
|
2012-05-15 22:42:49 +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 |
|
Christophe Vilayphiou
|
53a0fbddf0
|
Fix commit error
|
2012-05-15 21:25:51 +08:00 |
|
Christophe Vilayphiou
|
8fcb8ef8de
|
Change the way links are displayed in menus in front-end
|
2012-05-14 21:43:10 +08:00 |
|
Christophe Vilayphiou
|
6c83b3f9ae
|
Merge branch 'nccu_0509' of github.com:Rulingcom/orbit into nccu_0509
|
2012-05-14 12:41:14 +08:00 |
Matthew K. Fu JuYuan
|
9ba4c2cf2f
|
Change to apply page to had object_auth
|
2012-05-14 12:40:50 +08:00 |
|
Matthew K. Fu JuYuan
|
2cd67356a5
|
Merge branch 'nccu_0509' of https://github.com/Rulingcom/orbit into nccu_0509
Conflicts:
config/locales/zh_tw.yml
|
2012-05-14 12:36:09 +08:00 |
|
Matthew K. Fu JuYuan
|
e1450ec748
|
Change to apply page to had object_auth
|
2012-05-14 12:34:15 +08:00 |
|
Christophe Vilayphiou
|
f0dd1eb871
|
Fix designs.rake
|
2012-05-14 09:30:49 +08:00 |
|
Christophe Vilayphiou
|
33e3821e61
|
Rake task to change design_ids
|
2012-05-14 08:59:53 +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
|
dfd2d82efb
|
Restart job
|
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
|
a184f96ce7
|
AdBanner app_auth
|
2012-05-14 00:49:22 +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
|
cf8d20dc84
|
Add category and tag to pages
|
2012-05-14 00:33:52 +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
|
01d0c002f5
|
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
Conflicts:
app/views/admin/pages/_edit.html.erb
app/views/admin/pages/_form.html.erb
lib/parsers/parser_back_end.rb
|
2012-05-13 23:14:13 +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 |
|
Christophe Vilayphiou
|
4685952bd6
|
Changes in page_edit
|
2012-05-13 20:13:26 +08:00 |
|
Christophe Vilayphiou
|
ef2d416c70
|
Ray's changes for page_edit
|
2012-05-13 19:36:04 +08:00 |
|
Christophe Vilayphiou
|
82fa85def8
|
Clean the parsers code
|
2012-05-13 19:32:05 +08:00 |
|
Christophe Vilayphiou
|
803253ebcf
|
Put nestedSortable in page_edit.js.erb
|
2012-05-12 22:12:17 +08:00 |
|
Christophe Vilayphiou
|
ef49df448d
|
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
Conflicts:
app/helpers/admin/item_helper.rb
|
2012-05-11 18:09:34 +08:00 |
|
Christophe Vilayphiou
|
17b486f9e9
|
Fix bugs for shift_to and change items.rake for the missing position in db
|
2012-05-11 17:56:26 +08:00 |
|
Christophe Vilayphiou
|
076f5ad6ef
|
Ray's changes for drag and drop in structure's side_bar
|
2012-05-11 17:54:33 +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
|
82d1d3fed8
|
Restart job
|
2012-05-11 16:56:32 +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
|
fd52d00187
|
Add drag and drop to structure side_bar
|
2012-05-11 10:00:45 +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
|
cb25cf60a9
|
AdBanner app_auth
|
2012-05-10 15:37:07 +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 |
|
Christophe Vilayphiou
|
14c2c4e5e8
|
Merge branch 'nccu_0509' of github.com:Rulingcom/orbit into nccu_0509
|
2012-05-10 14:17:03 +08:00 |
|
Matthew K. Fu JuYuan
|
b6aad17681
|
Appauth new interface for setting managers. Fix showing sidebar for News and Announcement when setting managers at module app page.
|
2012-05-10 14:16:37 +08:00 |