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

11819 commits

Author SHA1 Message Date
Thomas Müller
a8daef4280 Merge pull request #20223 from owncloud/fix-apply-webdav-tags 
Fix TagList namespace in property map
 2015-11-03 14:22:49 +01:00
Jan-Christoph Borchardt
fa5a15be2b fix external storage wording detail, ref #19858 2015-11-03 08:56:15 +01:00
Jenkins for ownCloud
82f3590fd0 [tx-robot] updated from transifex 2015-11-03 01:58:43 -05:00
Vincent Petry
52e213f026 Fix TagList namespace in property map 2015-11-02 14:19:01 +01:00
blizzz
83d3c94590 Merge branch 'master' into fix-20151 2015-11-02 13:32:24 +01:00
Thomas Müller
a8641fdc95 Merge pull request #20192 from owncloud/fix-20090 
if a user that is flag as deleted shows up again, remove that flag. F…
 2015-11-02 11:28:28 +01:00
Thomas Müller
c5caebbd1f Merge pull request #20219 from owncloud/issue-19707-scrollto-in-trashibn 
Fix scrollto= parameter in trashbin view
 2015-11-02 11:27:49 +01:00
Joas Schilling
a378dc5a7b Fix scrollto= parameter in trashbin view 2015-11-02 10:31:06 +01:00
Thomas Müller
01adefaf50 Merge pull request #20181 from owncloud/files-fixdownloadspinner 
Fix file action download spinner
 2015-11-02 10:13:58 +01:00
Jenkins for ownCloud
2afc14e195 [tx-robot] updated from transifex 2015-11-02 01:55:05 -05:00
Jenkins for ownCloud
2374a0df5d [tx-robot] updated from transifex 2015-11-01 01:54:58 -04:00
Jenkins for ownCloud
d7ed353814 [tx-robot] updated from transifex 2015-10-31 01:55:07 -04:00
Thomas Müller
d4af369e60 Merge pull request #19940 from owncloud/ldap-server-wizard-tooltip 
Add tooltip to ldap server wizard
 2015-10-31 00:43:30 +01:00
Arthur Schiwon
a2f2ffb8db if a user that is flag as deleted shows up again, remove that flag. Fixes #20090 2015-10-30 19:20:42 +01:00
Arthur Schiwon
16aa339475 add method to count users by loginname and use it for diagnose test, fixes #20151 2015-10-30 18:20:50 +01:00
Thomas Müller
6911d8f0a4 Merge pull request #20175 from owncloud/login-arrow 
remove unneeded icons from input fields to not distract from submit button, fix #18940
 2015-10-30 15:56:13 +01:00
Thomas Müller
27db39bd03 Merge pull request #20160 from owncloud/share-allowdeleteinshareoverview 
Bring back delete permission in share overview
 2015-10-30 15:30:05 +01:00
Vincent Petry
80cf4e84e3 Fix file action download spinner 2015-10-30 14:58:53 +01:00
Thomas Müller
b7f0524f2f Merge pull request #20167 from owncloud/fix-docker-ip-retrieval 
Use proper statement to retrieve the IP of an docker instance
 2015-10-30 13:57:03 +01:00
Robin Appelman
3c01386a50 Merge pull request #20156 from owncloud/files-filter-triger-once 
dont trigger the scroll event of every single item we filter in the file list
 2015-10-30 12:52:04 +01:00
Jan-Christoph Borchardt
a05ea0fb1e remove unneeded icons from input fields to not distract from submit button, fix #18940 2015-10-30 11:11:37 +01:00
Morris Jobke
a91572b7f3 Use proper statement to retrieve the IP of an docker instance 2015-10-30 09:28:33 +01:00
Jenkins for ownCloud
91b2cdc62b [tx-robot] updated from transifex 2015-10-30 01:55:52 -04:00
Thomas Müller
17dc482e8f Merge pull request #20051 from otetard/feature/newfilemenu_extend 
Allow Owncloud apps to add new items to the “new” file menu.
 2015-10-29 23:49:57 +01:00
Vincent Petry
dcfaf3afdc Bring back delete permission in share overview 2015-10-29 17:56:54 +01:00
Hendrik Leppelsack
1e9abb4964 add tooltip to ldap server wizard 2015-10-29 17:44:46 +01:00
Thomas Müller
73d9699be9 Merge pull request #20135 from owncloud/check-if-null-subadmin 
Drop OC_SubAdmin and replace usages
 2015-10-29 17:07:45 +01:00
Robin Appelman
860e31a333 dont trigger the scroll event of every single item we filter in the file list 2015-10-29 16:30:56 +01:00
Thomas Müller
774d069ff0 Merge pull request #20122 from owncloud/files-consolidateiconupdate 
Fix icon update to be more consistent
 2015-10-29 15:40:15 +01:00
Vincent Petry
9c9158e6b7 Fix icon update to be more consistent 
Makes the details bar show the same icon as in the list.
 2015-10-29 12:59:51 +01:00
Lukas Reschke
c6f6a8758b Drop OC_SubAdmin and replace usages 2015-10-29 11:31:18 +01:00
Thomas Müller
7d96f82659 Merge pull request #19000 from UoM-ResPlat-DevOps/swift-squelch-expected-404-errors 
Don't log expected Swift 404 responses in files_external
 2015-10-29 11:26:24 +01:00
