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
|
2b9190a49e
|
Merge branch 'design_team' into ldap
Conflicts:
config/locales/zh_tw.yml
vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb
|
2012-05-08 11:40:38 +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
|
ca88d0e01b
|
Fix bug that was never displaying preview
|
2012-05-07 17:29:56 +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
|
e9b337a385
|
Copy changes into news after merge
|
2012-05-04 18:49:07 +08:00 |
Matthew K. Fu JuYuan
|
119d8ff13a
|
add field called unit_list_for_anc and data from nccu(0224). Now can run "rake nccu_data:setup_ut_list" to setup NCCU data.
|
2012-05-04 15:50:45 +08:00 |
Matthew K. Fu JuYuan
|
048ce4c97e
|
disable input
|
2012-05-04 15:50:45 +08:00 |
Matthew K. Fu JuYuan
|
453cb21066
|
Announcement preivew
|
2012-05-04 15:50:45 +08:00 |
Matthew K. Fu JuYuan
|
f427c3803f
|
clean up useless flash msgs. add i18n vars for app auth and object auth
|
2012-05-04 15:40:43 +08:00 |
Matthew K. Fu JuYuan
|
05ded8de03
|
Fix for NCCU 0430 all functions ok with two submanagers but different behavors
|
2012-05-04 15:38:18 +08:00 |
Christophe Vilayphiou
|
92a53c1b27
|
Ray's fix
|
2012-05-02 16:20:59 +08:00 |
Christophe Vilayphiou
|
20504b2205
|
Merge branch 'design_team' into ldap
Conflicts:
app/controllers/admin/page_parts_controller.rb
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter.html.erb
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_sort_headers.html.erb
|
2012-04-30 07:57:20 +08:00 |
Christophe Vilayphiou
|
b8f52fa1ec
|
Separate announcement and news
|
2012-04-30 06:31:46 +08:00 |
Christophe Vilayphiou
|
63ee8eaca9
|
Remove url from sorting
Add sorting_options to params in filters
|
2012-04-30 06:30:52 +08:00 |
Christophe Vilayphiou
|
32faef0c70
|
DRY code for sorting
|
2012-04-30 06:30:52 +08:00 |
Matthew K. Fu JuYuan
|
a46a8898d7
|
Integrate App & Object Auth to announcement with i18n variables. Also changed Role and SubRole i18n var. Checked with Allen
|
2012-04-30 00:24:11 +08:00 |
Matthew K. Fu JuYuan
|
382932036d
|
Hide Approval button when bulletin is checked.
|
2012-04-30 00:24:11 +08:00 |
Matthew K. Fu JuYuan
|
c4db7e2157
|
Fix approval setting ajax problem
|
2012-04-30 00:24:11 +08:00 |
Matthew K. Fu JuYuan
|
94d61abf83
|
A modal view for approval user
|
2012-04-30 00:24:10 +08:00 |
Christophe Vilayphiou
|
851dc72f42
|
Ray's changes in css and html
|
2012-04-30 00:17:18 +08:00 |
Christophe Vilayphiou
|
2362e1cfdd
|
Merge branch 'design_team' into ldap
|
2012-04-27 15:28:32 +08:00 |
Christophe Vilayphiou
|
bf2c89da54
|
Add sorting to web_links
|
2012-04-27 14:20:09 +08:00 |
Christophe Vilayphiou
|
3beb035101
|
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
|
2012-04-27 11:11:56 +08:00 |
Christophe Vilayphiou
|
5aca3db95f
|
Ray's changes for structure and web_links
|
2012-04-27 11:02:56 +08:00 |
Christophe Vilayphiou
|
7d6b82d9dd
|
Merge branch 'ad_banner' into ldap
|
2012-04-26 17:15:44 +08:00 |
Christophe Vilayphiou
|
3d293f6419
|
Fix for quick edit file and link in announcement
Change submit_button into ajax_for_submit
|
2012-04-26 16:42:28 +08:00 |
Christophe Vilayphiou
|
1f4fe65430
|
Merge branch 'design_team' into ldap
Conflicts:
app/views/devise/sessions/new.html.erb
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/_privilege_user.html.erb
|
2012-04-25 16:45:04 +08:00 |
Christophe Vilayphiou
|
876036dd20
|
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
Conflicts:
app/views/admin/ad_banners/_ad_banner_tab.html.erb
|
2012-04-25 16:39:26 +08:00 |
Christophe Vilayphiou
|
44ded537b3
|
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
|
2012-04-25 16:28:34 +08:00 |
Christophe Vilayphiou
|
65a6f9c416
|
Ray's css fix for quick edit
|
2012-04-25 16:26:27 +08:00 |
Matthew K. Fu JuYuan
|
a704a054cc
|
Remove useless files
|
2012-04-25 16:10:11 +08:00 |
Christophe Vilayphiou
|
8adb9c6878
|
Merge branch 'design_team' into ldap
|
2012-04-25 15:10:50 +08:00 |
Christophe Vilayphiou
|
3ec8bb7be6
|
Fix assets bug: when having a '.' in the name, the extension must be specified
|
2012-04-25 15:10:28 +08:00 |
Christophe Vilayphiou
|
c65213c4f1
|
Merge branch 'design_team' into ldap
|
2012-04-24 17:10:34 +08:00 |
Christophe Vilayphiou
|
dc07964bc3
|
Fix js bug after Matt's changes in 'approval'
|
2012-04-24 17:10:23 +08:00 |
Christophe Vilayphiou
|
0c4f1d91f7
|
Merge branch 'ad_banner' into ldap
|
2012-04-24 16:46:04 +08:00 |
Matthew K. Fu JuYuan
|
db46803cda
|
R4-Billingual
|
2012-04-24 16:43:45 +08:00 |
Christophe Vilayphiou
|
d1f687e43e
|
Merge branch 'design_team' into ldap
|
2012-04-24 16:32:30 +08:00 |
Christophe Vilayphiou
|
c7d8e0b27b
|
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
Conflicts:
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/setting.html.erb
|
2012-04-24 16:32:00 +08:00 |
Christophe Vilayphiou
|
17e55b9805
|
Merge branch 'design_team' into ldap
|
2012-04-24 16:25:58 +08:00 |
Christophe Vilayphiou
|
9f6c9156c6
|
Spen patch for nccu
|
2012-04-24 16:25:30 +08:00 |
Christophe Vilayphiou
|
291d5e3a03
|
Ray's changes in css
|
2012-04-24 16:24:50 +08:00 |
Christophe Vilayphiou
|
70f6c7b540
|
Merge branch 'design_team' into ldap
Conflicts:
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_sort_headers.html.erb
|
2012-04-24 15:28:52 +08:00 |
Christophe Vilayphiou
|
d247f05d2e
|
Add missing translations in announcement and change announcement behavior for passed and rejected
|
2012-04-24 15:27:46 +08:00 |
Christophe Vilayphiou
|
c0abaa643c
|
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
|
2012-04-24 15:21:12 +08:00 |
Christophe Vilayphiou
|
45c194e870
|
Ray's changes in css
|
2012-04-24 15:15:36 +08:00 |
Matthew K. Fu JuYuan
|
e7bb9ea86b
|
Fix ad image date selector
|
2012-04-24 14:37:06 +08:00 |
Christophe Vilayphiou
|
c856b4cdce
|
Fix for upload image component in announcement
|
2012-04-24 12:41:28 +08:00 |
Christophe Vilayphiou
|
8041452be5
|
Fix for translation in sort headers for announcement
|
2012-04-24 11:05:01 +08:00 |
Christophe Vilayphiou
|
308cfc7cf2
|
Merge branch 'design_team' into ldap
Conflicts:
app/views/devise/sessions/new.html.erb
|
2012-04-24 02:46:06 +08:00 |
Christophe Vilayphiou
|
6831a3dbbb
|
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
|
2012-04-24 02:44:39 +08:00 |
Christophe Vilayphiou
|
0c4328987a
|
Ray's changes for css files, sort headers in announcement and pagination
|
2012-04-24 02:37:51 +08:00 |
Christophe Vilayphiou
|
d4aea664e2
|
Merge branch 'design_team' into ldap
Conflicts:
vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
|
2012-04-24 02:37:03 +08:00 |
Christophe Vilayphiou
|
a748ccaac7
|
Patch from ldap for announcement translation
|
2012-04-24 02:33:35 +08:00 |
Christophe Vilayphiou
|
db1b84e962
|
Fix bug where an rejected announcement could still be edited by url
|
2012-04-24 00:58:56 +08:00 |
Christophe Vilayphiou
|
6130f8b1e4
|
Fix errors in status filter in announcement
|
2012-04-24 00:53:05 +08:00 |
Christophe Vilayphiou
|
b502bedd0f
|
Fix filter and sort for status in announcement
|
2012-04-24 00:46:34 +08:00 |
Christophe Vilayphiou
|
4f87165039
|
Merge branch 'ldap' of github.com:Rulingcom/orbit into ldap
|
2012-04-23 18:10:16 +08:00 |
Matt
|
a8eeaf235f
|
Add Announcement translation
|
2012-04-23 15:28:56 +08:00 |
Christophe Vilayphiou
|
5a423178e3
|
Merge branch 'design_team' into ldap
Conflicts:
app/assets/stylesheets/new_admin.css.erb
app/assets/stylesheets/widget.css
|
2012-04-23 15:16:50 +08:00 |
Christophe Vilayphiou
|
1ebf460f7e
|
Fix 'loading fail' in front-end for announcement
The show action was returning an array instead of a bulletin
|
2012-04-23 14:47:33 +08:00 |
nccu
|
fe9032787c
|
NCCU ldap debug
|
2012-04-23 10:13:44 +08:00 |
Matthew K. Fu JuYuan
|
f55b3a4374
|
Merge branch 'master' of https://github.com/Rulingcom/orbit into ldap
Conflicts:
Gemfile
Gemfile.lock
app/views/admin/attributes/_app_selector.html.erb
app/views/admin/module_apps/_app_selector.html.erb
app/views/admin/pages/_app_selector.html.erb
config/application.rb
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/new_blog/app/controllers/panel/new_blog/widget/posts_controller.rb
vendor/built_in_modules/page_content/app/controllers/panel/page_content/front_end/page_contexts_controller.rb
vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/front_end/web_links_controller.rb
vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/widget/web_links_controller.rb
|
2012-04-19 14:06:00 +08:00 |
Christophe Vilayphiou
|
167f6d07a0
|
Remove extra "]"
|
2012-04-12 18:13:26 +08:00 |
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
|
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
|
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
|
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 |
unknown
|
6f6e84b015
|
fix dashboard & announcement
|
2012-03-16 14:44:57 +08:00 |
Christophe Vilayphiou
|
b6d49df145
|
Change Obit to Orbit
|
2012-03-16 11:54:31 +08:00 |
Matt Fu
|
13b6892f87
|
code for new fact check
|
2012-03-16 11:09:44 +08:00 |
unknown
|
00ab773942
|
fix dashboard & announcement
|
2012-03-14 20:05:03 +08:00 |
Christophe Vilayphiou
|
79c8b3861b
|
Fix link in widget
|
2012-03-07 18:16:59 +08:00 |
Christophe Vilayphiou
|
4dd9b7ffa4
|
Fix announcement pagination in front-end
|
2012-03-07 18:16:59 +08:00 |
Christophe Vilayphiou
|
0b1f83c042
|
Fix extra loaded js: the widgets only need to render layout when they need js.
|
2012-03-07 18:16:59 +08:00 |
Matt Fu
|
d5a2de5476
|
LDAP with sync rake task
|
2012-03-06 16:41:06 +08:00 |
Matt Fu
|
7f05f21930
|
Merge commit '7c55f6fb8850ef426978dd422fa782358f9ec2fe' into ldap
Conflicts:
config/environments/development.rb
|
2012-03-01 10:13:49 +08:00 |
Christophe Vilayphiou
|
7c55f6fb88
|
Merge branch 'announcement_dev_view_and_auth' of github.com:Rulingcom/orbit into announcement_dev_view_and_auth
Conflicts:
config/environments/development.rb
vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/announcements_controller.rb
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/models/bulletin.rb
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletins.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/index.html.erb
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/new.html.erb
vendor/built_in_modules/announcement/config/routes.rb
vendor/built_in_modules/web_resource/lib/tasks/web_resource_tasks.rake
|
2012-02-29 19:03:29 +08:00 |
Matt Fu
|
cceb785a8d
|
change view and action for announcement ,Lin checked. Also add validation for object_auth make sure for each object,the object will be unique for each action.
|
2012-02-29 18:58:33 +08:00 |
Matthew Kaito Juyuan Fu
|
2e58c63ff7
|
fix bugs with token
|
2012-02-29 18:56:42 +08:00 |
Matthew Kaito Juyuan Fu
|
cc550c5745
|
First version for App and Object auth.Taking Announcement as experiment
|
2012-02-29 18:55:55 +08:00 |
Matthew Kaito Juyuan Fu
|
3bcd7ea349
|
Exp with object_auth
|
2012-02-29 18:50:23 +08:00 |
Christophe Vilayphiou
|
6b2aeadde6
|
Changes for nccu
|
2012-02-29 16:01:50 +08:00 |
Matt Fu
|
9a40ecd1d9
|
Merge branch 'design_team' into ldap for NCCU 0229 demo on Redmine
Conflicts:
app/views/devise/passwords/new.html.erb
app/views/devise/sessions/new.html.erb
|
2012-02-29 13:07:21 +08:00 |
Matt Fu
|
438dc0ad3d
|
i18n vars for announcement
|
2012-02-29 11:54:48 +08:00 |
Matt Fu
|
b83a783a26
|
Add translation files for Announcement
|
2012-02-29 11:12:34 +08:00 |
Christophe Vilayphiou
|
fdf4cfad2d
|
Add category for announcement widget
|
2012-02-28 14:08:57 +08:00 |
Christophe Vilayphiou
|
7f9a7edc98
|
Changes in bulletins widget and front-end, add categories to link
|
2012-02-28 04:24:09 +08:00 |
Christophe Vilayphiou
|
fe4c0986e7
|
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
Conflicts:
Gemfile.lock
app/controllers/admin/pages_controller.rb
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb
|
2012-02-27 18:56:15 +08:00 |
Christophe Vilayphiou
|
0029ef2b5a
|
Fix bug due to image_filename -> image_identifier
|
2012-02-27 18:50:56 +08:00 |
Christophe Vilayphiou
|
f13ebc6c46
|
Fix bugs and changes for nccu
|
2012-02-27 18:50:56 +08:00 |
Christophe Vilayphiou
|
70b4c83cf5
|
Fix bugs and changes for nccu
|
2012-02-24 19:11:51 +08:00 |
Matt Fu
|
3209f9aa27
|
Complete for 229 check.
|
2012-02-24 19:07:47 +08:00 |
Christophe Vilayphiou
|
f4d663c67d
|
Temporary changes for announcement form
|
2012-02-24 15:35:21 +08:00 |
Christophe Vilayphiou
|
dcc64a20d2
|
Finish sorting for announcements
|
2012-02-24 15:30:49 +08:00 |
Christophe Vilayphiou
|
f8d1d7242d
|
Merge branch 'design_team' into dashboard
|
2012-02-23 16:05:33 +08:00 |
Christophe Vilayphiou
|
1a6e497b3d
|
Ika's changes
|
2012-02-23 15:53:15 +08:00 |
Christophe Vilayphiou
|
63d7810b35
|
Add isotope, categories for announcement page, sort for announcement
|
2012-02-23 15:52:58 +08:00 |
Christophe Vilayphiou
|
53ed4b0404
|
Initial changes in announcement for sorting and filtering
|
2012-02-23 15:51:33 +08:00 |
Christophe Vilayphiou
|
ba4d71a026
|
Changes in orbit_bar and js in announcements
|
2012-02-23 15:51:33 +08:00 |
Christophe Vilayphiou
|
48d94d5e15
|
Fix bug widget when no bulletins or web_links, put link in bulletins
|
2012-02-23 15:50:30 +08:00 |
Christophe Vilayphiou
|
ad27537cf7
|
Change pagination in bulletins
|
2012-02-23 15:50:30 +08:00 |
unknown
|
b0834c0c62
|
Merge branch 'new_announcement_dev' of https://github.com/Rulingcom/orbit into new_announcement_dev
Conflicts:
app/views/layouts/module_widget.html.erb
|
2012-02-20 16:25:29 +08:00 |
unknown
|
e82fd405c9
|
remove bulletins_list
|
2012-02-20 16:23:54 +08:00 |
Christophe Vilayphiou
|
1146506063
|
Fix bug when no bulletins or web_links
|
2012-02-20 15:56:17 +08:00 |