Bjoern Schiessle
|
6778dc5a4a
|
don't block login forever if we are stuck in the middle of the initial encryption
|
2014-02-17 10:03:57 +01:00 |
|
Bjoern Schiessle
|
f2f5769df7
|
catch errors during decryption
|
2014-02-17 10:03:57 +01:00 |
|
Bjoern Schiessle
|
2ab062193a
|
catch errors during initial encryption
|
2014-02-17 09:58:46 +01:00 |
Thomas Müller
|
750ffa8231
|
Merge pull request #7156 from owncloud/backgroundjob-public
Add the background job list to the public server container
|
2014-02-14 23:11:10 +01:00 |
Morris Jobke
|
df282d9ef8
|
Merge pull request #7207 from owncloud/fileinfo-serializable
Remove the JsonSerializable interface from \OC\Files\FileInfo
|
2014-02-14 22:11:54 +01:00 |
|
Thomas Müller
|
41f0ad2d13
|
Merge pull request #7204 from owncloud/groupexists-duplicate
Remove duplicate call to groupExists
|
2014-02-14 21:53:03 +01:00 |
Robin Appelman
|
09502fcb36
|
remove the JsonSerializable interface from \OC\Files\FileInfo
|
2014-02-14 19:26:06 +01:00 |
blizzz
|
e2c0c0e256
|
Merge pull request #7206 from owncloud/fix_enc_tests
fileinfo is no longer a array
|
2014-02-14 19:09:46 +01:00 |
|
Bjoern Schiessle
|
2933668355
|
fileinfo is no longer a array
|
2014-02-14 18:05:59 +01:00 |
icewind1991
|
2a7509ee50
|
Merge pull request #6748 from owncloud/fileinfo
Add a FileInfo class which holds all info of a file ...
|
2014-02-14 15:16:39 +01:00 |
|
Robin Appelman
|
b35f679483
|
Fix test cases for group manager
|
2014-02-14 15:07:08 +01:00 |
Vincent Petry
|
d7f4547717
|
Merge pull request #6726 from owncloud/fix_6630
don't urldecode get var, php does this automatically
|
2014-02-14 14:34:20 +01:00 |
|
Robin Appelman
|
0ba0596341
|
remove duplicate call to groupExists
|
2014-02-14 14:25:45 +01:00 |
|
Thomas Müller
|
595b908b74
|
Merge pull request #7183 from owncloud/remove-force-lowercase
remove forced lowercase from extension, fix #4747
|
2014-02-14 13:58:42 +01:00 |
|
Thomas Müller
|
4b603cd2f8
|
Merge pull request #7201 from owncloud/fix_error_msg_imagick_queryFormats
suppress error msg caused by php bug
|
2014-02-14 12:49:52 +01:00 |
|
Vincent Petry
|
afe133d5d1
|
Merge pull request #7168 from owncloud/issue/7152
Send correct path on file upload when using public app
|
2014-02-14 12:25:20 +01:00 |
Georg Ehrke
|
f62f1658ce
|
suppress error msg caused by php bug
|
2014-02-14 11:23:39 +01:00 |
|
Thomas Müller
|
4b84e3a7e8
|
Merge pull request #4624 from owncloud/convert-oc_appconfig
Convert OC_Appconfig to object interface
|
2014-02-13 15:51:40 +01:00 |
|
Robin Appelman
|
3b1df29318
|
sort expected result in tests
|
2014-02-13 13:56:02 +01:00 |
Jan-Christoph Borchardt
|
6e17d71a0d
|
remove forced lowercase from extension, fix #4747, also coding style fixes
|
2014-02-13 10:39:38 +01:00 |
|
Thomas Müller
|
30662fa7ac
|
Merge pull request #7178 from owncloud/issue/6277
External FTP Storage should request hostname instead of URL
|
2014-02-12 23:01:41 +01:00 |
Joas Schilling
|
658af627ce
|
External FTP Storage should request hostname instead of URL
Fix issue #6277
|
2014-02-12 18:20:10 +01:00 |
|
Joas Schilling
|
9619459e37
|
Send correct path on file upload when using public app
Fix issue #7152
|
2014-02-12 15:49:09 +01:00 |
|
icewind1991
|
7af456730e
|
Merge pull request #6964 from owncloud/storagestatistics-reuse
Reuse the calculated free_space in buildFileStorageStatistics
|
2014-02-12 15:48:14 +01:00 |
|
Robin Appelman
|
d6576c640c
|
Add unit tests for JobList
|
2014-02-12 13:52:13 +01:00 |
|
Robin Appelman
|
62288971ca
|
Additional phpdoc
|
2014-02-12 13:32:16 +01:00 |
|
Robin Appelman
|
3aafa837b8
|
Remove internal methods from the public interface
|
2014-02-12 13:25:50 +01:00 |
|
Robin Appelman
|
60bd9d512d
|
Merge branch 'master' into backgroundjob-public
|
2014-02-12 13:21:47 +01:00 |
|
Thomas Müller
|
3699728a3a
|
Merge pull request #7085 from owncloud/quick-fix-7019-master
Load authentication apps to get users from all backends
|
2014-02-11 18:41:08 +01:00 |
|
Vincent Petry
|
c442a03d3a
|
Merge pull request #7075 from owncloud/quota-storagexsendfile
Added isLocal() method to storage, used for xsendfile
|
2014-02-11 14:49:39 +01:00 |
|
Robin Appelman
|
50cc6a85e5
|
Add explicit sorting
|
2014-02-11 14:26:40 +01:00 |
|
Robin Appelman
|
a6399f9cef
|
Add the background job list to the public server container
|
2014-02-11 14:00:24 +01:00 |
|
Robin Appelman
|
a7c50514ac
|
Merge branch 'master' into convert-oc_appconfig
|
2014-02-11 13:26:54 +01:00 |
|
Arthur Schiwon
|
72f134cfce
|
intendation
|
2014-02-11 10:50:10 +01:00 |
|
Arthur Schiwon
|
af781bdea7
|
fix DI
|
2014-02-11 10:50:03 +01:00 |
|
Arthur Schiwon
|
32afdcbefe
|
Inject logger
|
2014-02-11 10:49:59 +01:00 |
|
Arthur Schiwon
|
20bfbb0fd9
|
wrong tld
|
2014-02-11 10:49:54 +01:00 |
|
Arthur Schiwon
|
9a39cd3b38
|
test for share dialoge sorter
|
2014-02-11 10:49:46 +01:00 |
|
Arthur Schiwon
|
82716ced48
|
sort following entries in alphabetical order
|
2014-02-11 10:49:41 +01:00 |
|
Arthur Schiwon
|
41e8d44cf7
|
move sorter into a class
|
2014-02-11 10:49:34 +01:00 |
|
Arthur Schiwon
|
1d0a236563
|
respect coding guidelines
|
2014-02-11 10:49:27 +01:00 |
|
Arthur Schiwon
|
71e4d965a1
|
on filtering the share box users and groups whose name begins with the search term shall appear on top, fixes #6430
|
2014-02-11 10:49:22 +01:00 |
|
Vincent Petry
|
bea80ffe20
|
Merge pull request #6881 from owncloud/remove-user-storage-entry
Also remove the user's home storage from the storage table when deleting a user
|
2014-02-10 15:04:05 +01:00 |
|
Arthur Schiwon
|
14d1abf63f
|
LDAP: improve debug message
|
2014-02-10 14:45:37 +01:00 |
|
Arthur Schiwon
|
18e1a10e96
|
LDAP: also try MS AD's thumbnailPhoto when looking for an avatar image
|
2014-02-10 14:45:31 +01:00 |
Tom Needham
|
84607db284
|
Merge pull request #6988 from owncloud/oc_api_fix_warinigs
[ocs API] getData() always needs to return an array
|
2014-02-10 13:43:16 +00:00 |
|
Morris Jobke
|
eba1d574cf
|
Merge pull request #7134 from owncloud/issue/5794
Make google drive client secret and dropbox api secret a password field
|
2014-02-10 14:34:24 +01:00 |
|
Robin Appelman
|
753af3a3ff
|
Merge branch 'master' into storagestatistics-reuse
|
2014-02-10 14:01:32 +01:00 |
|
Robin Appelman
|
5ffc43cba0
|
Merge branch 'master' into remove-user-storage-entry
|
2014-02-10 13:53:01 +01:00 |
|
Morris Jobke
|
02bdb47049
|
Merge pull request #7140 from owncloud/enc_dont_login_during_encryption
refuse login as long as the initial encryption is running
|
2014-02-10 13:25:39 +01:00 |