Thomas Müller
911613f711 Merge pull request #19100 from owncloud/ext-tooltip-unavailable 
Display external storage status as tooltip
 2015-10-29 11:25:52 +01:00
Thomas Müller
c7f409713e Merge pull request #20140 from owncloud/provisioning_killappphp 
Kill empty app.php in provisioning_api
 2015-10-29 11:25:26 +01:00
Joas Schilling
16e3f4de07 Kill empty app.php in provisioning_api 2015-10-29 11:08:39 +01:00
Thomas Müller
5bf476efd0 Merge pull request #20079 from owncloud/filelist-invalidpath 
Fix file list reload callback result
 2015-10-29 09:21:30 +01:00
Jenkins for ownCloud
527ef76dd6 [tx-robot] updated from transifex 2015-10-29 01:55:45 -04:00
Thomas Müller
92e63a802c Merge pull request #19758 from owncloud/ext-fallback-getmimetype 
Fallback to default mimetype detection mechanism
 2015-10-28 14:50:19 +01:00
Thomas Müller
e54c22eb59 Merge pull request #20089 from owncloud/litmus-test-webdav 
Enable DAV app testing on travis
 2015-10-28 11:09:12 +01:00
Thomas Müller
09fff15021 run litmus scripts only if code in the dav app did change changed 2015-10-28 09:59:09 +01:00
Thomas Müller
0eeee8fdd8 Merge pull request #20093 from owncloud/ldap-fix-quota-and-case 
LDAP fix quota and case, fixes #20043
 2015-10-28 09:31:04 +01:00
Jenkins for ownCloud
d74811fcc8 [tx-robot] updated from transifex 2015-10-28 01:55:29 -04:00
Thomas Müller
b753e7631b Enable DAV app testing on travis 2015-10-27 23:00:04 +01:00
Arthur Schiwon
f96e552164 fix attribute casing to ensure array keys work 2015-10-27 19:10:38 +01:00
Arthur Schiwon
e1d61284f8 fix update quota with known value 2015-10-27 18:07:40 +01:00
Robin Appelman
c309193039 Merge pull request #17104 from owncloud/chunked-upload-locking 
locking for chunked dav upload
 2015-10-27 16:58:00 +01:00
Bjoern Schiessle
5fad45b230 make encryption configurable for home storage 2015-10-27 14:24:20 +01:00
Vincent Petry
f24386c491 Fix file list reload callback result 
All reloadCallback must return either true for success or false in case
of failure / non-existing folder.

Some file lists only have a root folder (favorite, shares), so restrict
the path to that to avoid having a wrong path in the breadcrumbs.
 2015-10-27 11:51:54 +01:00
Thomas Müller
d7d5a3bab5 Merge pull request #20066 from owncloud/list-principaly-in-debug-mode 
as soon as debug mode is enabled we allow listing of principals
 2015-10-27 10:29:50 +01:00
Roeland Jago Douma
db17598a0e Verify the src exists in webdav MOVE 
* Unit test added
 2015-10-27 09:22:33 +01:00
Jenkins for ownCloud
0875a4a18f [tx-robot] updated from transifex 2015-10-27 01:55:44 -04:00
Thomas Müller
33152c3203 as soon as debug mode is enabled we allow listing of principals 2015-10-26 22:10:00 +01:00
Thomas Müller
23e51c37cf Merge pull request #20049 from owncloud/make-author-file-complete 
Generate author file by license.php build script
 2015-10-26 17:14:06 +01:00
Olivier Tétard
d386168504 Allow apps to add new items in the “New” filemenu. 
Owncloud apps can now add new items to the “new” file menu. A new
`addMenuEntry()` was added to `NewFileMenu`. To add a new item, you
have to attach a plugin to `OCA.Files.NewFileMenu` that will call
`addMenuEntry()`.
 2015-10-26 15:03:27 +01:00
Lukas Reschke
8f09d5b67c Update license headers 2015-10-26 14:04:01 +01:00
Thomas Müller
26201bd414 Adding required parameters of ctor of class Auth 2015-10-26 13:02:10 +01:00
Thomas Müller
c79496b5a3 Introduced the new webdav endpoint remote.php/dav holding the principals and the files collection 2015-10-26 13:00:00 +01:00
Thomas Müller
9a7a45bc37 Merge pull request #20010 from owncloud/add-tests-auth-plugin 
Add tests for Sabre Auth plugin + make getCurrentUser compatible
 2015-10-26 12:59:24 +01:00
Thomas Müller
1f32a3e485 Merge pull request #20030 from owncloud/autoload-files-external-optimize 
Use optimized autoloader for files_external
 2015-10-26 08:42:28 +01:00
Jenkins for ownCloud
e6d64783a0 [tx-robot] updated from transifex 2015-10-26 01:55:04 -04:00
Lukas Reschke
b678eadc43 Use optimized autoloader for files_external 2015-10-25 23:34:30 +01:00
Lukas Reschke
13e817e901 Throw exception on getPath if file does not exist 
Currently the `getPath` methods returned `NULL` in case when a file with the specified ID does not exist. This however mandates that developers are checking for the `NULL` case and if they do not the door for bugs with all kind of impact is widely opened.

