wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
26484 commits 157 branches 562 tags 714 MiB
Commit graph

11012 commits

Author SHA1 Message Date
Roeland Jago Douma
98301210a9 Start of OCS Share API sharees endpoint 2015-08-26 11:54:23 +02:00
Morris Jobke
27af0e82dd Merge pull request #18042 from GreenArchon/master 
Properly nest groups when using memberOf to detect group membership, …
 2015-08-26 11:42:47 +02:00
Jenkins for ownCloud
90e11ee005 [tx-robot] updated from transifex 2015-08-26 04:10:42 -04:00
Christoph Wurst
d7ceb3a162 adjust dropdown borders to button borders 2015-08-25 22:59:15 +02:00
Morris Jobke
1ca638cfbd Merge pull request #18564 from owncloud/fix-transifex-sync 
Update slug
 2015-08-25 22:00:52 +02:00
Morris Jobke
6946edef5c Merge pull request #18554 from owncloud/fix-gs-share-master 
Simply hide sharing buttons for IE8
 2015-08-25 21:59:14 +02:00
Lukas Reschke
e2bd026b2e Merge pull request #18558 from owncloud/ext-objectstore 
Prevent objectstore being set from client side
 2015-08-25 20:56:51 +02:00
Jenkins for ownCloud
2171cc02c3 [tx-robot] updated from transifex 2015-08-25 12:39:10 -04:00
Robin McCorkell
63218ec098 Prevent objectstore being set from client side 2015-08-25 16:14:31 +01:00
Jan-Christoph Borchardt
a262be5141 Merge pull request #18550 from owncloud/mobile-shared-style 
fix being able to distinguish shared items on mobile
 2015-08-25 17:08:34 +02:00
Thomas Müller
5cf3170e89 don't load gs-share 2015-08-25 16:49:40 +02:00
Jan-Christoph Borchardt
1efbc99365 Merge pull request #18543 from owncloud/remove-lines 
Remove some lines
 2015-08-25 16:08:06 +02:00
Thomas Müller
fcde0234b7 Simply hide sharing buttons for IE8 - fixes #18011 2015-08-25 16:05:57 +02:00
Vincent Petry
1dc9283413 Merge pull request #18538 from owncloud/sidebar-improvements 
Fix sidebar for trashbin and others
 2015-08-25 14:57:41 +02:00
Jan-Christoph Borchardt
cc898cf346 fix being able to distinguish shared items on mobile 2015-08-25 14:45:39 +02:00
Jan-Christoph Borchardt
3cfbf77866 reduce files table header line 2015-08-25 14:14:53 +02:00
Vincent Petry
010c03fc30 Fix row highlight in other file lists 2015-08-25 12:05:04 +02:00
Morris Jobke
494c1d7417 Merge pull request #18440 from owncloud/ext-backends.customjs 
Migrate custom JS external storage backends to new registration API [part 2]
 2015-08-25 11:52:56 +02:00
Vincent Petry
5e6fa3c938 Fix trashbin sidebar 
Do not display size as it is not available.
Use display name instead of name to remove the ".d123456" suffix.
 2015-08-25 11:29:35 +02:00
Vincent Petry
a86602a157 Properly hide sidebar when switching between files app sections 
Since there are multiple sidebars, one for each files app section, we
need to hide the correct ones.
 2015-08-25 11:07:47 +02:00
Thomas Müller
2f86be9ced Merge pull request #18523 from owncloud/crazy-scanner 
Prevent bkg scanner going crazy with unavailable storages (ajax/scan.php)
 2015-08-25 09:23:42 +02:00
Morris Jobke
424759908d Merge pull request #18445 from owncloud/ext-only-setuservars-string 
setUserVars() should only attempt substitution with strings
 2015-08-25 08:43:01 +02:00
Robin McCorkell
88a78237b0 Migrate Google external storage to new API 2015-08-25 00:22:10 +01:00
Robin McCorkell
a50ef61876 Migrate Dropbox external storage to new API 2015-08-25 00:22:10 +01:00
Robin McCorkell
ced04f9ad2 Migrate AmazonS3 external storage to new API 2015-08-25 00:22:10 +01:00
Robin McCorkell
f505883e45 Add on-backend and on-auth-mechanism events to JS 2015-08-25 00:22:10 +01:00
Morris Jobke
b2fcdd65cd Merge pull request #18528 from owncloud/files-sidebar-mtime 
Parse mtime from the data attributes
 2015-08-24 19:44:46 +02:00
