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

20695 commits

This branch
This branch
All branches
Author SHA1 Message Date
Thomas Müller
21412559df remove post setup check 2014-09-22 19:43:55 +02:00
Clark Tomlinson
7b6aa3cd3d fixing cache routes 2014-09-22 13:38:46 -04:00
Jan-Christoph Borchardt
1583ae1ed6 force show the loading icon in list for deletion, not only on hover 2014-09-22 18:24:52 +02:00
Jan-Christoph Borchardt
2ac953e6a8 correct progress-icon to icon-loading-small 2014-09-22 18:24:32 +02:00
Jan-Christoph Borchardt
91d9d45c6c correct delete-icon to icon-delete, fix #11128 2014-09-22 18:17:33 +02:00
Bjoern Schiessle
9105e17307 unit tests for grouping of shares pointing to the same source 2014-09-22 17:54:47 +02:00
Morris Jobke
3c5ac21122 Merge pull request #11228 from owncloud/drop-travis 
Revert "Travis support"
 2014-09-22 17:27:54 +02:00
Bjoern Schiessle
89c3b650e6 group shares and combine permissions 2014-09-22 17:25:15 +02:00
Lukas Reschke
cede9fd7ef Remove unneeded unit tests 2014-09-22 16:50:08 +02:00
Vincent Petry
828ae65681 Merge pull request #11186 from owncloud/trash-fixdoubledeleteracecondition 
Added extra check to avoid deleting key folders
 2014-09-22 16:36:23 +02:00
Morris Jobke
55b4c0ac07 Revert "Travis support" 
This reverts commit 472d896ce9.

Conflicts:
	.travis.yml
 2014-09-22 16:34:50 +02:00
Morris Jobke
70937dabcd Merge pull request #11167 from owncloud/env-movetomountreenableproxy 
Reenable file proxy when renaming between mount points
 2014-09-22 16:30:19 +02:00
Morris Jobke
9e8d2907e2 Merge pull request #11204 from owncloud/fix_oc_stream_seek 
Fix oc stream seek
 2014-09-22 16:25:07 +02:00
Morris Jobke
da20d71174 Merge pull request #11212 from owncloud/occ-catching-errors 
Occ catching errors
 2014-09-22 16:23:27 +02:00
Clark Tomlinson
db72270acc fixing directory seperators 2014-09-22 10:13:46 -04:00
Lukas Reschke
ca3447fcde Add a configuration switch for enabled preview mimetypes 2014-09-22 16:09:08 +02:00
Bjoern Schiessle
744110905b first check if a private key exists, if not it is always a recovery szenario 2014-09-22 15:05:03 +02:00
Thomas Müller
814114ab8e enhance formatDate function to accept an optional argument containing the time zone 2014-09-22 15:03:28 +02:00
Thomas Müller
f4eae03f20 date printed in the admin section regarding last execution time is already displayed in the users timezone - no need to append UTC 2014-09-22 14:06:51 +02:00
Morris Jobke
831d34f084 Merge pull request #11210 from owncloud/issue/11209 
Also match routes without trailing slash for files app
 2014-09-22 14:04:20 +02:00
Thomas Müller
bb18fe1384 send browsers timezone back tp the server on login 2014-09-22 14:01:45 +02:00
Vincent Petry
470c25eff4 WebDAV now throws 403 when deletion did not work 
Assume a permission issue whenever a file could not be deleted.

This is because some storages are not able to return permissions, so a
permission denied situation can only be triggered during direct
deletion.
 2014-09-22 13:15:17 +02:00
Morris Jobke
b0e0d0d2d2 update 3rdparty submodule to its master commit 2014-09-22 13:03:43 +02:00
Robin McCorkell
f757611687 Fix autotest.sh for whitespace in paths 2014-09-22 12:03:25 +01:00
blizzz
b8a1340538 Merge pull request #9225 from voxsim/fix_displayNamesInGroup 
fix in displayNamesInGroup
 2014-09-22 12:13:15 +02:00