This is especially harmful if used in context with Views where the final result is limited based on the result of `getPath`, if `getPath` returns `NULL` PHP type juggles this to an empty string resulting in all possible kind of bugs.

While one could argue that this is a misusage of the API the fact is that it is very often misused and an exception will trigger an immediate stop of execution as well as log this behaviour and show a pretty error page.

I also adjusted some usages where I believe that we need to catch these errors, in most cases this is though simply an error that should hard-fail.
 2015-10-25 17:58:21 +01:00
Jenkins for ownCloud
eb10e3abc2 [tx-robot] updated from transifex 2015-10-25 01:55:04 -04:00
Jenkins for ownCloud
ba010a5aa4 [tx-robot] updated from transifex 2015-10-24 01:55:42 -04:00
Lukas Reschke
cddc9abc06 Add tests for Sabre Auth plugin + make getCurrentUser compatible 2015-10-23 17:30:47 +02:00
Robin McCorkell
9a4d37f626 Display storage status as tooltip 2015-10-23 15:25:07 +02:00
Robin McCorkell
4ac33ab26b Remove status indicator on modification 2015-10-23 15:25:07 +02:00
Thomas Müller
e8b12a3c2c Merge pull request #19970 from owncloud/encryption-getuidonboolean 
Fix "Call to a member function getUID() on boolean" in Crypt
 2015-10-23 12:56:14 +02:00
Jenkins for ownCloud
a341e786dd [tx-robot] updated from transifex 2015-10-23 01:55:06 -04:00
Morris Jobke
db25f41da8 handle NoUserException in sharing code 
* setup LDAP users
* share from an LDAP user
* delete that LDAP user
* log in as share recipient
* before: unhandled NoUserException
* after: NoUserEception is logged and share is not shown anymore
 2015-10-22 17:04:36 +02:00
Joas Schilling
e0a56317fa Fix "Call to a member function getUID() on boolean" in Crypt 2015-10-22 11:46:37 +02:00
Thomas Müller
bbea8c3545 Merge pull request #19937 from owncloud/detailsview-donotopenonrename 
Do not display details bar after rename
 2015-10-22 10:42:15 +02:00
Thomas Müller
8ed0214818 Merge pull request #19931 from owncloud/fix-webui-upload-and-conflicts 
Fix file upload, conflict dialog, also in public link
 2015-10-22 10:41:48 +02:00
Jenkins for ownCloud
c50bbb8cde [tx-robot] updated from transifex 2015-10-22 01:55:47 -04:00
Roeland Jago Douma
9b64fa7b92 [provisioning api] losen test 
Since we have no control of how backends sort their list of users and we
also don't want to sort yet another time the test now just checks if the
correct number of elements is returned and if they are from the list of
group members.
 2015-10-21 20:05:14 +02:00
Vincent Petry
e36c85178f Do not display details bar after rename 2015-10-21 13:43:39 +02:00
Vincent Petry
abd0ba1f25 Fix file upload, conflict dialog, also in public link 
- Use "FileList" instead of "OCA.Files.App.fileList" that doesn't exist in public
link page.
- Fix public link upload by properly adding the form data using a new
  utility function "addFormData". That one is needed because IE8 upload
  and regular upload use a different format...
 2015-10-21 12:18:06 +02:00
Morris Jobke
ee42e9d489 increase core version and add dav version number 2015-10-21 11:36:44 +02:00
Jenkins for ownCloud
74f41349b7 [tx-robot] updated from transifex 2015-10-21 01:56:16 -04:00
Roeland Jago Douma
aeffd51145 Fix scrutinizer issues 
* PHPDoc
* Proper array initialization
 2015-10-20 21:47:37 +02:00
Robin Appelman
021ed8b2bd adjust tests for new dav classes 2015-10-20 16:22:45 +02:00
Hendrik Leppelsack
480a005b47 fix pagination on public file list 2015-10-20 16:11:10 +02:00
Thomas Müller
122f8d831b Merge pull request #19863 from owncloud/external-storage-wording 
fix wording on external storage checkbox, ref #19858
 2015-10-20 15:21:26 +02:00
Thomas Müller
257ccfa698 Merge pull request #19877 from owncloud/dropbox-fixmetadatacachepaths 
Fix Dropbox metadata cache with trimmed paths
 2015-10-20 15:17:28 +02:00
Robin McCorkell
c98b303a5e Skip Swift stat test 2015-10-20 14:45:16 +02:00
Robin McCorkell
ad028c555d Don't attempt to run tests unless start file is successful 2015-10-20 14:45:16 +02:00
Robin McCorkell
8467dbfa91 Detect Docker initialization properly 
Use netcat to check when the port opens, rather than an arbitrary
timeout. Hard limit of 60 seconds in case something breaks
 2015-10-20 14:45:16 +02:00
