wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
14890 commits 157 branches 562 tags 714 MiB
Commit graph

14890 commits

This branch
This branch
All branches
Author SHA1 Message Date
VicDeo
8f50d7680b Merge pull request #5642 from owncloud/fixing-5271-master 
we should check if a user is logged in before we check for admin privil...
 2013-10-30 16:31:23 -07:00
Thomas Müller
3f42c890be we should check if a user is logged in before we check for admin privilege 2013-10-30 22:59:31 +01:00
Thomas Müller
77e4305841 Merge pull request #5634 from owncloud/admin-loglevellabels 
Changed log level labels in log level dropdown
 2013-10-30 14:39:40 -07:00
Thomas Müller
261cd87efa Merge branch 'master' into home-storage 2013-10-30 22:11:19 +01:00
Lukas Reschke
c1730d241c Merge pull request #5615 from owncloud/fixing-5614-master 
http header OCS-ApiRequest: true is required in case of session based OC...
 2013-10-30 13:12:16 -07:00
Lukas Reschke
cba12e009f Added missing HTTP prefix to the $_SERVER variable 2013-10-30 21:07:19 +01:00
Vincent Petry
9d230bcc75 Improve quota input field 
- Added tooltip with examples
- The quota value returned by the server is now displayed after update
- Fixes #5346
 2013-10-30 20:46:53 +01:00
VicDeo
257084444b Merge pull request #5628 from owncloud/files-fixsummary 
Fixed summary visibility check
 2013-10-30 12:11:01 -07:00
Frank Karlitschek
edafd29630 increase version number to trigger db migration 2013-10-30 19:38:17 +01:00
Frank Karlitschek
330d026be7 fix the privatedata key value store 2013-10-30 19:36:29 +01:00
Vincent Petry
aba7335d3f Changed wording in log level dropdown 2013-10-30 18:39:21 +01:00
Vincent Petry
cdb3c74632 Merge pull request #5633 from owncloud/files-createdropdownstayswithrightclick 
Prevent closing the create dropdown when right clicking in Firefox
 2013-10-30 10:38:03 -07:00
Vincent Petry
e3b13b13c9 Changed log level labels in log level dropdown 2013-10-30 18:23:48 +01:00
Vincent Petry
19eeb618ff Prevent closing the create dropdown when right clicking in Firefox 
Firefox sends a click event on the document when right clicking which
makes pasting with right click into the field impossible.

Fixes #5498
 2013-10-30 17:55:41 +01:00
Vincent Petry
ca4a1ee5f7 Merge pull request #5632 from owncloud/allow_nested_link_shares 
allow nested link shares
 2013-10-30 09:40:57 -07:00
Jörn Friedrich Dreyer
7ba803919b Merge pull request #5625 from owncloud/fix-test-master 
fix failing preview test on master
 2013-10-30 09:07:07 -07:00
Bjoern Schiessle
4c7082bf1d allow to share a file/folder as public link also if one of it parents was already shared as link 2013-10-30 17:03:53 +01:00
Jörn Friedrich Dreyer
fdaac99526 Merge pull request #5626 from owncloud/fix_search_in_shared_files 
count correct array, then using 1000 as MAX_SQL_CHUNK_SIZE works as expected
 2013-10-30 09:02:39 -07:00
Vincent Petry
aeac3186ee Fixed summary visibility check 
Now using the integer values to check whether to show the summary parts
instead of trying to parse the html code.
 2013-10-30 16:14:08 +01:00
Vincent Petry
d21a5b45f3 Merge pull request #5549 from owncloud/encryption-insertmigrationentrywhenmissing 
Fixed encryption migration when entry is missing in DB
 2013-10-30 07:49:49 -07:00
Jörn Friedrich Dreyer
68e88b6e40 count correct array, then using 1000 as MAX_SQL_CHUNK_SIZE works as expected 2013-10-30 15:48:38 +01:00
Morris Jobke
b65b7965ae fix failing preview test on master 2013-10-30 15:39:55 +01:00
Thomas Müller
3059d7d92e Merge pull request #5602 from owncloud/update-parent-storage-mtime 
Prevent rescans of folders by updating the parent's storage_mtime
 2013-10-30 07:03:38 -07:00
