51295e9a6b
Merge branch 'master' into sharing_mail_notification_master
...
Conflicts:
apps/files/index.php
apps/files/templates/index.php
2013-10-04 12:30:49 +02:00
47f59d2e42
we don't know \OCA\Encryption\Session if the encryption app is not enabled, so we have to set the status manually
2013-10-04 10:37:58 +02:00
fc76a13c52
Merge branch 'master' into sharing_mail_notification_master
...
Conflicts:
lib/public/share.php
2013-09-23 11:18:00 +02:00
f6e8a388a9
Merge branch 'master' into encryption_improved_error_messages_4617
...
Conflicts:
settings/ajax/changepassword.php
2013-09-23 10:39:12 +02:00
4b3e56bcf9
remove unneccessary lib in namespace
2013-09-20 16:46:33 +02:00
9e39118b52
namespaces use upcasefirst parts
...
when _ is left in namespace and files are named after their classes the autoloader will also find classes in the lib folder of an app
its magic!
2013-09-20 16:37:07 +02:00
12ff268e60
move upload dialog css to separate file
2013-09-18 17:20:14 +02:00
82cbbb8ab8
Merge branch 'master' into encryption_improved_error_messages_4617
...
Conflicts:
apps/files/index.php
2013-09-16 10:42:37 +02:00
534d93d2d3
Merge branch 'master' into sharing_mail_notification_master
...
Conflicts:
apps/files/index.php
2013-09-16 10:40:06 +02:00
30a2f2f352
Use hash part of URL for IE8 in files app
...
Before this fix, the URL wasn't updated in IE8 when navigating into
folders.
This fix makes use of the hash part of URLs to make this work in IE8,
since IE8 doesn't support the history API nor changing the URL without
redirecting.
From now, both the regular query URL "?dir=somedir" and "#?dir=somedir"
will work in both IE8 and non-IE8 browsers.
In IE8, query based URLs are automatically converted to hash URLs upon
page load. The conversion is done on the server side by redirecting the
user to the updated URL.
When loading a page directly using a hash URL in the form
"#?dir=somedir" in IE8, the server doesn't get the hash, so it will not
return any results in that case and rely on ajax to load the first page.
2013-09-13 20:48:35 +02:00
364e7991a4
Fixed ajax support to also update the current dir permissions
2013-09-13 19:59:15 +02:00
1304b511e9
Ajax calls for "files" and "files_trashbin" apps
...
Frontend:
- The files app list now uses ajax calls to refresh the list.
- Added support the browser back button (history API).
- Added mask + spinner while loading file list
Backend:
- Added utility function in core JS for parsing query strings.
- Moved file list + breadcrumb template data code to helper
functions
- Fixed some file paths in trashbin app to be similar to the files app
2013-09-13 19:59:14 +02:00
9d661eab23
adding calls to \OCA\files\lib\Helper::determineIcon($i) in files, trashbin and sharing
2013-09-12 00:40:35 +02:00
fb462e83cc
no longer enforce log out, but provide useful errors/warnings instead
2013-09-06 12:27:40 +02:00
b918c06be6
Merge branch 'master' into sharing_mail_notification_master
...
Conflicts:
lib/util.php
2013-09-02 14:41:46 +02:00
77adaee645
enable user to inform recipients about a shared file by mail
2013-08-30 13:53:49 +02:00
b7758d0f8d
Merge master into oc_preview
2013-08-29 10:50:55 +02:00
8cf9336bcb
storage information is path specific
2013-08-27 00:59:58 +02:00
224b80f906
move isMimeSupported out of template files
2013-08-21 15:55:59 +02:00
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
Bjoern Schiessle
Jörn Friedrich Dreyer
Vincent Petry
Vincent Petry
Thomas Müller
Georg Ehrke
Roman Geber
Lukas Reschke
Bart Visscher
Stefan Herbrechtsmeier
Robin Appelman
Michael Gapczynski