Robin McCorkell
70f4e9413f Make Swift test robust if container didn't exist 2015-10-20 14:45:16 +02:00
Robin McCorkell
0de9819da3 Replace Swift Docker test with Ceph image 2015-10-20 14:45:16 +02:00
Morris Jobke
2577a624c0 [files_external] swift tests 2015-10-20 14:45:16 +02:00
Thomas Müller
60abc2738b Merge pull request #18399 from owncloud/api-getusers-for-subadmins 
enable api getUsers for subadmins
 2015-10-20 14:28:31 +02:00
Thomas Müller
474f34eb6b Merge pull request #19636 from owncloud/share_expire_backgroun 
Add backgroundjob to expire link shares
 2015-10-20 14:27:15 +02:00
Thomas Müller
899165113c Merge pull request #19742 from owncloud/shareinfo_performance 
Do not calculate non essential info
 2015-10-20 14:25:36 +02:00
Robin Appelman
283798a220 remove locking for chunks 2015-10-20 14:15:59 +02:00
Robin Appelman
760335c57d fix locking in tests 2015-10-20 14:15:59 +02:00
Robin Appelman
ddc8749814 Adjust for wide locking 2015-10-20 14:14:56 +02:00
Robin Appelman
21d02673be Add tests for uploading to locked files 2015-10-20 14:14:56 +02:00
Robin Appelman
23eaf27a5b locking for chunked dav upload 2015-10-20 14:14:56 +02:00
Thomas Müller
adfb33b791 Merge pull request #19838 from owncloud/remove-files-remote.php 
Remove apps/files/appinfo/remote.php - this is no longer used
 2015-10-20 11:31:35 +02:00
Thomas Müller
5752e3b3c0 Merge pull request #19666 from owncloud/fix_13002 
Combine OCS API getUser method code into provisioning_api app
 2015-10-20 11:10:39 +02:00
Thomas Müller
50cb8106dc Merge pull request #19859 from owncloud/fix-long-groupnames 
ellipsize long group names in select2 dropdown, fix #16977
 2015-10-20 11:06:18 +02:00
Morris Jobke
e1c47d6823 use correct class name 2015-10-20 08:18:53 +02:00
Roeland Jago Douma
ec296b0b7d Add backgroundjob to expire link shares 
Simple background job to expire the link shares.

* added unit tests
 2015-10-20 08:18:53 +02:00
Jenkins for ownCloud
dfd44942c6 [tx-robot] updated from transifex 2015-10-20 01:55:03 -04:00
Vincent Petry
d795643ef9 Fix Dropbox metadata cache with trimmed paths 
Makes sure that the paths are trimmed to avoid duplicate entries like
"/test" and "test". This should make this storage slightly faster by
reducing the cache misses.
 2015-10-19 20:52:15 +02:00
Jörn Friedrich Dreyer
2895c91291 Merge pull request #17641 from owncloud/fix_objectstore_rename 
don't move files in cache twice, fixes renaming for objectstores
 2015-10-19 17:18:57 +02:00
Jan-Christoph Borchardt
acc906c4d8 fix wording on external storage checkbox, ref #19858 2015-10-19 21:26:47 +13:00
Jenkins for ownCloud
008082ebad [tx-robot] updated from transifex 2015-10-19 01:55:02 -04:00
Jan-Christoph Borchardt
3875ca2d19 ellipsize long group names in select2 dropdown, fix #16977 2015-10-19 16:11:53 +13:00
Jenkins for ownCloud
8d25528c49 [tx-robot] updated from transifex 2015-10-18 01:55:07 -04:00
Joas Schilling
0d3d75b3b3 Increase the 2nd digit of shipped apps 2015-10-17 08:47:11 +02:00
Jenkins for ownCloud
c378456137 [tx-robot] updated from transifex 2015-10-17 01:55:34 -04:00
Robin Appelman
d636bce8a4 fix encryption migration test 2015-10-16 21:41:51 +02:00
Robin Appelman
e4364426e2 Fix listing of trash files in test 2015-10-16 21:41:51 +02:00
Robin Appelman
2e8232e803 Fix trashbin handling of unknown/unlimited free space 2015-10-16 21:41:51 +02:00
Robin Appelman
d749b9a5ac Fix rename shared versions test 2015-10-16 21:41:51 +02:00
Robin Appelman
22c5c19376 handle versions expire for home storages with unlimited quota 2015-10-16 21:41:51 +02:00
Robin Appelman
416da0dfe9 fix delete orphan shares test with object home storage 2015-10-16 21:41:51 +02:00
Robin Appelman
54cea05271 Fix preserving file ids when restoring a file with object storage 2015-10-16 21:41:51 +02:00
Robin Appelman
a87b34a059 dont assume home storage is local in trash test 2015-10-16 21:41:51 +02:00
Robin Appelman
8efd037eb8 Make shared folder size propagation test work with object home storage 2015-10-16 21:41:51 +02:00
Robin Appelman
e7f75484f8 Fix shared storage tests for non local home storage 2015-10-16 21:41:51 +02:00
Robin Appelman
0cdd46de60 fix sabre connector tests when using a non local home storage 2015-10-16 21:41:51 +02:00
Thomas Müller
6cd1126dd1 Merge pull request #19843 from owncloud/an-app-is-identified-by-having-a-info.xml-app.php-should-not-be-mandatory 
an-app-is-identified-by-having-a-info.xml-app.php-should-not-be-manda…
 2015-10-16 21:28:55 +02:00
