f2702ff1ca
Merge master into oc_preview
2013-08-19 11:24:17 +02:00
cabe92ef12
Merge branch 'master' into decrypt_files_again
...
Conflicts:
apps/files_encryption/tests/keymanager.php
2013-08-17 13:15:22 +02:00
53bb89824d
check if some encrypted files are left after the app was disabled and warn the user
2013-08-12 17:25:27 +02:00
7425efade7
Merge branch 'master' into oc_preview
...
Conflicts:
3rdparty
lib/template.php
2013-07-30 00:34:36 +02:00
a00cff7c05
disable "deleted files" button if trash bin is empty
2013-07-26 11:14:29 +02:00
5f5700e353
in case the encryption app is enabled we cannot yet allow anonymous upload
2013-07-12 17:05:58 +02:00
fc2d538311
new admin setting added which allows to turn off anonymous uploads
2013-07-12 17:03:51 +02:00
53830f2f75
implement use of previews in sharing app
2013-07-11 11:58:52 +02:00
0202d47f7a
fixing Notice: Undefined index: isPublic
2013-07-05 11:30:53 +02:00
ddb0ff346d
Public upload feature
2013-06-25 12:24:14 +02:00
301d065686
Sed was wrong
2013-02-28 20:21:14 +01:00
4860d03270
[Files] Use p() instead of echo
2013-02-27 21:14:15 +01:00
ed1dc3e064
Fix files router download links
2013-02-08 22:05:13 +01:00
ab2b79cda6
add multiple domains reverse proxy support
...
Add support for a reverse proxy that handles multiple domains via different
web roots (http[s]://proxy.tld/domain.tld/owncloud).
As the reverse proxy web root is transparent for the web server the
REQUEST_URI and SCRIPT_NAME need manual adjustments. This patch replace
the direct use of this _SERVER variables with function calls and extend
this functions to overwrite the web root. Additionally it adds a Sabre
request backend that extends the Sabre_HTTP_Request to use the same
functions.
2013-01-31 18:42:31 +01:00
54eeb8b8fc
fix merge conflict
2013-01-31 10:55:59 +01:00
95352fbc15
Files: Dont get maxUploadSize if the filecache needs to be upgraded
2013-01-30 19:19:19 +01:00
74f6f85628
merge master into filesystem
2013-01-28 19:37:58 +01:00
8067a1394e
fix merge conflicts
2013-01-28 11:18:04 +01:00
31d83fddc4
Merge pull request #1321 from owncloud/csp-fixes
...
Files: CSP fixes
2013-01-28 00:29:46 -08:00
10c428830e
Add create permission, fixes #780
2013-01-27 23:31:31 -05:00
930b9b9cd0
merge master into filesystem
2013-01-26 18:49:45 +01:00
2e42c6f54f
Use HTML5 data attribute + fix undefined variable
2013-01-26 14:07:35 +01:00
9d77317de8
add trash button to web interface
2013-01-22 15:32:57 +01:00
1762378f67
Files: don't load fileactions.js when upgrading filecache
2013-01-21 22:07:55 +01:00
83d6221322
merge master into filesytem
2013-01-20 03:11:04 +01:00
afb5de955e
Merge branch 'master' into fixing-998-master
...
Conflicts:
apps/files/ajax/upload.php
apps/files/js/files.js
2013-01-18 23:22:34 +01:00
31cc9aa80d
Merge pull request #986 from owncloud/fixing-784-master
...
the maximum upload size is now part of the response of the upload and de...
2013-01-18 14:06:00 -08:00
130c9cad03
relative storage info without decimals
2013-01-17 16:52:57 +01:00
bb43cf378b
Files: make sure keybinds js is loaded after files js
2013-01-16 21:36:25 +01:00
a8f963d9cf
Spaces to tabs
2013-01-16 18:09:16 +01:00
94068e5d08
Cache: show upgrade progress
2013-01-15 18:13:50 +01:00
938254a1c0
load jquery-visibility
2013-01-11 16:45:32 +01:00
48c7bed59b
make usedSpacePercent available in the files app
2013-01-02 15:06:49 +01:00
7e36f730ec
merge master into filesystem
2012-12-25 14:29:29 +01:00
39d874cd90
the maximum upload size is now part of the response of the upload and delete operation.
...
the maximum upload size is updated within the browser once an upload or delete operation has been finished
2012-12-20 17:16:53 +01:00
7d811e57e6
setting the timezone is now part of the login process and true part of the core.
2012-12-20 11:10:45 +01:00
7969d6e646
Merge branch 'master' into filesystem
2012-12-11 23:57:59 +01:00
0c6b53c25e
no message
2012-11-28 09:55:38 -07:00
5f03c306da
initial setup
2012-11-28 09:50:40 -07:00
555dec2d92
merge master into filesystem
2012-11-23 16:20:56 +01:00
20c24f234f
Do the url encoding once, only in breadcrumbs template
...
fixes issue #438
2012-11-16 16:12:28 +01:00
bf2ac9f113
merge master into filesystem
2012-11-15 00:37:54 +01:00
56239df2e7
Update all to use OCP\PERMISSION_* instead of OCP\Share::PERMISSION_*
2012-11-11 23:10:23 +01:00
41a61bc637
fix undefined index when loading files app
2012-11-08 21:36:13 +01:00
30d7993e01
Checkstyle fixes: NoSpaceAfterComma
2012-11-04 11:10:46 +01:00
afadf93d31
Checkstyle: many fixes
2012-11-02 19:53:02 +01:00
6e9e263497
merge master into filesystem
2012-10-30 22:59:55 +01:00
b563935498
Update apps/files/index.php
...
fix dirnames containing "+" not displayed
2012-10-29 16:44:50 +01:00
38371d1275
Merge branch 'master' into filesystem
2012-10-27 14:28:24 +02:00
dea0d20a9a
fix delete and sort files
2012-10-27 12:18:01 +02:00
Georg Ehrke
Bjoern Schiessle
Thomas Müller
Roman Geber
Lukas Reschke
Bart Visscher
Stefan Herbrechtsmeier
Robin Appelman
Michael Gapczynski
Erik Sargent
Thomas Tanghus
Felix Moeller
denis-b