Thomas Tanghus
95cc666742
Add interface docs to IRequest.
2013-09-27 15:55:22 +02:00
Thomas Tanghus
b0d6d30705
Add patch method to OC_Route
2013-09-27 15:54:18 +02:00
Thomas Tanghus
d49e982ac8
Check if accessor matched request method.
...
It's easier to find errors in the code if an exception is thrown.
2013-09-27 14:36:19 +02:00
Thomas Müller
469b309b21
Merge pull request #4892 from owncloud/vcategories_public
...
OC_VCategories => OC\Tags. Public interface and getter in server container
2013-09-25 14:24:37 -07:00
Thomas Müller
30286c06ab
stripos return value check
2013-09-25 11:05:59 +02:00
Thomas Müller
b168d5aa3b
class API decommissioning part 1
2013-09-25 11:05:24 +02:00
Thomas Müller
b2ef978d10
AppFramework:
...
- get request from the server container
- implement registerMiddleWare()
- adding getAppName() to app container
2013-09-25 10:30:48 +02:00
Thomas Müller
db39fede97
Merge branch 'master' into appframework-master
...
Conflicts:
apps/files/lib/helper.php
apps/files_trashbin/lib/helper.php
2013-09-25 09:52:12 +02:00
Jenkins for ownCloud
2d12e52769
[tx-robot] updated from transifex
2013-09-24 12:59:48 -04:00
Thomas Tanghus
aaed871cee
Add factory class for the server container.
2013-09-24 17:10:01 +02:00
Thomas Müller
843f15f348
Merge pull request #4898 from owncloud/server_folder_methods
...
Server folder methods
2013-09-24 06:58:47 -07:00
Christopher
e41ef97ac0
Merge pull request #4963 from cyberb/patch-1
...
fixing typo
2013-09-24 04:45:13 -07:00
Thomas Müller
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
Thomas Müller
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
Boris Rybalkin
00c998c5bb
fixing typo
...
Typo in comment "feature" => "future"
2013-09-23 21:08:58 -04:00
Andreas Fischer
2129974584
Do not recheck $cacheData. Move if($reuseExisting) under if($cacheData).
2013-09-24 00:59:23 +02:00
Robin Appelman
235517f111
clear permissions cache when scanning a file
2013-09-24 00:57:58 +02:00
Thomas Tanghus
8c469394e6
Remove duplicate method definitions
2013-09-24 00:12:23 +02:00
Thomas Tanghus
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
Thomas Tanghus
f2de5a34ef
Don't try to be clever
2013-09-24 00:04:57 +02:00
Thomas Tanghus
4d3e7fa78a
Add getUserFolder/getAppFolder to Server.
2013-09-23 23:57:39 +02:00
Thomas Tanghus
7cad510f28
Fix conflict
2013-09-23 23:48:28 +02:00
Thomas Tanghus
f022ea752d
Moar tests.
2013-09-23 23:39:36 +02:00
Thomas Tanghus
60bff6c589
Use fetchOne() instead of numRows() when doing a COUNT(*).
2013-09-23 23:39:36 +02:00
Thomas Tanghus
be402fab53
Forgot to return false if add() didn't add anything.
2013-09-23 23:39:36 +02:00
Thomas Tanghus
8a02afd87a
Added more error checking in add()
2013-09-23 23:39:36 +02:00
Thomas Tanghus
8fab9eef28
Add another test.
2013-09-23 23:39:36 +02:00
Thomas Tanghus
1bbeb12e2e
Updated method names and added a few more tests.
2013-09-23 23:39:36 +02:00
Thomas Müller
b63acdb125
fixing namespaces and rename hasCategory to hasTag
2013-09-23 23:39:36 +02:00
Thomas Tanghus
45f73feb69
OC_VCategories=>OC\Tags. Public interface + getter in server container
2013-09-23 23:39:36 +02:00
Thomas Tanghus
5ca181eb23
More trimming
2013-09-23 23:36:47 +02:00
Thomas Tanghus
200e9691de
Merge pull request #4928 from owncloud/interfaces
...
Add a couple of interface definitions
2013-09-23 14:08:22 -07:00
Thomas Müller
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
kondou
d7409547aa
Fix not displaying "Upload something!" message
...
Fix #4940
2013-09-23 16:39:42 +02:00
Thomas Müller
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
Thomas Tanghus
d27416edf7
Moar tests.
2013-09-23 15:52:50 +02:00
Thomas Tanghus
910a0338bb
Use fetchOne() instead of numRows() when doing a COUNT(*).
2013-09-23 15:52:06 +02:00
Thomas Müller
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
Andreas Fischer
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
Thomas Tanghus
93258e1170
Forgot to return false if add() didn't add anything.
2013-09-23 13:29:21 +02:00
Thomas Tanghus
0b4de847a9
Added more error checking in add()
2013-09-23 13:27:43 +02:00
Andreas Fischer
d9a36ee82e
Move setUp() and tearDown() up in tests/lib/files/cache/scanner.php.
2013-09-23 12:45:02 +02:00
Andreas Fischer
4a9f1cc74d
Merge remote-tracking branch 'owncloud/master' into fixing-4866-master
...
* owncloud/master: (98 commits)
[tx-robot] updated from transifex
files: when filtering search results, ensure results are children of the fakeroot not just path starting the same
setting a default on filecache column unencrypted_size
[tx-robot] updated from transifex
remove unneccessary lib in namespace
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!
initialize variable
calculate correct permissions while toggle the password protection
make sure that both $permissions and $oldPermissions have the same type
Add copyright, remove starting blank line
update inherit docs comment
Fix insert/update/delete helper functions for oracle
Add missing return true statements to legacy preferences functions
Add missing static
Convert OC_Preference to object interface
fix race condition in lazy preview loading
use {count} instead of 'One' for more versatile translation
fix double translation of error message
use n to translate title
fixing typos and l10n
...
Conflicts:
tests/lib/files/cache/scanner.php
2013-09-23 12:44:11 +02:00
Georg Ehrke
8a1618bce5
implement previews for public upload
2013-09-23 12:27:05 +02:00
Georg Ehrke
edd38e5948
fix previews in shared folders
2013-09-23 10:26:46 +02:00
Björn Schießle
9851f0f4f2
Merge pull request #4896 from owncloud/sharing_allow_disable_password
...
sharing, allow user to disable password protection
2013-09-23 01:20:09 -07:00
Thomas Müller
03eedb58fc
Merge pull request #4327 from owncloud/scanfile-remove
...
remove deleted files while scanning
2013-09-22 22:40:13 -07:00
Bart Visscher
811f680457
Merge pull request #4623 from owncloud/convert-oc_preferences
...
Convert OC_Preference to object interface
2013-09-22 10:45:56 -07:00
Jenkins for ownCloud
28918d61d2
[tx-robot] updated from transifex
2013-09-22 12:58:42 -04:00
Morris Jobke
37bd489d2b
Merge pull request #4929 from owncloud/fixing-4416-master
...
Fixing 4416 master
2013-09-22 08:40:20 -07:00