6d0987bdb4
some small js fixes
2013-09-24 18:32:57 +02:00
c486fc7608
introduce OC_Util::rememberLoginAllowed()
2013-09-24 18:01:34 +02:00
aaed871cee
Add factory class for the server container.
2013-09-24 17:10:01 +02:00
14a160e176
Adjust Tests and satisfy them
2013-09-24 17:10:01 +02:00
843f15f348
Merge pull request #4898 from owncloud/server_folder_methods
...
Server folder methods
2013-09-24 06:58:47 -07:00
63324e2347
Fix doc
2013-09-24 14:12:44 +02:00
0a7ee7c3f7
Fix return value from User object to User ID
2013-09-24 14:11:47 +02:00
e9eb34f187
duplicate code :sigh: - will fix this in a second pr
2013-09-24 13:54:18 +02:00
6c5466a540
adding file_exists check just to be on the save side
2013-09-24 13:53:32 +02:00
fe88a62d6e
=== not ==
2013-09-24 13:51:33 +02:00
d101ff42f1
User: move checkPassword from User to Manager to not break API
2013-09-24 13:46:30 +02:00
e41ef97ac0
Merge pull request #4963 from cyberb/patch-1
...
fixing typo
2013-09-24 04:45:13 -07:00
52f1d5856d
add test data for cal and contact preview
2013-09-24 13:26:51 +02:00
ee1f627155
adding privilege check on move and rename operations
2013-09-24 13:26:12 +02:00
b693b5085c
don't remember login if the encrypion app is enabled because the user
...
needs to log-in again in order to decrypt his private key with his password
2013-09-24 13:08:55 +02:00
74f1359b8b
revert broken 3rdparty reference
2013-09-24 12:50:03 +02:00
31d2048eb8
add blacklist to txt preview backend
2013-09-24 11:00:08 +02:00
cd2421c7ee
adding PHPDoc comments to getBackend
...
ensure getChildren() is called on an instance of Share_Backend_Collection
2013-09-24 10:37:58 +02:00
40871bab88
Merge pull request #4930 from owncloud/fix-apps-settings
...
Fix the apps enabling/disabling in settings
2013-09-24 01:02:50 -07:00
759f732aaa
Merge pull request #4917 from owncloud/scan-clear-permissions
...
clear permissions cache when scanning a file
2013-09-24 00:50:33 -07:00
00c998c5bb
fixing typo
...
Typo in comment "feature" => "future"
2013-09-23 21:08:58 -04:00
2129974584
Do not recheck $cacheData. Move if($reuseExisting) under if($cacheData).
2013-09-24 00:59:23 +02:00
235517f111
clear permissions cache when scanning a file
2013-09-24 00:57:58 +02:00
8c469394e6
Remove duplicate method definitions
2013-09-24 00:12:23 +02:00
698394c994
Merge branch 'server_folder_methods' of github.com:owncloud/core into server_folder_methods
...
Conflicts:
lib/public/iservercontainer.php
lib/server.php
2013-09-24 00:09:21 +02:00
f2de5a34ef
Don't try to be clever
2013-09-24 00:04:57 +02:00
4d3e7fa78a
Add getUserFolder/getAppFolder to Server.
2013-09-23 23:57:39 +02:00
7cad510f28
Fix conflict
2013-09-23 23:48:28 +02:00
f022ea752d
Moar tests.
2013-09-23 23:39:36 +02:00
60bff6c589
Use fetchOne() instead of numRows() when doing a COUNT(*).
2013-09-23 23:39:36 +02:00
be402fab53
Forgot to return false if add() didn't add anything.
2013-09-23 23:39:36 +02:00
8a02afd87a
Added more error checking in add()
2013-09-23 23:39:36 +02:00
8fab9eef28
Add another test.
2013-09-23 23:39:36 +02:00
1bbeb12e2e
Updated method names and added a few more tests.
2013-09-23 23:39:36 +02:00
b63acdb125
fixing namespaces and rename hasCategory to hasTag
2013-09-23 23:39:36 +02:00
45f73feb69
OC_VCategories=>OC\Tags. Public interface + getter in server container
2013-09-23 23:39:36 +02:00
5ca181eb23
More trimming
2013-09-23 23:36:47 +02:00
200e9691de
Merge pull request #4928 from owncloud/interfaces
...
Add a couple of interface definitions
2013-09-23 14:08:22 -07:00
bc1c6039b7
Merge pull request #4956 from owncloud/fix_not_displaying_emptycontent
...
Fix not displaying "Upload something!" message
2013-09-23 13:09:47 -07:00
e55f25b64d
handle error situation of rename proper
2013-09-23 22:04:37 +02:00
d7409547aa
Fix not displaying "Upload something!" message
...
Fix #4940
2013-09-23 16:39:42 +02:00
5d671a84b2
Merge pull request #4869 from owncloud/fixing-4866-master
...
recreate an etag within the scanner if the cache contains an empty etag
2013-09-23 07:13:12 -07:00
d27416edf7
Moar tests.
2013-09-23 15:52:50 +02:00
910a0338bb
Use fetchOne() instead of numRows() when doing a COUNT(*).
2013-09-23 15:52:06 +02:00
46f64cc39a
Merge pull request #4950 from owncloud/fix_preview_shared_folder
...
Fix preview for shared folder and public upload
2013-09-23 06:31:50 -07:00
437858852c
Merge pull request #4856 from owncloud/fix-link-expiration
...
Fix Sharing "Expiration Date" for Shares of type Link (i.e. Token)
* owncloud/fix-link-expiration:
Perform expiration date checking before returning share data for token.
Tests whether expired/valid link share is still accessible.
2013-09-23 15:12:38 +02:00
259f03bee2
remove debug output
2013-09-23 14:10:09 +02:00
93258e1170
Forgot to return false if add() didn't add anything.
2013-09-23 13:29:21 +02:00
0b4de847a9
Added more error checking in add()
2013-09-23 13:27:43 +02:00
d9a36ee82e
Move setUp() and tearDown() up in tests/lib/files/cache/scanner.php.
2013-09-23 12:45:02 +02:00
Bjoern Schiessle
Thomas Tanghus
Arthur Schiwon
Thomas Müller
Christopher
Georg Ehrke
Boris Rybalkin
Andreas Fischer
Robin Appelman