Morris Jobke
1797bb576f Merge pull request #18525 from owncloud/app-sidebar-style 
Right sidebar style improvements
 2015-08-24 19:44:31 +02:00
Vincent Petry
37939fb0e8 Parse mtime from the data attributes 2015-08-24 17:16:20 +02:00
Jan-Christoph Borchardt
a659ccb89c bigger file thumbnail in app sidebar 2015-08-24 16:58:30 +02:00
Vincent Petry
fe575feca8 Prevent scanner going crazy with unavailable storages 2015-08-24 16:42:53 +02:00
Morris Jobke
e88b380973 Remove DEBUG constant and use config value 
* introduces config.php option 'debug' that defaults to false
* migrate DEBUG constant to config value
 2015-08-24 15:14:05 +02:00
blizzz
642ec8e3ba Merge pull request #18244 from owncloud/fix-issue-17677 
Fix 17677 - Remove LDAP case sensitive checkbox
 2015-08-24 13:45:15 +02:00
Vincent Petry
6848f25c0d Merge pull request #18477 from owncloud/fed-alwaysdetectremotechanges 
Always detect remote changes for fed sharing
 2015-08-24 12:17:23 +02:00
Lukas Reschke
cca35f0c3e Merge pull request #18121 from owncloud/enc_improve_privkey_encryption 
use password hash to encrypt private key
 2015-08-24 12:03:27 +02:00
Vincent Petry
fe568ab64d Merge pull request #18486 from owncloud/use-client-service-to-work-behind-proxy 
Use client service to work behind proxy for checks for remote ownCloud instances
 2015-08-24 11:05:14 +02:00
Morris Jobke
1f7a59b0e2 Merge pull request #18505 from owncloud/fix-personal-scrollbar 
fix horizontal scrollbar in personal settings caused by federated cloud ID section
 2015-08-24 11:03:37 +02:00
Vincent Petry
31d62c10bf Merge pull request #17501 from tbartenstein/patch-1 
Update fileinfo.php
 2015-08-24 09:57:27 +02:00
Jan-Christoph Borchardt
0f10e2c1fe fix horizontal scrollbar in personal settings caused by federated cloud ID section 2015-08-24 09:36:44 +02:00
Lukas Reschke
0a1d551090 Use IClientService to check for remote ownCloud instances 
1. Allows to set a timeout (though still not perfect but way better than before)
2. Allows to have unit tests
3. I also added unit tests for the existing controller code
4. Corrected PHPDoc on IClient
 2015-08-22 14:39:43 +02:00
Lennart Rosam
4b04412db3 Spaces -> tabs 2015-08-22 01:27:32 +02:00
Lennart Rosam
588fae54cb Remove if-block as the helper does return the empty prefix 2015-08-21 22:50:28 +02:00
tbartenstein
5e1c2aecc7 fix unit test for folder renaming (icon) 
fix unit test to go with #17501 and check for the new icon
 2015-08-21 18:54:09 +02:00
Vincent Petry
d658d8dd4e Always detect remote changes for fed sharing 
This is even more important now that filesystem_check_changes is 0 by
default.
 2015-08-21 15:32:53 +02:00
Robin McCorkell
843135e4ff Replace array_filter() with foreach for PHP <5.6 
ARRAY_FILTER_USE_KEY is PHP 5.6+
 2015-08-21 10:13:15 +01:00
Robin McCorkell
5ded5c6fc1 Add availability methods to files_external FailedStorage 2015-08-20 22:47:57 +01:00
Robin McCorkell
99b54e102d Prevent shares being added to oc_storages via availability 2015-08-20 22:43:46 +01:00
Vincent Petry
7c64ae4663 Add namespace in case the file is loaded individually 
Some apps might load this file in JS unit tests and need the OCA.Files
namespace to exist.
 2015-08-20 17:54:52 +02:00
Joas Schilling
9573d7d60d Merge pull request #18372 from owncloud/issue-18358-object-type-and-id-for-activities 
Issue 18358 object type and id for activities
 2015-08-20 15:53:36 +02:00
Robin McCorkell
d93bf35482 Merge pull request #18408 from owncloud/ext-ocp 
Use OCP classes as much as possible in files_external v2
 2015-08-20 13:09:12 +01:00