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
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
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
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
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
03eedb58fc
Merge pull request #4327 from owncloud/scanfile-remove
...
remove deleted files while scanning
2013-09-22 22:40:13 -07:00
811f680457
Merge pull request #4623 from owncloud/convert-oc_preferences
...
Convert OC_Preference to object interface
2013-09-22 10:45:56 -07:00
28918d61d2
[tx-robot] updated from transifex
2013-09-22 12:58:42 -04:00
a1d4eb1f95
files: when filtering search results, ensure results are children of the fakeroot not just path starting the same
2013-09-22 01:24:12 +02:00
2a17025d53
Move bool to int conversion to buildParts(), so it also happens for update().
2013-09-21 02:20:01 +02:00
011bca7b7f
Only update the etag. Do not re-submit any other unchanged data.
2013-09-20 23:53:02 +02:00
a2f82da572
Use update() instead of put().
2013-09-20 23:52:05 +02:00
d84d548618
when storing back the data field 'encrypted' it is necessary to cast the boolean to an integer to make pg happy
2013-09-20 20:34:17 +02:00
5b95e7aa0f
[tx-robot] updated from transifex
2013-09-20 10:50:14 -04:00
944e9b8c69
make sure that both $permissions and $oldPermissions have the same type
2013-09-20 12:40:21 +02:00
8e26f291a7
Merge pull request #4684 from owncloud/improved-console
...
Use more object oriented way for console commands
2013-09-19 14:22:32 -07:00
0a2a4cb12e
update inherit docs comment
2013-09-19 18:59:06 +02:00
55efe1e56c
Fix insert/update/delete helper functions for oracle
2013-09-19 18:13:39 +02:00
f6284bdce7
Add missing return true statements to legacy preferences functions
2013-09-19 18:13:06 +02:00
395cc737a1
Add missing static
2013-09-19 18:13:06 +02:00
445d34a2a9
Convert OC_Preference to object interface
2013-09-19 18:13:06 +02:00
9f9eb1b08f
Merge pull request #4263 from owncloud/search_scrollto
...
initial scrollto implementation
2013-09-19 05:49:45 -07:00
6b1843d91b
[tx-robot] updated from transifex
2013-09-18 11:50:02 -04:00
1a60aa2b6a
only remember password if the user changes the permissions, otherwise the user disabled the password protection
2013-09-18 11:49:02 +02:00
b40925ae17
initial scrollto implementation:
...
use places/folder icon,
move link construction to JS,
only show icon on hover,
use 'searchresult' as css class name,
add filter/unfilter methods,
highlight searched files in current filelist
only filter when correct FileList is present
2013-09-17 18:40:51 +02:00
c8f9efeb94
etag changes are now propagated up the file tree
2013-09-16 23:32:17 +02:00
a92d4c2c09
Perform expiration date checking before returning share data for token.
2013-09-16 21:24:17 +02:00
9d18e16c77
Merge pull request #4825 from owncloud/fix-sharing-expiration-oracle
...
Fix Sharing "Expiration Date" on Oracle
2013-09-16 12:16:44 -07:00
3c026b7cf6
recreate an etag within the scanner if the cache contains an empty etag
2013-09-16 12:09:15 +02:00
eab84d3d96
Add OCP\DB::getErrorMessage() to public namespace.
2013-09-16 02:17:39 +02:00
0f4e214a90
adding null check on a mount's storage
2013-09-15 20:40:40 +02:00
a58e176852
Merge pull request #4506 from owncloud/oc_avatars
...
OC Avatars
2013-09-14 16:00:36 -07:00
556bd1ef23
[tx-robot] updated from transifex
2013-09-13 21:49:24 -04:00
6ff07f7681
Merge pull request #4712 from owncloud/fileapi-foreward
...
Provide an implementation of the fileapi for oc6 build on top of the old api
2013-09-13 14:31:11 -07:00
049e57ac4a
remove unused OC_L10N
2013-09-13 17:41:09 +02:00
8c9add4d32
adding TB and GB to OC_Helper::humanFileSize
2013-09-13 17:22:45 +02:00
d5ddbfb045
Merge pull request #4719 from owncloud/port_4701_master
...
Always check variable type before using readdir to avoid surprises
2013-09-12 15:44:20 -07:00
786017c247
Register EventSubscriber that resets Oracle's NLS_DATE_FORMAT etc.
2013-09-12 23:43:20 +02:00
7f07d737f8
Create instance of Doctrine\Common\EventManager() in OC_DB.
2013-09-12 23:43:20 +02:00
58ed78aa9e
cleanup public storage interface a bit
2013-09-12 21:58:32 +02:00
c9d2663159
Merge branch 'master' into fileapi-foreward
2013-09-12 21:43:35 +02:00
c9c5e1b97f
Merge branch 'master' into oc_avatars
2013-09-12 07:41:44 +02:00
8543951cf9
adding icons for shared folders and external folders
2013-09-12 00:12:20 +02:00
62eeac3390
Merge pull request #4798 from owncloud/fixing-variable-typos-master
...
no further comment - which dev did not test this BEFORE submitting the p...
2013-09-11 05:58:07 -07:00
68015b2761
[tx-robot] updated from transifex
2013-09-11 06:50:06 -04:00
bf7f94422f
Bring another enable_avatars to $_ and fix $thus->$this
2013-09-11 07:11:33 +02:00
af2164bbcb
no further comment - which dev did not test this BEFORE submitting the pull request?
...
which reviewer did not test the pull request?
2013-09-11 01:23:37 +02:00
a2ade4294c
Merge pull request #4472 from owncloud/remove-disconnect
...
Remove disconnect function from OC_DB
* owncloud/remove-disconnect:
Remove disconnect function from OC_DB
2013-09-10 21:48:56 +02:00
2e5ce091f0
add storage backend interface to public namespace
2013-09-10 20:13:47 +02:00
Andreas Fischer
Robin Appelman
Thomas Müller
Björn Schießle
Bart Visscher
Bjoern Schiessle
Jörn Friedrich Dreyer
Thomas Tanghus
Bernhard Posselt
kondou
VicDeo