Thomas Müller
a348a6f450 no loner use deprecated class \OC_Config 2014-09-22 12:04:48 +02:00
Thomas Müller
e655d32979 remove bootstrapping - occ can by definition only be executed if ownCloud is installed - base.php is required earlier already 2014-09-22 12:00:22 +02:00
Thomas Müller
43c191fffb show upgrade errors as error in the console and report back that the upgrade process failed if it did 2014-09-22 11:59:13 +02:00
Jörn Friedrich Dreyer
f83689e1be in quota wrapper use === instead of ! for better readability and as in other wrappers 2014-09-22 11:35:42 +02:00
Jörn Friedrich Dreyer
561a7e47cd return boolean in Ciose::stream_seek 2014-09-22 11:33:55 +02:00
Joas Schilling
71bec60b92 Also match routes without trailing slash 
Fix #11209
 2014-09-22 11:22:33 +02:00
Jörn Friedrich Dreyer
b752cb98d8 return boolean in OC::stream_seek 2014-09-22 11:20:15 +02:00
Thomas Müller
b1d0a0f3bf Merge pull request #10939 from owncloud/add-port-to-trusted-domain-wizard 
Append port to trusted domain in case it's not 80 or 443
 2014-09-22 10:04:02 +02:00
Thomas Müller
8abf786af9 Merge pull request #10499 from owncloud/mkcol-headers-afterbind 
Use afterBind to send fileId header for files and directories
 2014-09-22 10:02:03 +02:00
Volkan Gezer
d16b8c03e9 fix button text l10n 2014-09-22 09:32:03 +02:00
Jenkins for ownCloud
5aaf8dcc01 [tx-robot] updated from transifex 2014-09-22 01:54:36 -04:00
Morris Jobke
567977ec63 Merge pull request #11203 from owncloud/fix_broken_previews_on_public_page 
files_sharing: add route for ajax/publicpreview
 2014-09-21 23:07:17 +02:00
Morris Jobke
154e848ce2 Merge pull request #11199 from owncloud/delete_bogus_previews 
Delete bogus cached previews while updating
 2014-09-21 22:48:21 +02:00
Jörn Friedrich Dreyer
ef6db5e9d7 add seek and tell to streamwrapper test 2014-09-21 22:47:40 +02:00
Morris Jobke
b622fa502e Merge pull request #11200 from owncloud/preview_better_errorhandling 
make sure preview prop is instanceof OC_Image before using it in showPreview
 2014-09-21 22:44:07 +02:00
Georg Ehrke
9fd23d2edf files_sharing: add route for ajax/publicpreview 2014-09-21 18:21:42 +02:00
Georg Ehrke
071e4bfc06 make sure preview prop is instanceof OC_Image before using it in showPreview 2014-09-21 17:30:29 +02:00
Georg Ehrke
ab2554e013 delete old previews 2014-09-21 17:16:21 +02:00
Morris Jobke
69726d951e Merge pull request #11196 from owncloud/sqlite-migration-smallint-master 
adding 'smallint unsigned' to type mapping for sqlite
 2014-09-21 11:13:58 +02:00
Jenkins for ownCloud
a1c39f74b7 [tx-robot] updated from transifex 2014-09-21 01:54:29 -04:00
Thomas Müller
7537d405e3 adding 'smallint unsigned' to type mapping for sqlite 2014-09-20 20:06:44 +02:00
Jenkins for ownCloud
e55c4bb807 [tx-robot] updated from transifex 2014-09-20 01:54:34 -04:00
Morris Jobke
463dd44d6d Merge pull request #11178 from owncloud/throw-error-on-preview-instead-in-the-contructor 
Throw error in showPreview instead the constructor
 2014-09-19 21:39:30 +02:00
Morris Jobke
bdcf858eb8 Merge pull request #11184 from owncloud/typo 
fix typo. closes #11132
 2014-09-19 21:39:03 +02:00
Vincent Petry
8aca127e52 Added extra check to avoid deleting key folders 
Whenever a delete operation is called twice in a row, it could happen
that the first call already deleted the file.

The second call would return an empty $ownerPath because the file does
not exist. That empty $ownerPath would run the key deletion operation on
the wrong path.

This fix adds checks in many places to make sure we don't use $ownerPath
when it's empty or null.
 2014-09-19 19:01:02 +02:00