C. Montero Luque
9e6a4dce43 Merge pull request #19821 from owncloud/GreenArchon-fix-memberof-regression 
Revert "adjust to nested group fix
 2015-10-16 13:39:57 -04:00
Thomas Müller
8a036842aa Fix failing unit test 2015-10-16 17:36:27 +02:00
Thomas Müller
9d910deef0 Merge pull request #19836 from owncloud/share-fix-spinner-position 
Fix spinner positions in share tab
 2015-10-16 17:17:01 +02:00
Thomas Müller
ef3fefc00e Remove apps/files/appinfo/remote.php - this is no longer used 2015-10-16 16:49:51 +02:00
Thomas Müller
7e9714340e Merge pull request #19831 from owncloud/ext-dropbox-removecacheafterupload 
Remove Dropbox metadata from cache after upload
 2015-10-16 16:45:18 +02:00
Thomas Müller
97d4093891 Merge pull request #19828 from owncloud/ie9-placeholder-sickness 
[IE9] Prevent LDAP password field to become plain text
 2015-10-16 16:44:55 +02:00
Vincent Petry
90e34e26bd Fix spinner positions in share tab 
Also fix missing spinner when removing link share
 2015-10-16 15:54:27 +02:00
Vincent Petry
796179af00 Remove Dropbox metadata from cache after upload 
This will make sure that the next calls that read the mtime will get the
correct value.
 2015-10-16 13:47:00 +02:00
Vincent Petry
c406efe74f [IE9] Prevent LDAP password field to become plain text 
The placeholders library converts the password field to a text field to
achieve placeholders functionality. However this is buggy and doesn't
properly mask the password when it was set through $el.val().

This workaround sets the type back to password directly after setting a
value.
 2015-10-16 13:25:16 +02:00
Morris Jobke
ff5ed44330 Fix typo and adjust required version 2015-10-16 13:17:12 +02:00
Roeland Jago Douma
ca27024fa2 Fix webdav access 
* Correct namespace
* Pass the EventDispatcher to the webDAV server
 2015-10-16 13:17:12 +02:00
Thomas Müller
8fa59033ac Fix uni tests 2015-10-16 13:17:12 +02:00
Thomas Müller
2ff55560e2 Remove $ETagFunction - it was never used 2015-10-16 13:17:12 +02:00
Thomas Müller
f2889dc6e4 Consolidate webdav code - move all to one app 2015-10-16 13:17:12 +02:00
Lukas Reschke
d486949705 Adjust unit tests 2015-10-16 10:37:08 +02:00
Lukas Reschke
733542a264 Fix style 2015-10-16 10:36:38 +02:00
Frédéric Fortier
f178f612d8 Revert "adjust to nested group fix 
This reverts commit 845485cfe, which fixes #19816 regression.
 2015-10-16 09:39:07 +02:00
Jenkins for ownCloud
7224e99ccd [tx-robot] updated from transifex 2015-10-16 01:55:03 -04:00
Thomas Müller
e4528c3bf7 Merge pull request #19814 from owncloud/filelist-preventerrorwhennosidebar 
Do not register sidebar panels when no sidebar
 2015-10-15 19:59:37 +02:00
Thomas Müller
f50f78dd9b Merge pull request #19795 from owncloud/fix-language-level-compat 
Remove arbitrary expression in empty
 2015-10-15 16:42:32 +02:00
Vincent Petry
204b3ca189 Do not register sidebar panels when no sidebar 2015-10-15 16:30:50 +02:00
Joas Schilling
24420e9eb1 Fix doc blocks of LDAP classes 2015-10-15 08:29:35 +02:00
Jenkins for ownCloud
5bee7007dd [tx-robot] updated from transifex 2015-10-15 01:55:32 -04:00
Lukas Reschke
4e5eb3b828 Remove arbitrary expression in empty 
Those are only allowed in PHP 5.5, thus making our code incompatible with PHP 5.4

Fixes https://github.com/owncloud/core/issues/19793
 2015-10-14 22:35:46 +02:00
Thomas Müller
3aeda33a99 Merge pull request #19630 from owncloud/fix-ie-pain 
Fix more IE issues
 2015-10-14 12:51:43 +02:00
Thomas Müller
3d5b1df549 Merge pull request #19633 from owncloud/sidebar-alt-favorite 
Move alt text for favorite action to image
 2015-10-14 12:51:13 +02:00
Thomas Müller
d8f0afaf9f Merge pull request #19634 from owncloud/notif-showtemporary 
showTemporary instead of show for notifications
 2015-10-14 12:50:55 +02:00
Thomas Müller
0a5349eec6 Merge pull request #19647 from owncloud/trashbin-removesidebar 
Remove sidebar for trashbin view
 2015-10-14 12:50:46 +02:00
Thomas Müller
321d2250d6 Merge pull request #19710 from owncloud/files-canceluploaddebounce-re 
Debounce cancel upload message
 2015-10-14 12:50:35 +02:00
