← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/moin/oneiric-security

« back to all changes in this revision

Viewing changes to wiki/htdocs/applets/FCKeditor/editor/filemanager/connectors/aspx/upload.aspx

  • Committer: Bazaar Package Importer
  • Author(s): Jamie Strandboge
  • Date: 2010-03-30 12:55:34 UTC
  • mfrom: (0.1.17 sid)
  • Revision ID: james.westby@ubuntu.com-20100330125534-4c2ufc1rok24447l
Tags: 1.9.2-2ubuntu1
https://launchpad.net/bugs/521834
* Merge from Debian testing (LP: #521834). Based on work by Stefan Ebner.
  Remaining changes:
 - Remove python-xml from Suggests field, the package isn't anymore in
   sys.path.
 - Demote fckeditor from Recommends to Suggests; the code was previously
   embedded in moin, but it was also disabled, so there's no reason for us
   to pull this in by default currently. Note: This isn't necessary anymore
   but needs a MIR for fckeditor, so postpone dropping this change until
   lucid+1
* debian/rules:
  - Replace hardcoded python2.5 with python* and hardcore python2.6 for ln
* debian/control.in: drop versioned depends on cdbs

Show diffs side-by-side

added added

removed removed

Lines of Context:
wiki/htdocs/applets/FCKeditor/editor/filemanager/connectors/aspx/upload.aspx
1
 
<%@ Page Language="c#" Trace="false" Inherits="FredCK.FCKeditorV2.FileBrowser.Uploader" AutoEventWireup="false" %>
2
 
<%@ Register Src="config.ascx" TagName="Config" TagPrefix="FCKeditor" %>
3
 
<%--
4
 
 * FCKeditor - The text editor for Internet - http://www.fckeditor.net
5
 
 * Copyright (C) 2003-2009 Frederico Caldeira Knabben
6
 
 *
7
 
 * == BEGIN LICENSE ==
8
 
 *
9
 
 * Licensed under the terms of any of the following licenses at your
10
 
 * choice:
11
 
 *
12
 
 *  - GNU General Public License Version 2 or later (the "GPL")
13
 
 *    http://www.gnu.org/licenses/gpl.html
14
 
 *
15
 
 *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
16
 
 *    http://www.gnu.org/licenses/lgpl.html
17
 
 *
18
 
 *  - Mozilla Public License Version 1.1 or later (the "MPL")
19
 
 *    http://www.mozilla.org/MPL/MPL-1.1.html
20
 
 *
21
 
 * == END LICENSE ==
22
 
 *
23
 
 * This is the Uploader for ASP.NET.
24
 
 *
25
 
 * The code of this page if included in the FCKeditor.Net package,
26
 
 * in the FredCK.FCKeditorV2.dll assemblyfile. So to use it you must
27
 
 * include that DLL in your "bin" directory.
28
 
 *
29
 
 * To download the FCKeditor.Net package, go to our official web site:
30
 
 * http://www.fckeditor.net
31
 
--%>
32
 
<FCKeditor:Config id="Config" runat="server"></FCKeditor:Config>