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
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
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
8a1618bce5
implement previews for public upload
2013-09-23 12:27:05 +02:00
edd38e5948
fix previews in shared folders
2013-09-23 10:26:46 +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
37bd489d2b
Merge pull request #4929 from owncloud/fixing-4416-master
...
Fixing 4416 master
2013-09-22 08:40:20 -07:00
a1be01c66f
Merge pull request #4938 from owncloud/scan-filter-outside-view
...
When filtering search results, ensure results are children of the...
2013-09-22 01:01:59 -07: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
2a0c51a8bf
Merge pull request #4927 from owncloud/fix_namespaces_and_autoloading
...
namespaces use upcasefirst parts
2013-09-21 11:54:06 -07:00
2a17025d53
Move bool to int conversion to buildParts(), so it also happens for update().
2013-09-21 02:20:01 +02:00
de2e6e137b
Do not convert boolean to integer in tests. put() already does this.
2013-09-21 00:12:13 +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
0c6dcdba6b
Add missing implements and fix parameters in IConfig
2013-09-20 22:45:22 +02:00
d3d52dd23f
PHPDoc & get UserManager from container for RooFolder
2013-09-20 21:57:48 +02:00
f83f323269
fixing typos + adding missing filed $activeEntry
2013-09-20 21:45:27 +02:00
e31f6c01e8
fixing PHPDoc
2013-09-20 21:43:17 +02:00
9116303cfc
fixing typos
2013-09-20 21:40:54 +02:00
3189ee2daf
setting a default on filecache column unencrypted_size
2013-09-20 20:47:24 +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
45a7b0dbac
Fix the apps enabling/disabling in settings
2013-09-20 20:29:15 +02:00
e92abfd4d8
Add Config container class to server container
2013-09-20 20:21:24 +02:00
e3013c5801
Add Navigation class to server container
2013-09-20 20:20:01 +02:00
5b95e7aa0f
[tx-robot] updated from transifex
2013-09-20 10:50:14 -04:00
4b3e56bcf9
remove unneccessary lib in namespace
2013-09-20 16:46:33 +02:00
9e39118b52
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!
2013-09-20 16:37:07 +02:00
71e129f295
initialize variable
2013-09-20 15:47:33 +02:00
aa8a85f77d
Add DBConnection to server container
2013-09-20 14:33:45 +02:00
ac73ce1b2a
Add UserSession to server container
2013-09-20 14:32:43 +02:00
12b4e79201
calculate correct permissions while toggle the password protection
2013-09-20 13:11:05 +02: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
6aeb0a99da
same for search by mime
2013-09-19 21:08:32 +03:00
3b4020e811
add all results, sharing cache also returns entries for shared files in external storages
2013-09-19 21:08:32 +03:00
466fd8acda
fix getAll(), refactor search by mime & search
2013-09-19 21:08:32 +03:00
392c6b6832
return fixed path, skip shared files outside of 'files'
2013-09-19 21:08:32 +03:00
27511d9187
divide ids into chunks of 1k
2013-09-19 21:08:32 +03:00
e8bf576184
add initial search in shared files
2013-09-19 21:08:32 +03:00
Thomas Müller
kondou
Thomas Tanghus
Andreas Fischer
Georg Ehrke
Björn Schießle
Bart Visscher
Morris Jobke
Jörn Friedrich Dreyer
Robin Appelman
Bjoern Schiessle