Robin Appelman
a7c70915d5
fix storage wrapper namespaces
2013-06-28 18:18:12 +02:00
Bart Visscher
8ca0a957ad
Allow setting defaults and requirements for the api route
2013-06-28 17:25:10 +02:00
Jörn Friedrich Dreyer
7d3490036c
Merge pull request #3838 from rgeber/master
...
Public Upload Feature
2013-06-28 07:30:41 -07:00
Bart Visscher
b1a2ddd149
Merge pull request #3799 from owncloud/fix_pdo_statement_wrapper_numrows_on_modification
...
Fix pdo statement wrapper numrows on modification
2013-06-28 07:15:38 -07:00
Thomas Müller
3bedb09753
Merge pull request #3843 from owncloud/sabre-exceptions
...
Sabre: throw exceptions when delete/create/write operations are not permitted
2013-06-28 07:05:09 -07:00
Bart Visscher
6ad7a0336f
Oracle doesn't know & as bitwise AND
...
Conflicts:
lib/public/share.php
2013-06-28 15:48:49 +02:00
Robin Appelman
125f9f4221
move storage wrappers to their own namespace
2013-06-28 15:34:25 +02:00
Bart Visscher
6ddfe2029c
Merge pull request #3865 from owncloud/fix_test_for_oracle
...
Fix sharing test for oracle
2013-06-28 06:18:56 -07:00
Thomas Mueller
3b91ce695f
session_life_time -> session_lifetime
...
default session_lifetime is 24hrs
recreation of session is triggered at 50% of the session life time
2013-06-28 15:17:54 +02:00
Bart Visscher
df9e56efd0
Merge pull request #3839 from owncloud/unix_timestamp_replacement_for_oracle
...
manually calculate unix_timestamp for oracle
2013-06-28 06:11:28 -07:00
Bart Visscher
b04e09a901
Move DoctrineStatementWrapper to its own file
2013-06-28 11:48:38 +02:00
Bart Visscher
6145e61718
Remove deadcode
2013-06-28 11:42:23 +02:00
Bart Visscher
1edf01d09f
Fix usage of non existent consts
2013-06-28 11:15:25 +02:00
Thomas Mueller
10951f9bd5
adding PHPDoc
2013-06-27 23:34:36 +02:00
Thomas Mueller
de93b21505
missing $
2013-06-27 23:14:32 +02:00
Bart Visscher
12976fb2e1
Set debugMode after reading the config file
2013-06-27 22:50:28 +02:00
Bart Visscher
194b61b4c5
Revert "Can't determine if debug mode is defined until we read the config"
...
This reverts commit 969e43c87b
.
2013-06-27 22:24:17 +02:00
Bart Visscher
ae2b3732de
Use file_exists to fix the unittests
2013-06-27 22:23:53 +02:00
Bart Visscher
fb80cbd499
Fix review points
2013-06-27 22:01:52 +02:00
Bart Visscher
64f16f1db1
Fix stupid namespace separator
2013-06-27 21:57:59 +02:00
Bart Visscher
2eaad58922
Make the object drive the logging backend
...
This is the other way around then it was.
2013-06-27 20:10:54 +02:00
Bart Visscher
c6bbccc776
Merge branch 'master' into convert-oc_config
...
Conflicts:
lib/config.php
lib/setup.php
2013-06-27 17:54:17 +02:00
Jörn Friedrich Dreyer
77dc3964f8
check item id is set
2013-06-27 17:39:44 +02:00
Björn Schießle
c4aef89278
introduce pre-disable-app hook and use it for the encryption app to reset migration status if the app was disabled
2013-06-27 14:09:22 +02:00
Jörn Friedrich Dreyer
45c897acf3
one if less
2013-06-27 13:13:49 +02:00
Jenkins for ownCloud
29caae3491
[tx-robot] updated from transifex
2013-06-27 02:12:00 +02:00
Bart Visscher
3b31afb2a7
Oracle doesn't know & as bitwise AND
2013-06-26 21:40:31 +02:00
Bart Visscher
a9ee15cf40
Use Doctrine platform to add limit and offset to query
2013-06-26 20:48:01 +02:00
Jörn Friedrich Dreyer
5d51118cb2
fix type of numeric columns
2013-06-26 20:03:24 +02:00
Jörn Friedrich Dreyer
bf49edde6b
check item id is set
2013-06-26 19:57:28 +02:00
Thomas Mueller
794c189650
session life time is now configurable and set to the same value
2013-06-26 09:21:38 +02:00
Robin Appelman
6208780332
Sabre: throw exceptions when delete/create/write operations are not permitted
2013-06-25 17:04:25 +02:00
Thomas Müller
39cca72964
Merge pull request #3750 from owncloud/dummy_session_for_errors
...
Init dummy session to render error pages
2013-06-25 03:34:49 -07:00
Roman Geber
ddb0ff346d
Public upload feature
2013-06-25 12:24:14 +02:00
Jörn Friedrich Dreyer
7273b43cd5
manuall calculate unix_timestamp for oracle
2013-06-25 09:52:04 +02:00
Jenkins for ownCloud
c3b8f2bf64
[tx-robot] updated from transifex
2013-06-25 02:13:40 +02:00
Jörn Friedrich Dreyer
b32d6d8487
for oracle use BITAND() instead of & in sharing permissions sql
2013-06-24 22:52:01 +02:00
Bart Visscher
fae3cf1a87
Always quote db identifiers in OC_DB_MDB2SchemaReader
2013-06-24 22:38:19 +02:00
Bart Visscher
144a8eb01f
Quote tablenames
2013-06-24 22:38:19 +02:00
Bart Visscher
9fa4b78ba4
Use Doctrines Oracle sequence suffix
2013-06-24 22:38:19 +02:00
Bart Visscher
159efa8bd4
OCI doesn't have a queryString
2013-06-24 22:38:19 +02:00
Bart Visscher
6300b95896
UNIX_TIMESTAMP replace for Oracle
2013-06-24 22:38:19 +02:00
Bart Visscher
dca8c1cbc1
Fixes connecting to Oracle without port set
2013-06-24 22:38:19 +02:00
Bart Visscher
d1b76f1b88
Fix not null with empty default
2013-06-24 22:37:07 +02:00
Jörn Friedrich Dreyer
c223bee6df
fix numRows usage in core lib
2013-06-24 16:29:59 +02:00
Jörn Friedrich Dreyer
643c8d3088
make PDOStatementWrapper return number of updated rows on INSERT, UPDATE or DELETE queries, introduces isManipulation() to guess type of query
2013-06-24 16:29:58 +02:00
Jörn Friedrich Dreyer
3e3b66bd0d
use to_char when comparing clob to string on oracle, use execute audited
2013-06-24 16:12:21 +02:00
Bart Visscher
377e9a8677
Merge branch 'master' into doctrine
2013-06-24 08:27:25 +02:00
Roland Hager
a06d901e37
Fix: The check if upload_max_filesize or post_max_size is 0 fails if only one of them is 0.
...
$upload_max_filesize and $post_max_size need to be casted to (int) to match "=== 0"
2013-06-21 09:33:06 +02:00
mvn23
59fa3055e1
Reviewed code for X-Sendfile2
...
Made some small changes which might have caused a segfault on ci.tmit.eu earlier.
2013-06-20 17:46:36 +03:00
Thomas Müller
4232ccbc6d
Merge pull request #3792 from owncloud/scanfolder-remove
...
remove deleted files when re-scanning a folder
2013-06-20 04:02:10 -07:00
blizzz
c41f11a821
Merge pull request #3779 from shkdee/patch-1
...
Update user.php
2013-06-20 02:37:12 -07:00
mvn23
3f20a080fe
Revert most changes for testing
2013-06-20 12:23:25 +03:00
Jörn Friedrich Dreyer
372f261fe3
remove unnecessary exception handling
2013-06-20 10:50:53 +02:00
Jörn Friedrich Dreyer
91c0b81130
add missing backticks
...
guys, please ...
2013-06-20 10:18:29 +02:00
Jenkins for ownCloud
01ab79d460
[tx-robot] updated from transifex
2013-06-20 02:43:39 +02:00
Robin Appelman
ff7e903f82
remove deleted files when re-scanning a folder
2013-06-20 00:42:34 +02:00
mvn23
a25bfa9291
Update files.php
2013-06-19 23:44:45 +02:00
mvn23
46f97f4c38
Implement X-Sendfile2 for resume support in LigHTTPd
...
LigHTTPd does not support HTTP Range headers with the X-Sendfile header in the way Apache does. Instead, it needs to be handled in the backend. This commit does exactly that, using the X-Sendfile2 header to send ranges of files.
To accomplish this without breaking web servers that don't support X-Sendfile2, a new variable MOD_X_SENDFILE2_ENABLED was introduced to separate this method from X-Sendfile and X-Accel-Redirect.
2013-06-19 15:36:48 +02:00
icewind1991
cb41b88520
Merge pull request #3764 from owncloud/scanfolder-existing
...
Improve re-using existing data in the filescanner
2013-06-19 04:30:55 -07:00
Björn Schießle
8406d3f7b1
also use the default theme if the theme is set to an empty string in the config.php
2013-06-19 11:58:29 +02:00
Jörn Friedrich Dreyer
904227a0e4
Merge pull request #3661 from owncloud/fixing-windows-server-master
...
Fixing windows server master
2013-06-19 02:42:18 -07:00
shkdee
4a480e4f53
Update user.php
...
Fixes $_setupedBackends[] into self::$_setupedBackends[] so that setuped backends are REALLY remembered and not instanciated many times.
2013-06-18 21:47:47 +03:00
Jörn Friedrich Dreyer
78678be2b6
remove dangling AND in SQL statement
2013-06-18 16:18:19 +02:00
Victor Dubiniuk
fbbb6ef8ef
Init dummy session first
2013-06-17 23:41:07 +03:00
Robin Appelman
2ed0e6e915
add tests for reusing existing data in scanner
2013-06-17 18:03:57 +02:00
Robin Appelman
63c898c064
Make rmdir recursive for local storage
2013-06-17 17:34:09 +02:00
Thomas Mueller
383e4c62b5
in case $_SERVER['HTTP_HOST']) is not set let's return localhost - better than nothing
2013-06-17 00:02:42 +02:00
Thomas Müller
e013e7adea
Merge pull request #3621 from owncloud/path-mimetype
...
seperate mimetype guessing from filename
2013-06-16 13:14:16 -07:00
Thomas Müller
0ac7c5712a
Merge pull request #3721 from owncloud/oracle_setup_fixes
...
Oracle setup fixes
2013-06-14 11:21:02 -07:00
Robin Appelman
f10a4db889
scanner: give more percision about what data is reused during scanning
2013-06-14 16:58:14 +02:00
Jörn Friedrich Dreyer
9498cf959f
remove default tablespace in parameter
2013-06-14 15:54:45 +02:00
Thomas Mueller
1ef66941a7
adding default to $hint within ctor of DatabaseSetupException
2013-06-14 15:38:09 +02:00
Robin Appelman
30c09d0c8b
split of scanning the childs of a folder
2013-06-14 15:35:06 +02:00
Thomas Mueller
5c7d7549ea
coding style
2013-06-14 13:54:41 +02:00
Jörn Friedrich Dreyer
471b9c055a
use executeAudited in sabredav lock
2013-06-14 12:23:44 +02:00
Jörn Friedrich Dreyer
961a001af3
add missing backticks, use executeAudited in post_deleteGroup and post_removeFromGroup
2013-06-14 12:18:20 +02:00
Jörn Friedrich Dreyer
e5d3cd59ac
use USERS tablespace whn none is given, only needed when we need to create a user, does not need to be stored in config
2013-06-14 12:09:49 +02:00
Jörn Friedrich Dreyer
dcdabac04d
oracle does not need sequence suffix, manually set database name to allow fetching db schema, don't shutdown db - we are using utf8 to connect
2013-06-14 12:06:29 +02:00
Thomas Mueller
87521f6c6e
dirname('/test.txt') returns '\' on windows whereas on linux we get back '.'
2013-06-14 11:59:30 +02:00
Morris Jobke
8d62bb3aab
Merge pull request #3684 from owncloud/pg_install_db_master
...
Try connection with specified db when postgres does not work
2013-06-14 02:50:01 -07:00
Morris Jobke
7093b0829f
improve comment
2013-06-14 11:28:33 +03:00
Thomas Mueller
c8564c0795
Merge branch 'master' into move-maint-start
...
Conflicts:
lib/util.php
2013-06-14 10:06:13 +02:00
Jenkins for ownCloud
6c534c8165
[tx-robot] updated from transifex
2013-06-14 02:52:34 +02:00
Thomas Müller
8edb56de05
Merge pull request #3690 from owncloud/use_execute_audited_in_filecache
...
use executeAudited in files cache
2013-06-13 13:55:55 -07:00
Thomas Müller
2a58cf8117
Merge pull request #3686 from owncloud/minor_exception_cleanup
...
minor cleanup for exception handling
2013-06-13 13:50:31 -07:00
Björn Schießle
7889f2ef5c
Merge pull request #3687 from owncloud/template_updates
...
Make templates aware of different owncloud editions
2013-06-13 07:32:41 -07:00
Jörn Friedrich Dreyer
31f7afe56a
PDOException has no previous(), oh the consistency ...
2013-06-13 13:14:00 +02:00
Thomas Müller
54f3174665
Merge pull request #3640 from infoneo/master
...
Folders with multiple periods problem fix
2013-06-13 03:34:36 -07:00
Thomas Mueller
84a8aea410
restore Updater functionality on non-Windows platforms
2013-06-13 00:09:52 +02:00
Jörn Friedrich Dreyer
54f9477f34
fix another double wrapped array
2013-06-12 23:01:52 +02:00
Jörn Friedrich Dreyer
6d55a062be
remove additional array wrapping
2013-06-12 21:23:34 +02:00
Jörn Friedrich Dreyer
d3eadcde56
use executeAudited in files cache
2013-06-12 20:11:53 +02:00
Björn Schießle
7a575cc2d7
short explanation about OC_Defaults
2013-06-12 16:33:09 +02:00
Björn Schießle
839bce80c6
make main menu aware of the different owncloud editions
2013-06-12 16:20:23 +02:00
Björn Schießle
5c6a854489
add default doc url
2013-06-12 16:19:28 +02:00
Jörn Friedrich Dreyer
f7dc07602b
minor cleanup for exception handling
2013-06-12 15:48:22 +02:00
Björn Schießle
e1e798c623
make footer and urls aware of ownCloud editions
2013-06-12 15:44:11 +02:00
Björn Schießle
b29e01d5cf
keep all strings in one place to make it easier to change them
2013-06-12 15:15:08 +02:00
eMerzh
e33f68ecb6
Correct escaping
2013-06-12 14:36:28 +02:00
Brice Maron
edc255421c
Try connection with specified db when postgres does not work
...
Conflicts:
lib/setup.php
2013-06-12 14:36:07 +02:00
Thomas Müller
1abce78cb8
Merge pull request #3654 from owncloud/clean_up_exceptions
...
Introduce more robust SQL execution and exception handling
2013-06-12 04:13:12 -07:00
Jörn Friedrich Dreyer
0eed1c980d
Merge pull request #3652 from owncloud/fix_fetchrow_usage_for_mdb2
...
fix fetchRow checks to also work with MDB2
2013-06-11 06:20:27 -07:00
Jörn Friedrich Dreyer
e238eeef6f
Merge pull request #3650 from owncloud/use_to_char_for_oracle_clob_comparisons
...
use to_char to allow comparing string to CLOB cloumns in oracle
2013-06-11 05:34:55 -07:00
Björn Schießle
118f2b3283
createUser() needs to return something; the user object or false
2013-06-11 13:48:17 +02:00
Thomas Mueller
74a170f2a5
[Fixing unit tests in Windows]
...
on windows open resources will be locked while the stream is open.
closing the resource allows deletion below
2013-06-10 19:28:55 +02:00
Thomas Mueller
c0b25a4375
[Fixing Updater Unit Tests on Windows]
...
using $internalPath within call to self::correctFolder() because $path inside of it is not processed properly due to directory separator on Windows.
2013-06-10 18:47:36 +02:00
Thomas Mueller
073306eaa2
[Fixing Updater Unit Tests on Windows]
...
using $internalPath within call to self::correctFolder() because $path inside of it is not processed properly due to directory separator on Windows.
error logging has been added in case the given 4path is not found within self::correctFolder
2013-06-10 18:35:47 +02:00
Michael Gapczynski
969e43c87b
Can't determine if debug mode is defined until we read the config
2013-06-10 12:07:25 -04:00
Jörn Friedrich Dreyer
875c18b115
fix fetchRow checks to also work with MDB2
2013-06-10 17:43:09 +02:00
Michael Gapczynski
b7b6075d55
Fix potential glob error
2013-06-10 11:42:20 -04:00
Thomas Mueller
988b539dd7
Let's just use '/' as we do almost everywhere - this change fixes two failing unit tests
2013-06-10 17:27:21 +02:00
Morris Jobke
1da112750e
Merge pull request #3647 from owncloud/missing_backticks
...
add missing backticks all over the place
2013-06-10 05:15:07 -07:00
Jörn Friedrich Dreyer
86c5243be5
remove duplicate logging from db.php, now happens in entrypoints
2013-06-10 14:03:12 +02:00
Jörn Friedrich Dreyer
8dc6bdd96b
clean up usage of DatabaseSetupException and catch Exceptions in entrypoints
2013-06-10 13:45:19 +02:00
Jörn Friedrich Dreyer
c0bdbd9d81
introduce and use executeAudited in db.php
2013-06-10 12:56:45 +02:00
Jörn Friedrich Dreyer
d264d0a79d
Merge pull request #3648 from owncloud/sql_limit_as_param
...
convert LIMIT to parameter
2013-06-10 02:48:15 -07:00
Björn Schießle
db06b906e5
Merge pull request #3610 from owncloud/encryption_recovery_for_ldap
...
recover encryption keys if ownCloud can't change the log-in password
2013-06-10 02:03:56 -07:00
Jörn Friedrich Dreyer
5ec13742b3
use to_char to allow comparing string to CLOB cloumns in oracle
2013-06-10 10:33:02 +02:00
Jörn Friedrich Dreyer
307f1626e8
convert LIMIT to parameter
2013-06-10 10:04:52 +02:00
Jörn Friedrich Dreyer
124f34422c
add missing backticks all over the place
2013-06-10 09:53:29 +02:00
infoneo
b39113ae3e
Update mapper.php
...
Now slugify is performed on whole filename (including extension). Changed method of adding index number (using regular expressions pathinfo() method removed).
2013-06-08 18:39:25 +03:00
Jenkins for ownCloud
3c79d89492
[tx-robot] updated from transifex
2013-06-08 02:13:41 +02:00
Robin Appelman
94ca576c9a
use a getter for the storage loader to ensure the instance is created
2013-06-07 17:50:10 +02:00
Robin Appelman
2708ab09ab
storage loader needs to be accessible by apps
2013-06-07 17:40:19 +02:00
Robin Appelman
85a9b7f094
Storage wrapper: provide access to the wrapped storage
2013-06-07 17:12:45 +02:00
Robin Appelman
f35578ec54
merge master into storage-wrapper
2013-06-07 17:12:16 +02:00
Robin Appelman
bd67512409
manage creating and wrapping storages in it's own class
2013-06-07 17:07:13 +02:00
Michael Gapczynski
9ef989f917
Merge pull request #2919 from owncloud/hook-improvements
...
Hook improvements
2013-06-07 06:35:50 -07:00
Jenkins for ownCloud
67c085417c
[tx-robot] updated from transifex
2013-06-07 02:17:50 +02:00
Robin Appelman
85abede9bf
actually return result
2013-06-07 00:22:05 +02:00
Robin Appelman
0470a5ba94
fix variable name
2013-06-07 00:17:51 +02:00
Robin Appelman
cf7321915d
seperate mimetype guessing from filename
2013-06-06 23:51:44 +02:00
Björn Schießle
fdaab7372e
always emit the preSetPassword hook, this should only indicate the intention. Finally the post-hooks indicate if it was successful or not
2013-06-06 13:30:18 +02:00
Jenkins for ownCloud
81b6cab94f
[tx-robot] updated from transifex
2013-06-06 02:21:31 +02:00
Jenkins for ownCloud
666a5c1cc7
[tx-robot] updated from transifex
2013-06-05 02:01:42 +02:00
Thomas Tanghus
9cd6645037
Move comment and set requesttoken.
2013-06-05 00:38:08 +02:00
Michael Gapczynski
cb9fe475c4
Merge branch 'master' into hook-improvements
...
Conflicts:
lib/files/view.php
2013-06-04 18:19:08 -04:00
Michael Gapczynski
e0359b0b24
One more style fix
2013-06-03 18:17:32 -04:00
Michael Gapczynski
1c61732193
Merge branch 'master' into convert-oc_config
2013-06-03 18:06:13 -04:00
Michael Gapczynski
d50d663928
Style and comment fixes
2013-06-03 18:05:38 -04:00
Arthur Schiwon
c8a2beccb0
Cache: mount user mountpoints to make sure that // exists before accessing it. Fixes #2553 and #2374
2013-06-03 22:36:36 +02:00
Jörn Friedrich Dreyer
96b1e54d4a
Merge pull request #3444 from owncloud/share-fix
...
Fix undefined index for share mount point retrieval
2013-06-03 11:35:06 -07:00
icewind1991
8c991d97aa
Merge pull request #3561 from owncloud/user
...
Refactor of user management
2013-06-03 08:13:40 -07:00
Thomas Tanghus
2572c9a6b7
Merge pull request #3578 from owncloud/ocdialog
...
Replacement for jquery.dialog to fit better with ownCloud design.
2013-06-03 06:37:27 -07:00
Robin Appelman
0ce2b2708c
also clear cached users when removing a single backend
2013-06-03 14:19:17 +02:00
Robin Appelman
2a82964830
use caching for userExists
2013-06-03 13:46:05 +02:00
Robin Appelman
83fbdc903f
cast result to bool
2013-06-03 13:39:34 +02:00
Robin Appelman
eb2a1e0f8a
move phpdoc comments
2013-06-03 13:33:56 +02:00
Robin Appelman
1a4021a0fe
User: return backend result
2013-06-03 13:19:01 +02:00
Robin Appelman
fbe3213fec
User: consisten variable naming
2013-06-03 13:17:03 +02:00
Robin Appelman
00b4bfcbf5
User: remove determineDisplayName
2013-06-03 13:15:42 +02:00
Jörn Friedrich Dreyer
b76725c1fa
Merge pull request #3560 from owncloud/init-order-session
...
initialize the session earlier
2013-06-03 03:21:05 -07:00
Robin Appelman
38bd234686
make sure the filesystem is setup before doing mount operations
2013-06-02 22:09:44 +02:00
Thomas Tanghus
901b1150ff
Replacement for jquery.dialog to fit better with ownCloud design.
2013-06-02 21:52:59 +02:00
Robin Appelman
b5e817d638
fix clearing mounts when filesystem isn't initialized yet
2013-06-02 21:44:24 +02:00
Robin Appelman
251527c6e6
merge master into backgroundjob
2013-06-02 20:12:44 +02:00
Thomas Müller
1b3c9fe5ae
Merge pull request #3454 from owncloud/fix_hasInternetConnection
...
isinternetconnectionworking should return false if OC_Config::getValue("has_internet_connection") is false
2013-05-31 17:05:45 -07:00
Thomas Mueller
3e00a3603c
adding PHPDoc comment to getManager()
...
adding PHPDoc comment for $user within the hooks callbacks
fixing PHPDoc comment on isLoggedIn()
2013-06-01 00:49:06 +02:00
Robin Appelman
2c69403fd6
fix namespacing error
2013-06-01 00:39:59 +02:00
Robin Appelman
82fd15706e
fix undefined variables
2013-06-01 00:39:59 +02:00
Robin Appelman
e430f442b5
use single quotes
2013-06-01 00:39:59 +02:00
Thomas Mueller
dd4a07321a
fix method naming
2013-05-31 23:24:09 +02:00
icewind1991
94a6622bcd
Merge pull request #3459 from owncloud/fix_for_2377
...
fix problems with german "Umlaut" in folder name
2013-05-31 14:00:02 -07:00
Florin Peter
b840de4e01
user should set into session before postLogin hook otherwise it will break not only the files_encryption app
2013-05-31 21:30:13 +02:00
Robin Appelman
cdb2f559a8
Fix postLogin hook
2013-05-31 19:58:31 +02:00
Robin Appelman
473f3c6916
fix typo
2013-05-31 18:18:13 +02:00
Robin Appelman
f00844a003
fix caching of user objects
2013-05-31 17:42:51 +02:00
Robin Appelman
b8b0b7606a
initialize the session earlier
2013-05-31 17:31:52 +02:00
Robin Appelman
a8fb803319
cache instances of \OC\User\User
2013-05-31 17:31:27 +02:00
Robin Appelman
542bcf9156
Merge branch 'master' into user
2013-05-31 16:35:51 +02:00
FlorinPeter
d636e168a6
Merge pull request #3527 from owncloud/file_encryption_external_storage_fixes
...
File encryption external storage fixes
2013-05-31 03:21:46 -07:00
Thomas Tanghus
ad5c4bf771
Cleanup hacke v.2
2013-05-31 00:53:57 +02:00
Thomas Tanghus
e21649ccff
Revert "Clean up hack."
...
This reverts commit 138c7f615b
.
2013-05-31 00:53:15 +02:00
Thomas Tanghus
138c7f615b
Clean up hack.
2013-05-31 00:28:03 +02:00
Michael Gapczynski
bd0d189f6f
Merge branch 'master' into googledrive
2013-05-30 11:20:22 -04:00
Jörn Friedrich Dreyer
476747ee89
Merge pull request #3509 from owncloud/update_jquery_to_1_10
...
Update jquery to 1.10.0 and add jquery-migrate 1.2.1
2013-05-30 06:00:52 -07:00
icewind1991
aa1c5a5d63
Merge pull request #3529 from owncloud/folder-permissions
...
Cache: provide a function to get the permissions of all files in a folder with one query
2013-05-30 05:54:29 -07:00
Jenkins for ownCloud
8e1d9261aa
[tx-robot] updated from transifex
2013-05-30 02:34:14 +02:00
Florin Peter
313631edf6
Merge branch 'master' into file_encryption_external_storage_fixes
...
Conflicts:
apps/files_encryption/hooks/hooks.php
2013-05-30 00:45:29 +02:00
Michael Gapczynski
dbbf195727
Only retrieve the current user's permissions
2013-05-29 18:08:18 -04:00
Florin Peter
1337f48d64
fixes for pgsql
2013-05-29 20:41:07 +02:00
Morris Jobke
5c04b3a63a
fix wrong signature delimiter - fix #3523
2013-05-29 20:21:48 +02:00
Florin Peter
f1b884aa5d
changed deprecated class
2013-05-29 20:15:04 +02:00
Florin Peter
353d19d183
fixes if cache returns false
2013-05-29 20:11:13 +02:00
Florin Peter
c8d1cd224d
fix $parent/$source typo
2013-05-29 19:58:05 +02:00
Michael Gapczynski
5bbc583b56
Merge pull request #3532 from owncloud/scan-update
...
Only update metadata that has changed
2013-05-29 10:23:41 -07:00
Florin Peter
1202ab9995
Merge branch 'master' into file_encryption_external_storage_fixes
2013-05-29 19:19:40 +02:00
Michael Gapczynski
59655e9afd
Style fixes
2013-05-29 10:56:28 -04:00
Michael Gapczynski
ea55367678
Organize conditionals in a better order
2013-05-29 10:40:05 -04:00
Michael Gapczynski
04805d0be9
Only update metadata that has changed
2013-05-29 10:19:03 -04:00
Robin Appelman
24a401a548
Cache mimetype icons
2013-05-29 15:43:41 +02:00
Björn Schießle
ae0f37e9e2
fix indention
2013-05-29 15:37:27 +02:00
Robin Appelman
44d217c425
Cache: provide a function to get the permissions of all files in a folder with one query
2013-05-29 15:25:42 +02:00
Björn Schießle
8587f565d2
remove unnecessary variable
2013-05-29 15:14:15 +02:00
Björn Schießle
63a2bec6e5
use public API for error handling; improved while condition
2013-05-29 14:40:47 +02:00
Björn Schießle
893a1ed6f5
for external storages we never reach the path 'files', instead we need to leave the loop if no further parent exists
2013-05-29 14:19:18 +02:00
Björn Schießle
672811c103
if one public link share was found, we don't have to check it for the other folders
2013-05-29 13:12:30 +02:00
Björn Schießle
b44192f366
check list of users with access to the file from the bottom to the top. This way we avoid calling getFileInfo() on every dir, which creates a lot of overhead, especially for external storages
2013-05-29 13:10:26 +02:00
Jenkins for ownCloud
7c0c6bd779
[tx-robot] updated from transifex
2013-05-29 02:10:54 +02:00