Thomas Mueller
17d83cc17f
Fixing code coverage analysis
2013-06-03 01:01:28 +02:00
icewind1991
2a81813e44
Merge pull request #3051 from owncloud/backgroundjob
...
Reworked background job system.
2013-06-02 14:29:59 -07:00
Frank Karlitschek
9392d2d58e
Merge pull request #3567 from owncloud/fixing-3466
...
In cases where smb4php returns false of an empty array stat/( has to ret...
2013-06-02 14:04:55 -07:00
Robin Appelman
24ab525669
Use int for last_run
2013-06-02 22:49:54 +02: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
e1b5598f00
Files: use public api to register backgroundjob
2013-06-02 21:21:39 +02:00
Robin Appelman
251527c6e6
merge master into backgroundjob
2013-06-02 20:12:44 +02:00
Jenkins for ownCloud
cf71a54f5d
[tx-robot] updated from transifex
2013-06-02 02:07:21 +02:00
Kondou
cc1fdf073d
Merge pull request #3573 from owncloud/octemplate_speedup
...
Speed up octemplate rendering.
2013-06-01 09:33:58 -07:00
Thomas Tanghus
bfcf113ce7
Forgot typeof condition
2013-06-01 16:47:34 +02:00
Thomas Tanghus
64c9fdcc28
Speed up octemplate rendering.
2013-06-01 16:38:35 +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
Jenkins for ownCloud
3013c02767
[tx-robot] updated from transifex
2013-06-01 02:03:53 +02: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
1d7d5d2894
In cases where smb4php returns false of an empty array stat/( has to return false.
...
Fixes #3466 because the test method of external filesystems uses stat() to detect if the given parameters are okay.
Changes to 3rdparty are necessary as well:
https://github.com/owncloud/3rdparty/pull/33
2013-06-01 00:06:23 +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
blizzz
1656cc2e7c
Merge pull request #3565 from owncloud/fix_ldap_sqlite_n_js
...
Fix ldap sqlite n js
2013-05-31 12:17:46 -07:00
Florin Peter
d85a10ebc5
fix broken tests
2013-05-31 20:55:05 +02:00
blizzz
eafb241068
Merge pull request #3562 from owncloud/fix_ldap_offline_host_handling
...
Fix ldap offline host handling
2013-05-31 11:10:33 -07:00
Arthur Schiwon
2ff9677cd1
LDAP: sqlite compatibility for emptyiing tables
2013-05-31 20:07:13 +02:00
Arthur Schiwon
c49ee4d3e3
LDAP: fix setting value of checkbox after loading configuration
2013-05-31 20:06:40 +02:00
FlorinPeter
35e83f8fed
Merge pull request #3554 from owncloud/files_encryption_fs_loaded_fix
...
fix login errors while filesystem is not loaded
2013-05-31 11:02:33 -07: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
Florin Peter
1c4c89418b
also fix login errors while filesystem is not loaded in app.php
2013-05-31 12:56:08 +02:00
Florin Peter
88d74c33af
Merge branch 'master' into files_encryption_fs_loaded_fix
2013-05-31 12:49:46 +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
Florin Peter
4a0e69f941
fix login errors while filesystem is not loaded
2013-05-31 11:55:40 +02:00
Jenkins for ownCloud
a730a72dcb
[tx-robot] updated from transifex
2013-05-31 02:04:40 +02:00
Florin Peter
eaa4f92275
added our own file extension .part will not work here if we use file_get_contents so we used our own extension '.etmp'
2013-05-30 22:07:36 +02:00
Florin Peter
b3834b49c3
prevent files_versions from calling file proxy which calls files_encryption and do unnecessary load and file operations
2013-05-30 22:05:52 +02:00
Arthur Schiwon
bd7771867b
LDAP: fix generation of alternate internal name on conflicts. Use also smaller number for better user experience on e.g. *DAV links
2013-05-30 16:55:21 +02: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
6d94b393bf
fix share and un-share for single file
2013-05-30 01:38:11 +02:00
Florin Peter
8c17f26226
fixed problems with file_get_contents and file_put_contents this problem was related to text editor with big text files
2013-05-30 01:13:22 +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
5a47054505
Implement getDirectoryPermissions() in Shared Permissions, fixes #2846
2013-05-29 18:22:54 -04:00