Robin Appelman
c9f3f2874f Merge branch 'master' into update-parent-storage-mtime 
Conflicts:
	lib/private/files/cache/updater.php
 2013-10-30 13:41:10 +01:00
Björn Schießle
4c964cbbbe Merge pull request #5618 from owncloud/set_default_value_for_recovery_mode 
[encryption] add defaut value to getValue() call
 2013-10-30 04:42:21 -07:00
Bjoern Schiessle
abbacbacb4 remove unused variable 2013-10-30 11:39:30 +01:00
Bjoern Schiessle
6e77fa46f2 if the database doesn't contain any information about the recovery mode than we assume that it is disabled 2013-10-30 11:28:36 +01:00
Vincent Petry
4c7ef85252 Merge pull request #5616 from owncloud/fixing-l10n-master 
Fixing l10n master
 2013-10-30 02:44:54 -07:00
Vincent Petry
de342a5ac7 Merge pull request #5603 from owncloud/fix_file_cache_updater_master 
Fix file cache updater (backport to master of #5513)
 2013-10-30 02:31:08 -07:00
Jenkins for ownCloud
54ae799cd9 [tx-robot] updated from transifex 2013-10-30 03:33:25 -04:00
Thomas Müller
ffb0e14d7b replacing ownCloud by theme-able name or avoid it's usage 2013-10-29 23:29:16 +01:00
Thomas Müller
3d42e402c5 http header OCS-ApiRequest: true is required in case of session based OCS API calls 2013-10-29 23:07:27 +01:00
Lukas Reschke
de57e36b6b Fix typo 
Whooah! - I'm even committing this total important change without peer review ;-)
 2013-10-29 22:11:49 +01:00
Bjoern Schiessle
e1e4c7c214 Merge branch 'master' into fix_file_cache_updater_master 2013-10-29 17:47:33 +01:00
Björn Schießle
e08f38f99b Merge pull request #5605 from owncloud/fix_delete_user 
remove user from cache if he was deleted successfully
 2013-10-29 09:46:21 -07:00
Thomas Müller
e0bc89c87f Merge pull request #5577 from owncloud/fix_urlgenerator_imagepath 
use SERVERROOT instead of WEBROOT in all file_exists checks, whitespace
 2013-10-29 09:29:29 -07:00
Thomas Müller
2534c3bc78 Merge pull request #5606 from owncloud/files-uploaderrorparsingfix 
Added fix to correctly parse non-array error messages
 2013-10-29 09:23:19 -07:00
Jan-Christoph Borchardt
f5e0d59dbf Merge pull request #5607 from owncloud/public-share-style 
fix style of public share page
 2013-10-29 08:47:37 -07:00
Bjoern Schiessle
0d7d396d80 make sure that also the storage etag gets changed 2013-10-29 16:30:47 +01:00
Morris Jobke
404e9c0053 fix style of public share page 2013-10-29 16:08:11 +01:00
Vincent Petry
71cf83b314 Added fix to correctly parse non-array error messages 
Some apps like the antivirus app return messages in a non-array format.
 2013-10-29 16:00:34 +01:00
Bjoern Schiessle
f021dad204 remove user from cache if he was deleted successfully 2013-10-29 15:50:33 +01:00
Morris Jobke
34c1512466 Merge pull request #5601 from owncloud/fix-mimetype-detection 
Fix mimetype detection
 2013-10-29 07:47:20 -07:00
Morris Jobke
7223b5acce Merge pull request #5396 from owncloud/fix-sharing-code 
Fix sharing error message - id -> file name
 2013-10-29 07:33:23 -07:00
Bjoern Schiessle
a80ac9c492 make getUidAndFilename() private 2013-10-29 15:10:02 +01:00
Bjoern Schiessle
fcfac51aa1 backport of https://github.com/owncloud/core/pull/5513 2013-10-29 15:08:12 +01:00
Morris Jobke
b56c936212 also add new parameter to function calls 2013-10-29 14:22:24 +01:00
Robin Appelman
654b0daf01 update touch tests for updated behaviour 2013-10-29 14:22:13 +01:00
Robin Appelman
b3626f34cd Update the parent folders storage_mtime on write and delete to prevent rescans 2013-10-29 14:18:57 +01:00
Andreas Fischer
b3e39dd3d9 Map empty mimetypes to octet-stream for Oracle DBMS. 2013-10-29 14:18:42 +01:00