mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-02 23:07:39 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'Marc/ticket/11914' into develop

Browse Source 
* Marc/ticket/11914:
  [ticket/11914] Add assets version to included plupload scripts
  [ticket/11914] Update plupload to 2.0.0
  [ticket/11914] Use unix line endings in plupload queue css file
This commit is contained in:
Joas Schilling
2013-11-27 15:18:39 +01:00
parent 125e76f9aa fbedce8d4a
commit e3eb82cf7d
7 changed files with 208 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
phpBB/assets/plupload/jquery.plupload.queue/jquery.plupload.queue.js
View File

File diff suppressed because one or more lines are too long

1
phpBB/assets/plupload/jquery.plupload.queue/jquery.plupload.queue.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

28
phpBB/assets/plupload/plupload.full.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

1
phpBB/assets/plupload/plupload.html5.js
View File

File diff suppressed because one or more lines are too long

2
phpBB/assets/plupload/plupload.js
View File

File diff suppressed because one or more lines are too long

5
phpBB/styles/prosilver/template/plupload.html
View File

@@ -1,6 +1,5 @@
<script type="text/javascript" src="{T_ASSETS_PATH}/plupload/plupload.js"></script> <script type="text/javascript" src="{T_ASSETS_PATH}/plupload/plupload.full.min.js?assets_version={T_ASSETS_VERSION}"></script>
<script type="text/javascript" src="{T_ASSETS_PATH}/plupload/plupload.html5.js"></script> <script type="text/javascript" src="{T_ASSETS_PATH}/plupload/jquery.plupload.queue/jquery.plupload.queue.min.js?assets_version={T_ASSETS_VERSION}"></script>
<script type="text/javascript" src="{T_ASSETS_PATH}/plupload/jquery.plupload.queue/jquery.plupload.queue.js"></script>
<script type="text/javascript"> <script type="text/javascript">
//<![CDATA[ //<![CDATA[
phpbb.plupload = { phpbb.plupload = {