harrybomrah 0671d0b126 filemanger authentication changes and also announcement preview fixed and also text search for files ...

Conflicts:
	app/views/admin/assets/index.html.erb

2013-12-11 18:49:54 +08:00

..

_asset.html.erb

file manger preview and pagination is done.

2013-12-11 14:41:08 +08:00

_edit.html.erb

editing for the assets are done with replacable files and description

2013-09-11 14:03:13 +08:00

_filter.html.erb

Change assets

2012-05-16 11:07:11 +08:00

_form.html.erb

filemanger authentication changes and also announcement preview fixed and also text search for files

2013-12-11 18:49:54 +08:00

_new.html.erb

Changes for i18n yml

2012-09-24 09:02:45 +08:00

_sort_headers.html.erb

Updated Sidebar and Preferences

2013-09-09 10:18:14 +08:00

create1.js.erb

Merge branch 'various_bugs' into nccu_master

2012-10-29 16:10:07 +08:00

delete_files.js.erb

filemanager and some update for file uploader . added file uploader to kernel

2013-09-11 14:03:06 +08:00

edit.html.erb

editing for the assets are done with replacable files and description

2013-09-11 14:03:13 +08:00

file_upload.html.erb

Changed Site Valid Locales to In Use Locales

2013-11-27 17:51:48 +08:00

index.html.erb

filemanger authentication changes and also announcement preview fixed and also text search for files

2013-12-11 18:49:54 +08:00

index.js.erb

file manger preview and pagination is done.

2013-12-11 14:41:08 +08:00

new.html.erb

Add missing translations

2012-09-24 09:02:46 +08:00

update.html.erb

editing for the assets are done with replacable files and description

2013-09-11 14:03:13 +08:00