Matthew K. Fu JuYuan
|
20eb8b4d15
|
Clean up code , cache other auths. Fix sidebar
|
2012-05-23 13:00:51 +08:00 |
Matthew K. Fu JuYuan
|
1bbf89a354
|
fix code
|
2012-05-22 15:54:46 +08:00 |
Matthew K. Fu JuYuan
|
7f3b090bb7
|
clean up unless code
|
2012-05-22 13:23:26 +08:00 |
Matthew K. Fu JuYuan
|
ae006cc29f
|
js for preventing user do stupid things durning ajax
|
2012-05-22 13:22:24 +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 |
Christophe Vilayphiou
|
4467bc5e48
|
Change Date to DateTime
Fix filename error
|
2012-05-17 09:59:49 +08:00 |
Christophe Vilayphiou
|
be7ce0bf45
|
Redmine change's
|
2012-05-17 06:25:38 +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
|
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
|
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
|
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 |
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
|
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
|
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 |
Christophe Vilayphiou
|
9ead6cafda
|
Ray's changes
|
2012-05-09 04:15:02 +08:00 |
Christophe Vilayphiou
|
55bfaea43e
|
Can show announcement and news list by tag's key
|
2012-05-08 17:27:42 +08:00 |
Christophe Vilayphiou
|
caba8ce7a4
|
Add nccu icon
Change news list in front-end
Hide links and files in news and announcement front-end show when nothing
|
2012-05-08 15:27:43 +08:00 |
Christophe Vilayphiou
|
ba4385e3fd
|
Add module authorization for news
Add files and links to announcement and news
Change page.children into page.ordered_and_visible_children in parser_commom
|
2012-05-08 10:50:09 +08:00 |
Christophe Vilayphiou
|
2aaff21000
|
Add missing class in widget news_bulletin/index
|
2012-05-07 23:23:17 +08:00 |
Christophe Vilayphiou
|
4c7a3842d6
|
Add drop_down to news_bulletin widget index for categories
|
2012-05-07 15:58:52 +08:00 |
Christophe Vilayphiou
|
48f8fbde7f
|
Fix site_locale_default_head and active for current locale
|
2012-05-07 00:53:52 +08:00 |
Christophe Vilayphiou
|
f190ce18ee
|
Put sorting in web_link, page_context and design
|
2012-05-05 21:20:20 +08:00 |
Christophe Vilayphiou
|
b48099d752
|
Fix bug in is_admin?
Fix bug in helpers for news and announcement
|
2012-05-05 17:40:07 +08:00 |
Christophe Vilayphiou
|
8e6fd277c2
|
Fix bug: preview was always true
|
2012-05-04 19:02:40 +08:00 |
Christophe Vilayphiou
|
e9b337a385
|
Copy changes into news after merge
|
2012-05-04 18:49:07 +08:00 |
Christophe Vilayphiou
|
92a53c1b27
|
Ray's fix
|
2012-05-02 16:20:59 +08:00 |
Christophe Vilayphiou
|
b8f52fa1ec
|
Separate announcement and news
|
2012-04-30 06:31:46 +08:00 |