2936140838
[tx-robot] updated from transifex
2013-02-03 00:06:15 +01:00
42d59d5a16
Remove a warning by making sure the renamed file is a dir before trying and opening it
2013-02-02 23:18:29 +01:00
ed4130474a
Dav: update etag in filecache when doing a PROPSET
2013-02-02 18:26:27 +01:00
c61c98cbef
Dav: don't overwrite etag from filecache with old etag from properties table
2013-02-02 15:44:05 +01:00
37e6ac9a2a
initPaths: set include path before any owncloud function is called
...
Ensure we can find basic owncloud classes while detecting the owncloud
paths in function initPaths by add OC::$SERVERROOT . '/lib' to include
path before any owncloud function is called.
This fix a bug with XAMPP that cannot find the class OC_Config in
function OC_Request::scriptName when called from function
OC_Base::initPaths.
2013-02-02 12:07:18 +01:00
b29b55a332
[tx-robot] updated from transifex
2013-02-02 00:08:15 +01:00
03c18a6186
Merge pull request #1413 from owncloud/enable_removing_search_providers
...
add function to remove a search provider
2013-02-01 10:34:39 -08:00
0c85250380
add function to remove a search provider
2013-02-01 19:21:54 +01:00
2488a495c6
Merge pull request #1384 from owncloud/upgrade_fix
...
Check for upgrade/maintance mode before trying to load an app
2013-02-01 07:12:06 -08:00
b20529ee44
Merge pull request #1171 from owncloud/move-datadirectory-checks
...
Move data directory permission checks after data directory existence checks
2013-01-31 14:54:46 -08:00
caec0c476d
Merge pull request #1287 from owncloud/ocs_xml_attributes
...
API: Treat array keys starting with '@' as XML attributes
2013-01-31 14:39:31 -08:00
317261d6df
Merge pull request #1099 from herbrechtsmeier/ssl-proxy
...
add multiple domains reverse SSL proxy support
2013-01-31 14:01:32 -08:00
17f94de19b
Case insensitive Lang Detection fix #1328
2013-01-31 22:37:46 +01:00
7747f49263
add SSL proxy support
...
Add support for a reverse proxy that only forwards SSL connections
unencrypted to the web server.
This patch allows to detect the reverse proxy via regular expression for
the remote IP address and conditional overwrite the host name, protocol
and web root.
2013-01-31 18:43:30 +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
b471177439
Merge pull request #1379 from owncloud/improved_appsmanagement
...
Improved appsmanagement
2013-01-31 08:30:55 -08:00
31e723a907
Merge github.com:owncloud/core
...
Conflicts:
lib/public/share.php
2013-01-31 16:30:37 +00:00
209d599ec5
[tx-robot] updated from transifex
2013-01-31 17:05:21 +01:00
f7d281af67
just return "true" for now
2013-01-31 12:24:10 +01:00
77765bd967
remove some left over comments
2013-01-31 12:17:23 +01:00
ab255e8bb6
add missing brackets
2013-01-31 12:12:39 +01:00
9a19c0af4b
search for display name and uid (with no display name) since it is possible that not all users have a seperate display name
2013-01-31 12:09:42 +01:00
e8b423f666
style fixes
2013-01-31 10:30:13 +01:00
665bb41c1f
style fixes
2013-01-31 10:27:02 +01:00
5112dac102
remove spaces
2013-01-31 10:00:42 +01:00
057920b165
Still load js files in maintance mode
2013-01-30 23:05:44 +01:00
f452d2d0c4
Check for upgrade/maintance mode before trying to load an app
2013-01-30 22:55:33 +01:00
6043789394
Bumb version number for displayname db upgrade
2013-01-30 19:37:02 +01:00
207aa22d12
merge master into filesystem
2013-01-30 19:24:24 +01:00
af3b0e30ed
Cache: don't insert duplicated during upgrade
2013-01-30 19:19:19 +01:00
66cab77b6d
merge master
...
Merge branch 'master' into improved_appsmanagement
Conflicts:
settings/apps.php
settings/templates/apps.php
2013-01-30 14:36:17 +01:00
0bce22966c
Update lib/base.php
...
Correction of typo "locate" -> "locale".
2013-01-30 14:27:08 +01:00
389c4e8415
mark recommended apps. server part not yet fully implemented
2013-01-30 13:39:53 +01:00
3fa4b3abff
apps updater is now working
2013-01-30 12:08:14 +01:00
a6040d0cc7
Merge pull request #1308 from TheSFReader/master
...
Changed the linkTo function (from Helper class) to get rid of an unnecessary (and potentially non conform) leading '&' character when adding arguments
2013-01-30 02:37:11 -08:00
68266e70f2
[tx-robot] updated from transifex
2013-01-30 00:25:41 +01:00
250c565d2b
Merge pull request #1360 from owncloud/display_name
...
introduction of display names
2013-01-29 14:05:54 -08:00
6659798197
only change display name if the display name from the current user was changed; add correct display name to new user
2013-01-29 22:33:46 +01:00
007bddceba
version dump to trigger db update
2013-01-29 21:04:28 +01:00
ebc3d1b2d7
remove dubug value
2013-01-29 21:01:59 +01:00
79c309da83
Typo
2013-01-29 20:42:21 +01:00
59bb9931df
Adjust user interface to additions around displayName Handling
2013-01-29 20:09:41 +01:00
825cdf8560
add support for apps to register alternative login methods
...
below the standard login a list of icons/button will be displayed
2013-01-29 17:28:08 +01:00
ca4c006d5a
Make zip downloads use actual folder names, fix spelling mistakes
2013-01-28 23:51:35 -05:00
8c4931a645
[tx-robot] updated from transifex
2013-01-29 00:06:20 +01:00
74f6f85628
merge master into filesystem
2013-01-28 19:37:58 +01:00
06c1c35ac9
Fix phpdoc
2013-01-28 19:08:30 +01:00
590c4aa710
search display name instead of uid; fix key/value order for array access
2013-01-28 15:58:40 +01:00
c00b66fe5b
implement DisplayNamesInGroup for database back-end
2013-01-28 15:47:57 +01:00
232cc3211b
add oc:// streamwrapper to provide access to ownCloud's virtual filesystem
2013-01-28 15:35:30 +01:00
c9c919da57
Move streamwrappers to seperate files and put them in a namespace
2013-01-28 15:34:15 +01:00
e6cc0cd08a
implement display names for the database back-end
2013-01-28 15:07:31 +01:00
99ec26578a
Merge pull request #1313 from owncloud/updater-CSP
...
Make update page with CSP compatible
2013-01-28 05:43:47 -08:00
70c3ab3c53
update the display name for the database back-end
2013-01-28 14:23:15 +01:00
e0f2ed2757
interface and API to change display names
2013-01-28 14:09:11 +01:00
022a7b13b8
prepare user table to show and edit display names
2013-01-28 13:12:44 +01:00
996b5cf368
change order, key -> uid and value -> display name, this way it is also possible to have non-unique display names
2013-01-28 13:10:54 +01:00
857b15db37
Merge pull request #1318 from j-ed/master
...
added parameter mail_smtpauthtype to set SMTP authentication type.
2013-01-28 01:42:46 -08:00
1d44a99ebb
Merge branch 'master' into updater-CSP
...
Conflicts:
core/templates/update.php
2013-01-28 09:57:24 +01:00
31d83fddc4
Merge pull request #1321 from owncloud/csp-fixes
...
Files: CSP fixes
2013-01-28 00:29:46 -08:00
bca5ce724e
Merge branch 'master' into filesystem
2013-01-28 02:35:51 +01:00
3e59a87153
Filesystem: use the updated Mount::findById in getPath to ensure we get the correct path if the storage is also mounted outside the view
2013-01-28 01:02:04 +01:00
577e3b11d7
Filesystem: return all matching mounts in Mount::findById
2013-01-28 00:59:43 +01:00
77763fb856
Update lib/filestorage/common.php
...
Small cleanup
2013-01-27 16:07:21 +01:00
4cae141673
Filesystem: also add getPath to \OC\Filesystem
2013-01-27 00:18:15 +01:00
17bcea1585
Filesystem: add View->getPath to the cache api
2013-01-27 00:13:50 +01:00
9e2a066c7b
Cache: add function to get storage id and internal path of a file by id
2013-01-27 00:13:50 +01:00
69f11151e9
Filesystem: add Mount::findById
2013-01-27 00:13:49 +01:00
00a28062e1
[tx-robot] updated from transifex
2013-01-27 00:06:21 +01:00
9c7a18044d
Merge remote-tracking branch 'refs/remotes/upstream/master'
2013-01-26 23:19:40 +01:00
03b947e3ec
Don't check for updates for sub storages, these scans should be done in the background
2013-01-26 16:11:35 -05:00
b1b2eafa50
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
apps/files_external/lib/config.php
2013-01-26 21:51:18 +01:00
f25db779d9
Filesystem: move mount management to it's own class
2013-01-26 21:44:33 +01:00
7237ebf08b
Fix OC_Helper and change deprecated methods
2013-01-26 15:16:53 -05:00
2fa3efd697
Update lib/filestorage/common.php
...
Added function to clean a path
2013-01-26 19:44:09 +01:00
930b9b9cd0
merge master into filesystem
2013-01-26 18:49:45 +01:00
c9e25d3fab
Merge pull request #1320 from owncloud/implements-1316-master
...
lookup for OCA classes in all apps folders
2013-01-26 05:20:15 -08:00
7f0a3018b6
Fix undefined variable
2013-01-26 13:46:00 +01:00
276d98b9dd
Merge pull request #1059 from owncloud/fixing-998-master
...
Fixing 998 master
2013-01-26 04:15:40 -08:00
2cc77759aa
lookup for OCA classes in all apps folders
2013-01-26 12:45:50 +01:00
93834b78a1
Update lib/mail.php
...
added parameter mail_smtpauthtype to set SMTP authentication type.
2013-01-26 12:09:54 +01:00
af4411e33d
[tx-robot] updated from transifex
2013-01-26 00:10:07 +01:00
a65410f23c
Remove the CSP header for Firefox
...
https://bugzilla.mozilla.org/show_bug.cgi?id=737064 *gnarf*
2013-01-25 21:57:51 +01:00
dbc13cf6ee
Move update inline JS
2013-01-25 19:18:16 +01:00
7f49d35930
Move checkMaintenance and checkUpgrade
...
This is needed to ensure that the routing and linkTo() function for CSP
are available.
2013-01-25 19:15:02 +01:00
a606e8d944
use display name to show share_width and owner information
2013-01-25 17:40:23 +01:00
2aead5727e
Merge remote-tracking branch 'refs/remotes/upstream/master'
2013-01-25 17:15:02 +01:00
9f5847b739
Simplify the code and remove a first unnecessary (and non conform) '&' character when there are pending arguments
2013-01-25 17:02:44 +01:00
047f1988c3
Merge branch 'master' into no-inline-js
2013-01-25 16:11:07 +01:00
0d2a58bc5d
Initialize router also if ownCloud isn't installed
2013-01-25 14:57:52 +01:00
e5cc5a0a2d
Allow the loading of external images
2013-01-25 14:26:14 +01:00
b4291f1e8e
allow to get the display name from an abitrary user
2013-01-25 13:00:17 +01:00
4271430e60
get all display names from users in a given group
2013-01-25 11:48:03 +01:00
9bb8e05839
get all display names
2013-01-25 11:05:00 +01:00
6832dddf39
[tx-robot] updated from transifex
2013-01-25 00:05:56 +01:00
2fee1208ef
add display name to title instead if login-ID
2013-01-24 15:49:23 +01:00
d16574f070
new branch which introduces display names
...
first commit with some infrastructure code
2013-01-24 13:07:59 +01:00
b26279546c
Simpler method for getting the first char
2013-01-24 10:49:48 +00:00
d89be72972
Remove some whitespace
2013-01-24 10:40:47 +00:00
02f8c941f4
API: If key begins with '@' treat it as an xml attribute
2013-01-24 10:39:33 +00:00
1dac2ba496
Merge pull request #1286 from owncloud/ocs_api
...
Check that external api methods return instances of OC_OCS_Result
2013-01-24 02:37:40 -08:00
f9a9fc5670
Merge pull request #1265 from j-ed/master
...
add additional mail_smtp.. parameters to fix possible SMTP connection problems.
2013-01-24 00:11:03 -08:00
8f9d3cd01d
Code style update
2013-01-23 23:39:29 +00:00
3ff32eba25
[tx-robot] updated from transifex
2013-01-24 00:07:38 +01:00
14d0903a28
Merge branch 'master' of github.com:owncloud/core
2013-01-23 12:52:53 +00:00
293e7bdcf0
Notice about changing the standard policy
2013-01-23 13:44:43 +01:00
0517465f4d
Allow admins to change the CSP policy in the config file
2013-01-23 13:42:52 +01:00
b4c3dd84b4
update to jquery-ui 1.10.0
2013-01-23 11:37:52 +01:00
c8bbbb48d3
Merge master...
2013-01-23 11:30:40 +01:00
c986dbe573
[tx-robot] updated from transifex
2013-01-23 00:06:18 +01:00
9eecb91338
Merge pull request #1113 from owncloud/fix-issue-1085
...
Fix rendering of database connection error page
2013-01-22 14:38:44 -08:00
f858381775
merge master into filesystem
2013-01-22 23:27:04 +01:00
ec8609fa21
Merge pull request #1259 from TheSFReader/master
...
Add two specific mimetype extensions (ebooks): for epub and mobi files
2013-01-22 14:06:50 -08:00
9a1f65aab1
Some style fixes
2013-01-22 20:58:09 +01:00
7330fcf5e8
Cache: make mounts overwrite existing folders, prevents duplicate entries
2013-01-22 20:57:15 +01:00
aa648fca75
Merge branch 'master' into files_encryption
...
Conflicts:
apps/files_encryption/templates/settings.php
2013-01-22 17:31:05 +00:00
619780a67d
Merge branch 'master' into files_encryption
2013-01-22 16:50:20 +00:00
df6ba6955d
Update lib/mail.php
...
Added three additional mail_smtp.. parameters.
- mail_smtpdebug - enable debug messages to analyse SMTP problems.
- mail_smtptimeout - set SMTP timeout which is set to 10s by
default and this is sometimes to short especially if a malware/
spam scanner is used.
- mail_smtpsecure - force secure SMTP connections.
2013-01-22 14:13:24 +01:00
bd5ff29716
Merge branch 'master' into no-inline-js
2013-01-22 11:50:33 +01:00
351d206dd3
Allow eval() and send headers for legacy browsers
...
The blocking of eval() seems to have problems with JQuery 1.7.2 - let's allow it for now and disable it in the future.
2013-01-22 08:09:01 +01:00
5136f6d818
Make database connection error messages less verbose
2013-01-21 22:53:32 -05:00
3ffbaf4795
Allow iframes to external domains
2013-01-22 00:30:09 +01:00
f2d0eeae83
Merge branch 'master' into filesystem
2013-01-22 00:19:44 +01:00
8ede3290ae
Cache: add database indexes for mimetype and mimepart
2013-01-21 22:31:44 +01:00
30274ee33e
Move to OC_App
2013-01-21 22:18:11 +01:00
a29f9f90ab
Indentation
2013-01-21 22:17:48 +01:00
42a1a17a30
Cache: return non numberic storage id
2013-01-21 22:01:22 +01:00
0c59074eeb
Correct copy paste fail
2013-01-21 20:46:42 +01:00
a27f92a17a
we are getting closer. updating is not working yet.
2013-01-21 20:40:23 +01:00
8ca78fcf3f
Move requesttoken to oc-requesttoken.js
2013-01-21 20:24:18 +01:00
d58cee2f76
returning http status code 503 in case connecting to the database failed
2013-01-21 14:57:33 +01:00
aede26d996
[tx-robot] updated from transifex
2013-01-21 00:05:34 +01:00
af8c193605
Disallow inline JS
2013-01-20 23:30:16 +01:00
dea77b7610
cached queries need to be reset on schema change because they become invalid
...
fixes: https://github.com/owncloud/apps/issues/468
2013-01-20 22:46:26 +01:00
967b7947a1
Add the default-src
2013-01-20 12:19:09 +01:00
c82d6e5153
Add CSP header
2013-01-20 12:06:33 +01:00
4c05661875
Merge branch 'filesystem' of github.com:owncloud/core into filesystem
2013-01-20 03:11:50 +01:00
83d6221322
merge master into filesytem
2013-01-20 03:11:04 +01:00
664f33a29c
Update mtimes of all parent folders after change inside
2013-01-19 21:04:25 -05:00
ebc0c4b85b
[tx-robot] updated from transifex
2013-01-20 00:06:40 +01:00
42b924da0e
Also replace the backslash with a minus
...
For Windows systems
2013-01-19 19:47:26 +01:00
f1939866f3
Merge pull request #1214 from Raydiation/master
...
Load Classpaths of apps before appinfo/routes.php
2013-01-19 09:44:48 -08:00
b8318e6df4
Merge branch 'master' into fixing-998-master
...
Conflicts:
apps/files/js/files.js
2013-01-19 15:58:15 +01:00
316eef3ded
Fix sharing issue with collection and children mismatches
2013-01-19 01:50:02 -05:00
cd8d8360b0
Disable fancy folder sharing for now
2013-01-18 23:57:13 -05:00
5df6f9d14d
Fix merge
2013-01-18 23:56:47 -05:00
9e28f924c2
Merge branch 'master' into move-datadirectory-checks
2013-01-18 23:31:06 -05:00
da34e58589
Move permissions check to new function checkDataDirectoryPermissions()
2013-01-18 23:30:56 -05:00
a17ca3a69a
[tx-robot] updated from transifex
2013-01-19 00:05:38 +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
5ff29b4348
fixing indent
2013-01-18 20:09:03 +01:00
487e401361
Typo fix (comment) /lib/base.php
2013-01-18 10:52:29 -08:00
9ffd4197ae
Fix wrong word in comment
2013-01-18 16:38:40 +01:00
d2c5f9bec7
fix error message, add "appid" to the output to know which app caused the error if OC_App::getStorage() fails.
...
Port of approved patch for stable45: https://github.com/owncloud/core/pull/1222
2013-01-18 15:14:42 +01:00
0ed635240a
Merge pull request #1205 from owncloud/ocs_api
...
Return 401 headers when trying to access a restricted api call
2013-01-18 05:52:51 -08:00
5df57e4ada
Merge pull request #1181 from owncloud/return-503-in-maintenance
...
in case of maintenance the error page returns http status 503.
2013-01-18 04:02:03 -08:00
824fcf6624
[tx-robot] updated from transifex
2013-01-18 00:04:36 +01:00
73522fe189
Add ebook specific mimetypes
2013-01-17 22:20:57 +01:00
eb9cd0858e
Add ebook specific mimetypes
2013-01-17 21:57:04 +01:00
2b95ae1e6d
spaces to tabs
2013-01-17 21:44:40 +01:00
a8094abac7
load classpaths of apps before routes
2013-01-17 21:42:46 +01:00
b4954c0c89
Correct spelling of 'Authorization'
2013-01-17 16:30:14 +00:00
d85e440aa1
Merge pull request #1148 from seancomeau/topic/setup
...
Fix issue #108
2013-01-16 22:38:57 -08:00
433fa19268
[tx-robot] updated from transifex
2013-01-17 00:27:40 +01:00
9dc668740a
Check that api methods return the correct result type
2013-01-16 21:46:00 +00:00
6871a150bd
Cache: use a database transition for scanning each folder
...
gives a massive speed improvement while scanning files
2013-01-16 21:58:17 +01:00
f9c42a196f
Cache: no longer using this file
2013-01-16 21:36:04 +01:00
358671ac1d
Fix incorrect indentation
2013-01-16 20:29:29 +00:00
098c84a29c
Return 401 headers when authentication is required for the api call
2013-01-16 20:27:43 +00:00
29ec007979
Cache: dont migrate permissions, cache them on demain instead
2013-01-16 19:11:33 +01:00
5445b94416
merge master into filesystem
2013-01-16 19:04:50 +01:00
5bfe4adbaa
Whitespace cleanup
2013-01-16 18:09:16 +01:00
a8f963d9cf
Spaces to tabs
2013-01-16 18:09:16 +01:00
cb0fd30458
Merge pull request #1185 from owncloud/fixing-1162-master
...
handling proper display of files/folders with negative size
2013-01-16 05:18:53 -08:00
1f7bf57ece
Merge pull request #1195 from owncloud/cache_prepared
...
Cache prepared statements in OC_DB
2013-01-15 22:23:34 -08:00
f18fc1c510
Clear cached prepared statements when switching between mdb2 and pdo
2013-01-16 01:12:13 +01:00
4668f8c86e
Merge pull request #1178 from owncloud/return_true_because_of_ponies
...
Remove uneeded return
2013-01-15 14:01:48 -08:00
a08490364d
Cache prepared statements in OC_DB
2013-01-15 20:21:06 +01:00
7debfac0dc
Cache: more efficient upgrading
2013-01-15 19:11:12 +01:00
94068e5d08
Cache: show upgrade progress
2013-01-15 18:13:50 +01:00
9bf367e7f8
merge master into filesystem
2013-01-15 14:57:23 +01:00
388bb6a5e1
Merge branch 'master' into fixing-unused-and-undefined-in-master
2013-01-14 23:41:34 +01:00
44e5c052b3
handling proper display of files/folders with negative size
...
refs #1162
2013-01-14 23:39:31 +01:00
ab287d2ba4
Move { to same line
2013-01-14 22:04:31 +01:00
c845e75693
Expand if to multiple lines
...
Oneliners are ugly.
2013-01-14 22:01:52 +01:00
53ca0db434
Merge pull request #1177 from owncloud/OC_User--isAdminUser()
...
Check if user is admin - bool
2013-01-14 12:53:18 -08:00
31ce320c52
in case of maintenance the error page returns http status 503.
...
This is necessary to enable the desktop sync client to react properly.
Currently the SabreDAV plugin OC_Connector_Sabre_MaintenancePlugin is not executed because this error page is returned before the SabreDAV code is executed
2013-01-14 21:39:55 +01:00
eab6d7eb23
Enhanced auth is totally unmaintained and broken
...
Let's remove it, it's also not secure anymore with the introduction of
our API etc...
(And doesn't work with ldap etc…)
2013-01-14 21:39:49 +01:00
0132a0b2cf
Rename TestException to DatabaseSetupException
2013-01-14 12:36:50 -08:00
8b2307ce4b
Merge pull request #1172 from owncloud/isSubDirectory
...
Simplify the isSubDirectory() function
2013-01-14 12:36:38 -08:00
42cd99626e
Use a custom exception instead of adding a delimiter to the error message
2013-01-14 11:57:40 -08:00
cc00c54f6a
Remove uneeded returns
2013-01-14 20:18:08 +01:00
e8b45caa51
Remove uneeded return
...
Thx @Raydiation
2013-01-14 19:57:28 +01:00
31b1a73e1f
Check if user is admin - bool
...
There was no "isAdminUser()" function which returned bool. This is
irritiating as there were a loooooooot of places in the code which
checked this itself with `OC_Group::inGroup($uid, 'admin)` - why not
use a function for this?
(Especially if you consider that we might change the group name in the
future, which would lead to problems then)
Additionally, @Raydiation needed such a method for his AppFramework :)
2013-01-14 19:45:17 +01:00
de0ed634f2
Added two hooks: pre_unshare and pre_unshareAll, useful for files_encryption
2013-01-14 17:05:47 +00:00
99adfbdb86
Check for string position instead of string existence
...
otherwise /foo/bar would be detected as a subfolder of /bar
THX @icewind1991
2013-01-14 16:51:35 +01:00
fa78fbe0c3
Merge pull request #1112 from Raydiation/master
...
This fixes a problem that prevented app routes from being loaded after ocs_api merge
2013-01-14 07:35:14 -08:00
c29310aaef
[tx-robot] updated from transifex
2013-01-14 00:18:21 +01:00
b7db967dc5
Commentblocks should begin with two *
2013-01-13 14:54:18 +01:00
c27833b143
Add @brief to description
2013-01-13 14:50:31 +01:00
e151210a62
Simplify the isSubDirectory() function
...
isSubDirectory() checks if a specified $sub is a subdirectory of the
$parent, this is needed to prevent file inclusions.
Actually, the current code is more kind of a "hack" which I always
struggle over if browsing through source. So this should be a much
better implementation.
The implementation is really straightforward:
- [realpath()](http://php.net/manual/function.realpath.php ) expands all
symbolic links and resolves references to '/./', '/../' and extra '/'
characters in the input path and return the canonicalized absolute
pathname.
- [strpos()](php.net/manual/function.strpos.php) returns FALSE if the
substring wasn't found.
Since this is an absolutely critical piece of code, I'd like to ensure
that this is absolutely safe!
2013-01-13 14:33:19 +01:00
ebcf41b420
Move data directory permission checks after data directory existence checks
2013-01-12 23:35:13 -05:00
094a852bff
Wrap the etag in double quotes
2013-01-11 21:09:58 -05:00
b30648cb7d
Don't waste time making another call since we know it doesn't exist
2013-01-11 21:09:01 -05:00
a00b9e0a03
Bump version
2013-01-11 21:01:28 -05:00
6f049d0889
Merge branch 'filesystem' into filesystem-etags
2013-01-11 21:00:02 -05:00
9e2f3a5324
Remove old create etag function
2013-01-11 20:59:53 -05:00
8a63bcc1e8
Don't use more entropy for etags
2013-01-11 20:56:36 -05:00
364b1cd391
Merge branch 'master' into fixing-998-master
...
Conflicts:
apps/files/js/files.js
2013-01-11 10:00:12 +01:00
23896a7290
Merge branch 'master' into fixing-784-master
...
Conflicts:
apps/files/js/files.js
2013-01-11 09:53:12 +01:00
4835525c46
Switch scan to scanFile for root of mount points
2013-01-10 22:28:50 -05:00
60489764f3
Merge pull request #1133 from owncloud/add_linebreaks_in_sharing
...
add more linebreaks, replace SQL LIMIT with param
2013-01-10 15:14:14 -08:00
d03dce1283
[tx-robot] updated from transifex
2013-01-11 00:06:14 +01:00
ba9c967435
Throw an exception when creating a MySQL user fails and display exception error text to user
2013-01-10 14:43:08 -08:00
3e83023bf6
Removed unnecessary line
2013-01-10 18:16:56 +00:00
9ca9124dc1
Merge branch 'master' into files_encryption
2013-01-10 18:07:15 +00:00
aa15fcf22f
Scan mount points in root before adding a entry
2013-01-10 12:09:55 -05:00
23dd7f1bea
Merge pull request #1127 from owncloud/fixing-641-for-webdav-master
...
webdav returns "503 Service Unavailable" in case the ownCloud server is ...
2013-01-10 02:27:00 -08:00
106541361c
Change length of mimetypes to 255, the maximum length according to RFC 4288
2013-01-09 22:57:42 -05:00
fbcf62389c
Merge branch 'master' into external_storage_ui_feedback
...
Conflicts:
apps/files_external/lib/webdav.php
2013-01-09 21:49:21 -05:00
912050afa0
[tx-robot] updated from transifex
2013-01-10 00:05:53 +01:00
42e3eaf45a
add more linebreaks, replace SQL LIMIT with param
2013-01-09 13:57:51 +01:00
ccdaec6296
webdav returns "503 Service Unavailable" in case the ownCloud server is currently in maintenance mode.
2013-01-09 00:37:50 +01:00
43415386a8
Upstream merged my patch to add additional ssl root certificates to the webdav client.
...
This means that OC_Connector_Sabre_Client is no longer needed
2013-01-08 17:44:28 +01:00
e8b195bf10
Almost fix Shared scanner...
2013-01-07 20:52:51 -05:00
75dbe88664
added cleanup recommendations by including ocs in the cachedKey method and moving the ocs routes stuff at the end of the loadRoutes method
2013-01-07 21:57:13 +01:00
5174eda232
Fix permissions for mount point
2013-01-07 15:21:38 -05:00
d39655e126
Move template parameters around so database error page is properly rendered
2013-01-07 14:15:51 -05:00
6801f82d09
Merge branch 'filesystem' into filesystem-etags
...
Conflicts:
lib/files/cache/cache.php
2013-01-07 10:28:37 -05:00
5ccbfd9079
readded ocs routes
2013-01-07 15:48:45 +01:00
f80bc4ed53
fixed error that displayed a white page and a warning that routes could not be loaded from apps that was caused by the ocs_api merge
2013-01-07 15:34:42 +01:00
d0377b1951
Cache: normalize mimetypes
2013-01-07 02:09:21 +01:00
439578288f
Cache: split permission cache scanning and cache scanning
2013-01-07 01:03:11 +01:00
457dc270f5
Fix messed up mounts
2013-01-07 00:36:39 +01:00
0ca5047da5
Autoload namespaced test classes
2013-01-07 00:36:01 +01:00
e8d08d4930
merge master into filesystem
2013-01-07 00:16:10 +01:00
a21da9f9fd
fixing returns
2013-01-06 23:59:02 +01:00
1093cdd823
fixing returns
2013-01-06 23:57:27 +01:00
19edb29cc3
add missing return
2013-01-06 23:54:18 +01:00
cdd28fcc46
fixing undefined variable $where
2013-01-06 23:48:04 +01:00
408b2cba58
fixing undefined variable $result - should be $query I assume
2013-01-06 23:45:12 +01:00
01cecc9522
initialize $result
2013-01-06 23:43:02 +01:00
19e604c104
fixing call of OC_Log::write() - missing parameter
2013-01-06 23:30:17 +01:00
a143e77ee4
removing unused parameter $parameters
...
fixing undefined variable $useDir
2013-01-06 23:29:43 +01:00
bae1755184
Merge branch 'master' into fixing-784-master
...
Conflicts:
apps/files/ajax/upload.php
apps/files/js/files.js
lib/helper.php
2013-01-06 22:40:35 +01:00
a68b597e83
Merge branch 'master' into files_encryption
2013-01-06 18:53:32 +00:00
7ebfcab49b
Merge branch 'master' into fixing-998-master
...
Conflicts:
lib/helper.php
2013-01-06 12:18:21 +01:00
6806484c16
Merge branch 'master' into fixing-998-master
2013-01-06 10:36:14 +01:00
035d0aa9d5
Merge branch 'master' into update-progress
2013-01-05 12:24:21 -05:00
69e86c0213
Merge branch 'master' into files_encryption
2013-01-05 17:22:01 +00:00
f6426cee04
Tweak failure message and throw exceptions from updateDbFromStructure()
2013-01-05 12:13:36 -05:00
89823ef4f9
Modify and include additional update messages from updating apps
2013-01-05 11:28:01 -05:00
0c6213a371
Merge pull request #1066 from owncloud/fix-388-master
...
workaround for 32-bit systems to handle filesizes bigger than 2GB
2013-01-05 06:21:28 -08:00
0b13b41189
Merge pull request #1053 from owncloud/ocs_api
...
External API for ownCloud based on OCS
2013-01-04 17:18:58 -08:00
a94405b4e4
Only show the version updating to instead of worrying about converting internal to a formatted version
2013-01-04 20:13:00 -05:00
da28ae0069
remove duplicate return
2013-01-05 00:09:37 +01:00
2cb6632752
enhanced log message
2013-01-04 23:44:01 +01:00
ac50c2f973
documentation adjusted on the way
2013-01-04 23:04:23 +01:00
cedec593ee
Fallback to use COM or exec('stat ..') is only executed if stat or filesize return negative values.
...
Special case of BSD has been added as stat syntax differs
In addition unknown OS is logged
2013-01-04 23:03:26 +01:00
dfc8d757b5
OC_Helper::is_function_enabled() added to find out if a function is available
...
And some documentation adjusted on the way
2013-01-04 23:00:51 +01:00
f2e6df807d
Add back check if installed around background jobs
2013-01-04 14:16:59 -05:00
e7eea3dd2e
Use hooks to send updates from apps
2013-01-04 10:21:33 -05:00
7505837079
Basic update progress of database update only
2013-01-03 21:32:33 -05:00
a52aa69ffe
Rearrange code to prepare for updater feedback
2013-01-03 14:11:00 -05:00
1137723b2a
Remove unnecessary length parameter from last commit
2013-01-03 12:13:45 -05:00
38876fc98a
Update old storage classes names to the new namespace during mounting
2013-01-03 12:07:04 -05:00
e40be93e87
merge master into filesystem
2013-01-03 15:59:17 +01:00
ce443818d4
Check if oc_token cookie exists before trying to use it
2013-01-02 19:59:04 -05:00
045c0acc92
workaround for 32-bit systems to handle filesizes bigger than 2GB
2013-01-03 00:38:44 +01:00
34e5cb5070
fixing indent
2013-01-03 00:13:30 +01:00
3bcdd8c900
[tx-robot] updated from transifex
2013-01-03 00:05:19 +01:00
9dc5ea172e
Merge pull request #975 from irgsmirx/patch-1
...
Update lib/util.php
2013-01-02 14:01:38 -08:00
a068ddff64
Use the sub storage's permission cache for retrieving the correct permission
2013-01-02 14:40:06 -05:00
1727b2e84d
add smtp port configuration option
2013-01-02 19:04:08 +01:00
bf69677933
Merge branch 'master' into files_encryption
...
Conflicts:
apps/files/css/files.css
apps/files/index.php
apps/files/js/files.js
apps/files/js/keyboardshortcuts.js
apps/files/l10n/da.php
apps/files/l10n/el.php
apps/files/l10n/eu.php
apps/files/l10n/hu_HU.php
apps/files/l10n/mk.php
apps/files/l10n/nb_NO.php
apps/files/l10n/ro.php
apps/files/l10n/ru.php
apps/files/l10n/ru_RU.php
apps/files/l10n/th_TH.php
apps/files/l10n/tr.php
apps/files/templates/admin.php
apps/files/templates/index.php
apps/files/templates/part.breadcrumb.php
apps/files_encryption/appinfo/app.php
apps/files_encryption/lib/crypt.php
apps/files_encryption/lib/cryptstream.php
apps/files_encryption/lib/proxy.php
apps/files_encryption/settings.php
apps/files_encryption/templates/settings.php
apps/files_encryption/tests/proxy.php
apps/files_encryption/tests/stream.php
apps/files_external/l10n/gl.php
apps/files_external/l10n/uk.php
apps/files_external/personal.php
apps/files_external/settings.php
apps/files_external/templates/settings.php
apps/files_sharing/public.php
apps/user_ldap/l10n/gl.php
apps/user_ldap/l10n/uk.php
apps/user_ldap/lib/access.php
apps/user_webdavauth/l10n/eo.php
apps/user_webdavauth/l10n/eu.php
apps/user_webdavauth/l10n/fr.php
apps/user_webdavauth/l10n/gl.php
apps/user_webdavauth/l10n/sl.php
apps/user_webdavauth/l10n/tr.php
apps/user_webdavauth/l10n/uk.php
apps/user_webdavauth/l10n/zh_CN.php
core/ajax/share.php
core/css/styles.css
core/l10n/ca.php
core/l10n/de.php
core/l10n/de_DE.php
core/l10n/el.php
core/l10n/eo.php
core/l10n/es.php
core/l10n/eu.php
core/l10n/fr.php
core/l10n/gl.php
core/l10n/he.php
core/l10n/is.php
core/l10n/it.php
core/l10n/nl.php
core/l10n/pl.php
core/l10n/pt_PT.php
core/l10n/ru.php
core/l10n/sl.php
core/l10n/tr.php
core/l10n/uk.php
core/l10n/zh_CN.php
core/templates/installation.php
core/templates/login.php
l10n/ar/files_external.po
l10n/ar/settings.po
l10n/bg_BG/files_external.po
l10n/bg_BG/settings.po
l10n/ca/core.po
l10n/ca/files_external.po
l10n/ca/settings.po
l10n/cs_CZ/files_external.po
l10n/cs_CZ/settings.po
l10n/da/files.po
l10n/da/files_external.po
l10n/da/settings.po
l10n/de/core.po
l10n/de/files_external.po
l10n/de/settings.po
l10n/de_DE/core.po
l10n/de_DE/files_external.po
l10n/de_DE/settings.po
l10n/el/core.po
l10n/el/files.po
l10n/el/files_external.po
l10n/el/settings.po
l10n/eo/core.po
l10n/eo/files_external.po
l10n/eo/settings.po
l10n/eo/user_webdavauth.po
l10n/es/core.po
l10n/es/files_external.po
l10n/es/settings.po
l10n/es_AR/core.po
l10n/es_AR/files_external.po
l10n/es_AR/settings.po
l10n/et_EE/files_external.po
l10n/et_EE/settings.po
l10n/et_EE/user_webdavauth.po
l10n/eu/core.po
l10n/eu/files.po
l10n/eu/files_external.po
l10n/eu/settings.po
l10n/eu/user_webdavauth.po
l10n/fa/files_external.po
l10n/fa/settings.po
l10n/fi_FI/files_external.po
l10n/fi_FI/settings.po
l10n/fr/core.po
l10n/fr/files_external.po
l10n/fr/settings.po
l10n/fr/user_webdavauth.po
l10n/gl/core.po
l10n/gl/files_external.po
l10n/gl/settings.po
l10n/gl/user_ldap.po
l10n/gl/user_webdavauth.po
l10n/he/core.po
l10n/he/files_external.po
l10n/he/settings.po
l10n/hi/files_external.po
l10n/hi/settings.po
l10n/hr/files_external.po
l10n/hr/settings.po
l10n/hu_HU/files.po
l10n/hu_HU/files_external.po
l10n/hu_HU/settings.po
l10n/ia/files_external.po
l10n/ia/settings.po
l10n/id/files_external.po
l10n/id/settings.po
l10n/is/core.po
l10n/is/files.po
l10n/is/files_encryption.po
l10n/is/files_external.po
l10n/is/files_sharing.po
l10n/is/files_versions.po
l10n/is/lib.po
l10n/is/settings.po
l10n/is/user_ldap.po
l10n/is/user_webdavauth.po
l10n/it/core.po
l10n/it/files_external.po
l10n/it/settings.po
l10n/ja_JP/core.po
l10n/ja_JP/files_external.po
l10n/ja_JP/settings.po
l10n/ka_GE/files_external.po
l10n/ka_GE/settings.po
l10n/ko/core.po
l10n/ko/files_external.po
l10n/ko/settings.po
l10n/ko/user_ldap.po
l10n/ko/user_webdavauth.po
l10n/ku_IQ/files_external.po
l10n/ku_IQ/settings.po
l10n/lb/files_external.po
l10n/lb/settings.po
l10n/lt_LT/files_external.po
l10n/lt_LT/settings.po
l10n/lv/files_external.po
l10n/lv/settings.po
l10n/mk/files.po
l10n/mk/files_external.po
l10n/mk/settings.po
l10n/ms_MY/files_external.po
l10n/ms_MY/settings.po
l10n/nb_NO/files.po
l10n/nb_NO/files_external.po
l10n/nb_NO/settings.po
l10n/nl/core.po
l10n/nl/files_external.po
l10n/nl/settings.po
l10n/nn_NO/files_external.po
l10n/nn_NO/settings.po
l10n/oc/files_external.po
l10n/oc/settings.po
l10n/pl/core.po
l10n/pl/files_external.po
l10n/pl/settings.po
l10n/pl_PL/files_external.po
l10n/pl_PL/settings.po
l10n/pt_BR/core.po
l10n/pt_BR/files_external.po
l10n/pt_BR/settings.po
l10n/pt_PT/core.po
l10n/pt_PT/files_external.po
l10n/pt_PT/settings.po
l10n/ro/files.po
l10n/ro/files_external.po
l10n/ro/settings.po
l10n/ru/core.po
l10n/ru/files.po
l10n/ru/files_external.po
l10n/ru/settings.po
l10n/ru_RU/files.po
l10n/ru_RU/files_external.po
l10n/ru_RU/settings.po
l10n/si_LK/files_external.po
l10n/si_LK/settings.po
l10n/sk_SK/core.po
l10n/sk_SK/files_external.po
l10n/sk_SK/settings.po
l10n/sk_SK/user_webdavauth.po
l10n/sl/core.po
l10n/sl/files_external.po
l10n/sl/settings.po
l10n/sl/user_webdavauth.po
l10n/sq/core.po
l10n/sq/files_external.po
l10n/sq/settings.po
l10n/sq/user_ldap.po
l10n/sq/user_webdavauth.po
l10n/sr/core.po
l10n/sr/files_external.po
l10n/sr/settings.po
l10n/sr@latin/files_external.po
l10n/sr@latin/settings.po
l10n/sv/files_external.po
l10n/sv/settings.po
l10n/ta_LK/files_external.po
l10n/ta_LK/settings.po
l10n/ta_LK/user_ldap.po
l10n/ta_LK/user_webdavauth.po
l10n/templates/core.pot
l10n/templates/files.pot
l10n/templates/files_encryption.pot
l10n/templates/files_external.pot
l10n/templates/files_sharing.pot
l10n/templates/files_versions.pot
l10n/templates/lib.pot
l10n/templates/settings.pot
l10n/templates/user_ldap.pot
l10n/templates/user_webdavauth.pot
l10n/th_TH/core.po
l10n/th_TH/files.po
l10n/th_TH/files_external.po
l10n/th_TH/settings.po
l10n/th_TH/user_webdavauth.po
l10n/tr/core.po
l10n/tr/files.po
l10n/tr/files_external.po
l10n/tr/settings.po
l10n/tr/user_webdavauth.po
l10n/uk/core.po
l10n/uk/files_external.po
l10n/uk/settings.po
l10n/uk/user_ldap.po
l10n/uk/user_webdavauth.po
l10n/vi/core.po
l10n/vi/files_external.po
l10n/vi/settings.po
l10n/zh_CN.GB2312/files_external.po
l10n/zh_CN.GB2312/settings.po
l10n/zh_CN/core.po
l10n/zh_CN/files_external.po
l10n/zh_CN/settings.po
l10n/zh_CN/user_webdavauth.po
l10n/zh_HK/core.po
l10n/zh_HK/files_external.po
l10n/zh_HK/settings.po
l10n/zh_HK/user_ldap.po
l10n/zh_HK/user_webdavauth.po
l10n/zh_TW/core.po
l10n/zh_TW/files_external.po
l10n/zh_TW/settings.po
l10n/zh_TW/user_ldap.po
l10n/zh_TW/user_webdavauth.po
l10n/zu_ZA/files_external.po
l10n/zu_ZA/settings.po
lib/base.php
lib/filecache.php
lib/files.php
lib/helper.php
lib/l10n.php
lib/request.php
lib/util.php
settings/ajax/togglegroups.php
settings/js/users.js
settings/l10n/ar.php
settings/l10n/de_DE.php
settings/l10n/el.php
settings/l10n/eo.php
settings/l10n/es_AR.php
settings/l10n/eu.php
settings/l10n/fa.php
settings/l10n/gl.php
settings/l10n/he.php
settings/l10n/hi.php
settings/l10n/ko.php
settings/l10n/si_LK.php
settings/l10n/sk_SK.php
settings/l10n/sl.php
settings/l10n/sr.php
settings/l10n/ta_LK.php
settings/l10n/th_TH.php
settings/l10n/tr.php
settings/l10n/uk.php
settings/l10n/vi.php
settings/l10n/zh_CN.php
settings/l10n/zh_TW.php
settings/templates/help.php
2013-01-02 17:14:23 +00:00
54f6f1e6b7
phpdoc fixes for public api
2013-01-02 16:38:20 +01:00
2d36a20a1d
moving storage calculation code to OC_Helper::getStorageInfo()
2013-01-02 14:35:45 +01:00
a164fd160f
Cache: provide path hints to getCache/etc where available
2013-01-01 20:20:20 +01:00
04f83e3b53
Cache: optional path argument for getCache/Scanner/etc
2013-01-01 20:20:20 +01:00
f4e4a06826
Forgot to select storage from filecache
2013-01-01 12:17:54 -05:00
b41189de44
Cache: allow storage backends to overwrite Watcher
2013-01-01 18:04:29 +01:00
f2ca7023e1
Fix Shared root problems with Watcher and Quota proxy
2013-01-01 11:19:33 -05:00
d0a50fae83
Fix eTagUpdate and add tests
2012-12-31 18:16:44 -05:00
8a5f583cac
Remove WIP OAuth code
2012-12-31 16:19:46 +00:00
9626d9ce31
Code cleanup and add copyright info
2012-12-31 16:08:21 +00:00
6eb194b702
Merge branch 'master' into ocs_api
...
Conflicts:
l10n/templates/core.pot
l10n/templates/files.pot
l10n/templates/files_encryption.pot
l10n/templates/files_external.pot
l10n/templates/files_sharing.pot
l10n/templates/files_versions.pot
l10n/templates/lib.pot
l10n/templates/settings.pot
l10n/templates/user_ldap.pot
l10n/templates/user_webdavauth.pot
2012-12-31 15:47:15 +00:00
218a5ea890
Remove unused methods
2012-12-31 14:16:29 +00:00
aea8b0ff5c
Merge branch 'filesystem' into filesystem-etags
...
Conflicts:
lib/files/cache/updater.php
2012-12-30 21:26:48 -05:00
96e08a1d96
Fix function name
2012-12-30 21:23:17 -05:00
3ee3323b87
Fix retrieving of cache and scanner in Updater class
2012-12-30 20:27:38 -05:00
77f12c526b
Update etags in parent folders
2012-12-30 19:54:51 -05:00
83064aca51
Remove old etag code
2012-12-30 19:23:31 -05:00
a5cb7363a5
Use etags from file cache in SabreDAV connector
2012-12-30 19:18:05 -05:00
329bddab48
[tx-robot] updated from transifex
2012-12-31 00:05:31 +01:00
2c23e143d3
Store etags in the file cache
2012-12-30 16:32:55 -05:00
66e57f5fb1
[tx-robot] updated from transifex
2012-12-30 00:05:52 +01:00
7980bccaab
Fall back to default log file if logfile config file not found, suppress writing errors, fixes issue #826
2012-12-29 19:30:31 +00:00
cfc3526b25
Fix data for shared root folder
2012-12-29 11:45:13 -05:00
8bdfb04056
Fix shared folders
2012-12-28 15:06:12 -05:00
ad902a9848
Move storage backend tests from constructor to test function
2012-12-28 12:00:48 -05:00
e9c51b319e
[tx-robot] updated from transifex
2012-12-28 00:20:34 +01:00
b035626709
Retrieve storage correctly, filename is not the mountpoint
2012-12-27 16:53:32 -05:00
65f1e52107
Change old is_readable to isReadable, fixes downloads
2012-12-27 15:49:48 -05:00
27f9ea2abb
[tx-robot] updated from transifex
2012-12-27 00:05:17 +01:00
1910057900
Fix shared statuses inside folders
2012-12-26 16:20:10 -05:00
b4515d874e
Only folders have Create permission
2012-12-26 15:36:50 -05:00
7e36f730ec
merge master into filesystem
2012-12-25 14:29:29 +01:00
7d52c39419
[tx-robot] updated from transifex
2012-12-24 00:12:16 +01:00
15da11effe
Merge pull request #845 from owncloud/sqlite_error
...
Try to fix #836
2012-12-22 15:22:09 -08:00
986f5d9f3e
fixing variable name
2012-12-21 00:04:58 +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
1e3231c732
Update lib/util.php
...
getUrlContent should take proxy setting into consideration when not using curl, as well
2012-12-20 12:01:11 +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
a64a923d56
call it "proxy" instead of "curlproxy"
...
Thanks Bart for the hint.
This also switches "==" to "<>" and not the code actually works ;-)
2012-12-19 18:50:19 +01:00
f012135992
make it more readable as deepdiver suggested
2012-12-19 18:50:19 +01:00
019da9943a
add curl proxy support. Fixes #504
...
https://github.com/owncloud/core/issues/504
2012-12-19 18:50:19 +01:00
b162e72f94
Merge pull request #961 from owncloud/check_locale
...
add a check and a warning if setlocale is working
2012-12-19 08:53:43 -08:00
d7fbe47583
Merge pull request #868 from owncloud/new_doc_system
...
New doc system
2012-12-19 06:40:37 -08:00
196f1c3786
add a check and a warning if setlocale is working
2012-12-19 15:10:33 +01:00
186147d1ee
refs #933 send content length header - this will allow the browser to show the progressbar
2012-12-19 11:22:01 +01:00
d2828bab07
fixes default email sender address
2012-12-19 01:09:14 +01:00
a4b0df419e
[tx-robot] updated from transifex
2012-12-18 00:14:58 +01:00
b6eb95349e
fix utf8 filenames in ie download response header according to rfc5987, see http://stackoverflow.com/questions/93551/how-to-encode-the-filename-parameter-of-content-disposition-header-in-http
2012-12-17 16:46:07 +01:00
39eebebd99
Fall back to default log file if logfile config file not found, suppress writing errors, fixes issue #826
2012-12-16 19:43:32 -05:00
3c98f36121
Merge branch 'master' into ocs_api
2012-12-16 22:29:00 +00:00
4301cd7f61
wrap hooks into a try, catch to prevent a faulty app from crashing the request
2012-12-16 20:29:36 +01:00
bf05ff351f
Initial support for file sharing with filesystem branch
2012-12-15 19:44:59 -05:00
b12abb2c94
use numeric ids for storages in the filecache
2012-12-15 23:35:07 +01:00
8951769cae
Check sub storage isn't null or false
2012-12-15 17:16:26 -05:00
39b5199775
API: PUT and DELETE variables are now accessed from the parameters array
2012-12-15 12:37:44 +00:00
cf3665057c
make sure folders that are not fully scanned are at least shallow scanned when we open them
...
the fact that they are in the cache does not mean they are scanned
2012-12-15 03:21:39 +01:00
4be039e6cb
Filecache Watcher: use scan or scanFile based on the current item, not the cached item
2012-12-15 03:10:56 +01:00
bc52f12162
dont insert and entry in the filecache during upgrade if the id already exists in the filecache
...
most likely the result from an incompelte upgrade
2012-12-15 02:29:34 +01:00
c6a5ce54a7
these functions should be static
2012-12-15 02:22:09 +01:00
946d58eaa8
merge master into filesystem
2012-12-15 02:21:26 +01:00
df7d6cb26c
More style fixes
2012-12-15 00:43:46 +01:00
68562dafb4
More whitespace fixes
2012-12-15 00:43:46 +01:00
2ef2dc4dda
Fix "There must be a single space between the closing parenthesis and the opening brace"
2012-12-15 00:43:46 +01:00
85bd28c508
Fix some of "Closing brace must be on a line by itself"
2012-12-15 00:43:46 +01:00
f39454ed12
Fix "Line indented incorrectly"
2012-12-15 00:43:46 +01:00
8256650da8
Fix "No space found after comma in function call"
2012-12-15 00:43:46 +01:00
5fe6129698
Merge master into ocs_api, fix conflicts.
2012-12-14 15:15:05 +00:00
627da205b3
implement getCurrentUser in Sabre Auth Connector, fixes #508
2012-12-14 01:06:09 +01:00
4466e06e7d
use username, not passed loginname, might differ
2012-12-14 01:06:00 +01:00
79b8d67627
remove PgeNavi. It's no longer used
2012-12-13 19:26:05 +01:00
680ff3a51b
Merge pull request #584 from wardragon/ldap_access_userExists_fix
...
Really fix OCP\Share::shareItem with LDAP users
2012-12-12 16:59:43 -08:00
1475ff63dd
API: Add check to see if the user is authorised to run the api method
2012-12-12 21:04:23 +00:00
228a75ebaa
API: Include totalitems and itemsperpage meta data when needed.
2012-12-12 20:58:40 +00:00
84420035df
throwing InsufficientStorage in case the quota is reached
2012-12-12 20:09:57 +01:00
Jenkins for ownCloud
TheSFReader
Robin Appelman
herbrechtsmeier
Frank Karlitschek
Jörn Friedrich Dreyer
Bart Visscher
Brice Maron
Lukas Reschke
Sam Tuke
Björn Schießle
irgsmirx
root
Arthur Schiwon
Michael Gapczynski
hkjolhede
j-ed
Tom Needham
Bernhard Posselt
davidgumberg
Jan-Christoph Borchardt
Sean Comeau
Randolph Carter
Tom Needham