Thomas Müller
156108dcdb Merge pull request #19714 from owncloud/trash-deletesectionposition-2 
Revert "Revert "Move trashbin specific CSS that modifies sidebar""
 2015-10-14 12:49:56 +02:00
Thomas Müller
b090ed7666 Merge pull request #19747 from owncloud/files-delete-hidenotif 
Hide notification on delete
 2015-10-14 12:49:22 +02:00
Thomas Müller
757f320531 Merge pull request #19580 from owncloud/issue-19399-remote-shares-case-sensitivity 
Make sure that remote shares use the correct uid casing
 2015-10-14 12:39:57 +02:00
Thomas Müller
bc6f76250a Merge pull request #19701 from owncloud/trash-restoreactioninline 
Make trashbin's "Restore" an inline action
 2015-10-14 12:38:49 +02:00
Thomas Müller
01cc38018a Merge pull request #19733 from owncloud/remove-controls-whennotneeded 
Remove controls for file lists that don't need it
 2015-10-14 12:37:55 +02:00
Hendrik Leppelsack
bf722d93df apply new checkbox style to admin settings 2015-10-14 12:14:49 +02:00
Jenkins for ownCloud
f9dd750ed7 [tx-robot] updated from transifex 2015-10-14 01:55:36 -04:00
Roeland Jago Douma
002e9c76cd Combine OCS API getUser method code into provisioning_api app 
Fixes #13002

Move the cloud/users/{userid} code in total to the provisioning API.
 2015-10-13 21:07:48 +02:00
Vincent Petry
cdc1386885 Hide notification on delete 
In case a permanent notification "storage full" was displayed, it will
be hidden after deleting a file.

Directly after that a getstoragestats.php call is made that will decide
whether to reshow the notification based on the new free space.
 2015-10-13 17:24:52 +02:00
Vincent Petry
915d37f226 Fallback to default mimetype detection mechanism 2015-10-13 16:44:01 +02:00
Roeland Jago Douma
5e9ca79788 Do not calculate non essential info 
There is no need to calculate a human readable date on the server side.
We supply the mtime and a client can easily convert that himself if
needed. This is already done most of the time since the date is often
not in the exact right format.

There is also no need to attach icon info. We have that available in
javascript. And else the client should get the right icon based on the
mimetype for its platform.

* Updated tests
 2015-10-13 14:56:55 +02:00
michag86
23db51f69a Merge branch 'master' into api-getusers-for-subadmins 2015-10-13 14:40:22 +02:00
Thomas Müller
3f083353c1 Merge pull request #19635 from owncloud/fix-ldap-value-limitation 
allow an attribute to return more than one value
 2015-10-13 14:09:52 +02:00
Vincent Petry
f89e7769dc Fix testDeleteStorage signature to match the one from the base class 
Prevents Strict warning when running autotest-external.sh
 2015-10-13 11:56:11 +02:00
Vincent Petry
ecb10db039 Remove controls for file lists that don't need it 
Remove controls from sharing overview and favorite file lists which
don't display paths.
 2015-10-13 11:36:24 +02:00
Jenkins for ownCloud
1f146d678c [tx-robot] updated from transifex 2015-10-13 01:55:06 -04:00
Thomas Müller
3444d62063 Revert "Revert "Move trashbin specific CSS that modifies sidebar"" 
This reverts commit 0738ddfb76.
 2015-10-12 16:21:27 +02:00
Vincent Petry
47475f3b4c Debounce cancel upload message 2015-10-12 15:11:52 +02:00
Thomas Müller
aedb7a7e70 Revert "Debounce cancel upload message" 2015-10-12 11:30:15 +02:00
Vincent Petry
6b71efb2b1 Make trashbin's "Restore" an inline action 2015-10-12 11:27:23 +02:00
Robin Appelman
179c0be158 Merge pull request #19628 from owncloud/files-canceluploaddebounce 
Debounce cancel upload message
 2015-10-12 10:54:58 +02:00
Jenkins for ownCloud
e16ac12f5a [tx-robot] updated from transifex 2015-10-12 01:54:59 -04:00
Jenkins for ownCloud
d29d018cc7 [tx-robot] updated from transifex 2015-10-11 01:54:58 -04:00
Jenkins for ownCloud
188acd5e4e [tx-robot] updated from transifex 2015-10-10 01:55:32 -04:00
Arthur Schiwon
e3a148584a adjust fetchList with a single requested attribute accordingly 2015-10-09 20:07:35 +02:00
Arthur Schiwon
d127b3f0d2 adjust tests 2015-10-09 14:30:49 +02:00
Arthur Schiwon
2fddb1367a fix primary group retrieval 2015-10-09 14:12:59 +02:00
Thomas Müller
8cbf76755e Merge pull request #19643 from owncloud/public-download-spinner 
Set download cookie on public download
 2015-10-09 14:10:29 +02:00
Jenkins for ownCloud
5cb83937fa [tx-robot] updated from transifex 2015-10-09 01:55:02 -04:00
Arthur Schiwon
a876efda50 treat dn as any other attribute when building the search() return array 2015-10-08 21:18:34 +02:00
Arthur Schiwon
dd2e887a8d adjust handling changed return array structure from search() and fetchList() 2015-10-08 20:32:15 +02:00
Thomas Müller
17ffa4a244 Merge pull request #19414 from owncloud/swift_primary_storage_tests 
Swift primary storage tests
 2015-10-08 14:08:56 +02:00
Thomas Müller
e5bbec79a6 Merge pull request #19611 from owncloud/fix-public-scroll 
Fix scrollbars in public template
 2015-10-08 13:01:01 +02:00
Vincent Petry
8e84ab8613 Remove sidebar for trashbin view 2015-10-08 12:59:13 +02:00
Vincent Petry
ececa90709 Set download cookie on public download 2015-10-08 12:50:56 +02:00
Vincent Petry
5bf43ec60a showTemporary instead of show for notifications 2015-10-08 10:52:39 +02:00
Jenkins for ownCloud
c5649a634f [tx-robot] updated from transifex 2015-10-08 01:54:58 -04:00
Arthur Schiwon
4a5cecd6fa allow an attribute to return more than one value 2015-10-07 18:57:49 +02:00
Vincent Petry
da8573840a Move alt text for favorite action to image 2015-10-07 18:01:31 +02:00
Thomas Müller
b2872ef759 Merge pull request #19589 from owncloud/shares-external-mount-provider 
Move the setup of external share mounts to a mountprovider
 2015-10-07 17:46:33 +02:00
Vincent Petry
f3ce5fd234 [IE8] Fix "new" button width 2015-10-07 17:34:38 +02:00
Vincent Petry
8a1a1c1326 Debounce cancel upload message 2015-10-07 16:34:06 +02:00
Thomas Müller
c8021441d0 Merge pull request #19489 from owncloud/fix-18297 
fix possible infinite loop when reading groups in the wizard
 2015-10-07 14:55:48 +02:00
Hendrik Leppelsack
ccfd052e81 move footer to bottom of public page 2015-10-07 13:03:43 +02:00
Jenkins for ownCloud
cd818e7419 [tx-robot] updated from transifex 2015-10-07 01:55:56 -04:00
Hendrik Leppelsack
e7b2da79ec fix public empty message 2015-10-06 23:59:58 +02:00
Thomas Müller
648b86abdd Merge pull request #19610 from owncloud/ext-deletestoragefromdatabase 
Remove oc_storages entries after removing ext storages
 2015-10-06 21:58:59 +02:00
Robin Appelman
59cf817308 Merge pull request #19511 from owncloud/etag-share-permissions-update 
Mark shares as dirty when changing permissions
 2015-10-06 18:09:12 +02:00
Vincent Petry
bbebffb60c Remove oc_storages entries after removing ext storages 
When removing external storages, either system-wide or user-wide,
automatically remove the matching oc_storages and oc_filecache entries.

This can only work if the backend configuration doesn't contain any
substitution variable $user in which case the storage id cannot be
computed, so this case is ignored for now.
 2015-10-06 17:33:16 +02:00
Hendrik Leppelsack
c1a5e96435 fix scrollbars in public template 2015-10-06 16:52:05 +02:00
Robin Appelman
17756ebf5b fix phpdoc 2015-10-06 16:37:43 +02:00
Robin Appelman
d3c1fcf961 Fix getEtag for roots of shared storages 2015-10-06 16:33:37 +02:00
Jörn Friedrich Dreyer
5646e39248 test objectstore with ceph docker 
use default config for swift primary storage test config

allow testsuite to complete

fix timeout, script cleanup, enable debug for now

use btrfs loopback device, requires privileged container and absolute path

throw exception when storage has problems

debug by echo ...

sleep more, more debug
 2015-10-06 16:27:25 +02:00
Joas Schilling
13dd62f7b0 Make sure that remote shares use the correct uid casing 2015-10-06 15:16:19 +02:00
Vincent Petry
d546c5bb59 Propagate shares etag when group membership changed 2015-10-06 15:02:22 +02:00
Thomas Müller
4b31b349b8 Merge pull request #19595 from owncloud/fix-versions-log-entry 
Reset to auto if not set
 2015-10-06 13:45:35 +02:00
Robin Appelman
47c71d8e87 use microtime 2015-10-06 13:00:30 +02:00
Robin Appelman
41f9946272 clear hooks for tests 2015-10-06 11:38:41 +02:00
Robin Appelman
0817024e6f Mark shares as dirty when changing permissions 2015-10-06 11:38:41 +02:00
Thomas Müller
0385a62363 Merge pull request #19597 from owncloud/update-license-headers 
update licence headers via script
 2015-10-06 11:18:35 +02:00
Morris Jobke
8366ce2767 deduplicate @xenopathic 2015-10-06 09:52:19 +02:00
Thomas Müller
1525ef43f9 Merge pull request #18484 from owncloud/fix-17964 
Remove whitespace from base-DNs
 2015-10-06 09:23:24 +02:00
Jenkins for ownCloud
3ff60cc2e3 [tx-robot] updated from transifex 2015-10-06 01:55:00 -04:00
Morris Jobke
b945d71384 update licence headers via script 2015-10-05 21:15:52 +02:00
Victor Dubiniuk
99f1112e33 Reset to auto if not set 2015-10-05 20:52:25 +03:00
Arthur Schiwon
353a8e442f fix possible infinite loop when reading groups in the wizard 2015-10-05 19:10:30 +02:00
Vincent Petry
c17d60165a Fix tooltip placement on rename error 2015-10-05 17:44:25 +02:00
Robin Appelman
e468b38bd4 sanitize mountpoint 2015-10-05 17:14:39 +02:00
Robin Appelman
52c8b488cb fix test 2015-10-05 16:43:10 +02:00
Robin Appelman
e1c562f66b extract the mount provider from the manager 2015-10-05 16:39:11 +02:00
Robin Appelman
a0c9dc2986 register the external share mount provider 2015-10-05 16:19:13 +02:00
Robin Appelman
76a528e511 Make the external share manager a mount provider 2015-10-05 16:18:14 +02:00
Arthur Schiwon
fc273ac88c trim by default, add unit tests 2015-10-05 13:42:20 +02:00
Lennart Rosam
70ffa2f9f8 Spaces -> Tabs, Update PHP-Doc and function logic 2015-10-05 13:42:20 +02:00
Lennart Rosam
b47d15cd20 Remove whitespace from base-DNs 2015-10-05 13:42:20 +02:00
Bjoern Schiessle
bf82015254 add some output to explain the pre-conditions for decrypt-all 2015-10-05 12:41:05 +02:00
Thomas Müller
710b7dd81c Merge pull request #19487 from owncloud/split_share_middleware 
Split files_sharing middelware
 2015-10-05 10:57:11 +02:00
Thomas Müller
28919faff5 Merge pull request #19552 from owncloud/inline_fileactions_alttext 
If an inline files action provides an alt text show it
 2015-10-05 10:24:48 +02:00
Thomas Müller
681ab05e4d Merge pull request #19539 from owncloud/fix-multiselect-overlap-shorter 
Fix filelist size issues, breadcrumb, multiselect
 2015-10-05 09:48:31 +02:00
Thomas Müller
09fe808d48 Merge pull request #19547 from owncloud/fix-16154 
LDAP Wizard: do not be picky about credentials when only looking for …
 2015-10-05 09:48:13 +02:00
Jenkins for ownCloud
bc593f7921 [tx-robot] updated from transifex 2015-10-05 01:54:55 -04:00
Jenkins for ownCloud
2ffb1c2135 [tx-robot] updated from transifex 2015-10-04 01:55:02 -04:00
Roeland Jago Douma
6bf6ff9564 If an inline files action provides an alt text show it 
* Added unit tests for icon display
* Added unit tests for icon alt text display
 2015-10-03 15:47:20 +02:00
Jenkins for ownCloud
e0084059b9 [tx-robot] updated from transifex 2015-10-03 01:56:20 -04:00
Arthur Schiwon
6d06d1c5a4 LDAP Wizard: do not be picky about credentials when only looking for the port 2015-10-03 00:35:24 +02:00
Thomas Müller
94013ffb82 Merge pull request #19534 from owncloud/fix_19532 
if the mountpoint is accessible for all user the array should contain 'all'
 2015-10-02 18:40:50 +02:00
Vincent Petry
f135128664 Fix filelist size issues, breadcrumb, multiselect 
- calculate multiselect header width to exclude scrollbar
- call FileList._onResize() when sidebar is toggled ("appresized"), this
  also updates the breadcrumb width
- moved global getScrollBarWidth() to OC.Util namespace
 2015-10-02 18:03:48 +02:00
Robin Appelman
943c5069d4 Lock files when rolling back version 2015-10-02 17:08:39 +02:00
Bjoern Schiessle
0ce28a574a if mountpoint is applicable to all users the old API expects a array with 'all' 2015-10-02 16:17:28 +02:00
Thomas Müller
54e19d7ca3 Merge pull request #19514 from owncloud/list_remote_shares_in_shared_with_you 
List remote shares in shared with you
 2015-10-02 14:48:12 +02:00
Thomas Müller
594a3e4e22 Merge pull request #19523 from owncloud/fix-seconds-ago 
Fix moment.js "a few seconds ago" with "seconds ago"
 2015-10-02 14:11:46 +02:00
Roeland Jago Douma
4adc78b78b Fix and extend unit tests 2015-10-02 12:45:52 +02:00
Roeland Jago Douma
40dd2d9dbe More fileinfo 2015-10-02 12:45:52 +02:00
Roeland Jago Douma
eeafccb3a6 Start to show remote shares in shared with you section 2015-10-02 12:45:47 +02:00
Thomas Müller
4fb2ef3bac Merge pull request #19497 from owncloud/ie8-multiselect-delete-action-puke 
[IE8] Fix dangling Delete action when multiselect is enabled
 2015-10-02 12:16:31 +02:00
Thomas Müller
2912d0e3e3 Merge pull request #19499 from owncloud/files-versions-properlyreloadafterrevert 
Reload versions list after revert
 2015-10-02 12:16:10 +02:00
Thomas Müller
f9093688cc Merge pull request #19500 from owncloud/fix_trash_with_encryption2 
[trashbin] fix broken versions on restore
 2015-10-02 12:15:58 +02:00