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

17466 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andreas Fischer
63cdf78390 Merge pull request #8355 from owncloud/l10n-expire 
typo fix, by translators on transifex

* owncloud/l10n-expire:
  typo fix, by translators on transifex
 2014-04-26 01:21:31 +02:00
icewind1991
282ea27ab9 Merge pull request #8356 from owncloud/fix-external-css 
fix layout of external storage config table
 2014-04-26 00:06:06 +02:00
Morris Jobke
ace0293bd1 fix layout of external storage config table 2014-04-25 16:34:48 +02:00
Volkan Gezer
ad1265da13 typo fix, by translators on transifex 2014-04-25 16:26:30 +02:00
icewind1991
7599fa94ce Merge pull request #8350 from owncloud/share-search-mime 
fix search by mime for shared single files
 2014-04-25 15:54:36 +02:00
icewind1991
5194f014c9 Merge pull request #7504 from owncloud/webdav-injection 
Proper injection of filesystem view into the webdav connector
 2014-04-25 14:42:43 +02:00
Robin Appelman
194ea66cb5 Merge branch 'master' into share-search-mime 2014-04-25 14:04:41 +02:00
Robin Appelman
b42418246f Also fixed the returned internal path when getting the root shared item by id 2014-04-25 14:04:22 +02:00
icewind1991
6925e722fa Merge pull request #8351 from owncloud/search-mime-substorage 
fix paths of searchByMime results on substorages
 2014-04-25 14:03:43 +02:00
Robin Appelman
672a8248ce Correct the path returned by getFolderContent for substorages 2014-04-25 13:56:45 +02:00
Jan-Christoph Borchardt
b41fc7cb7a Merge pull request #8352 from owncloud/icons 
Icon improvements
 2014-04-25 13:18:55 +02:00
Morris Jobke
99c2c6b1c6 remove metadata 2014-04-25 13:15:58 +02:00
Jan-Christoph Borchardt
93d2ff73f1 use trash as delete icon to differentiate from close 2014-04-25 12:40:14 +02:00
Robin Appelman
456ca0cf7d fix paths of searchByMime results on substorages 2014-04-25 12:31:44 +02:00
Robin Appelman
c53c4b9791 fix search by mime for shared single files 2014-04-25 12:28:10 +02:00
Robin Appelman
4109521cce remove outdated test 2014-04-25 12:24:18 +02:00
Jan-Christoph Borchardt
ad9ff07569 compress view-close icon 2014-04-25 12:16:17 +02:00
Robin Appelman
6c20a014ea merge master into webdav-injection 2014-04-25 11:47:06 +02:00
Jenkins for ownCloud
3fc809dfd8 [tx-robot] updated from transifex 2014-04-25 01:56:28 -04:00
Andreas Fischer
5eafdf156c Merge pull request #8338 from owncloud/phpunit-4.0-compat 
Make PHPUnit_Framework_TestListener implementations compatible to 4.0.

* owncloud/phpunit-4.0-compat:
  Normalise testcleanuplistener.php indentation and end of file.
  Make PHPUnit_Framework_TestListener implementations compatible to 4.0.
 2014-04-24 22:00:12 +02:00
Lukas Reschke
1cafd1e3b9 Merge pull request #8337 from owncloud/flv-to-mimes 
Add flv to known mimetypes
 2014-04-24 19:09:01 +02:00
Björn Schießle
f520305848 Merge pull request #8026 from owncloud/remove_shared_folder 
remove the "Shared" folder
 2014-04-24 18:45:45 +02:00
Victor Dubiniuk
fc4be3d0ad Add flv to known mimetypes 2014-04-24 19:09:31 +03:00
Thomas Müller
40257d9736 Merge pull request #8339 from owncloud/fix_unit_tests 
fixing unit tests
 2014-04-24 17:28:07 +02:00
Andreas Fischer
916b265cd5 Normalise testcleanuplistener.php indentation and end of file. 2014-04-24 16:42:28 +02:00
Bjoern Schiessle
35321c7d41 add additional rows to the select statement, 'stime' is needed for the expire check 2014-04-24 15:18:25 +02:00
Andreas Fischer
e85fe01faf Make PHPUnit_Framework_TestListener implementations compatible to 4.0. 2014-04-24 15:16:57 +02:00
Andreas Fischer
f9091a8584 Merge pull request #8304 from owncloud/add-xss-tests 
Add unit tests for arrays and quotationmark

* owncloud/add-xss-tests:
  Remove uneeded newline
  Fix indentation
  Add unit tests for arrays and "
 2014-04-24 15:09:36 +02:00
Andreas Fischer
522d101607 Merge pull request #8335 from owncloud/sharing_set_default_expire_date 
[sharing] allow admin to set default expire date

* owncloud/sharing_set_default_expire_date:
  add setting to set default expire date
 2014-04-24 14:03:41 +02:00
Bjoern Schiessle
6650be9913 add setting to set default expire date 2014-04-24 13:34:31 +02:00
Robin Appelman
cd0c5990f8 properly quote etags 2014-04-24 11:12:39 +02:00
Robin Appelman
49b44e7e22 Normalize paths when moving properties 2014-04-24 11:12:39 +02:00
Thomas Müller
8127e984bd Merge pull request #8332 from owncloud/l10n-access-untrusted 
This adds one more missing untranslated text from lib/share
 2014-04-24 10:06:37 +02:00
Thomas Müller
087e73cbfc Merge pull request #8334 from owncloud/protect-co 
Preventing access to the config folder
 2014-04-24 09:25:32 +02:00
Lukas Reschke
c92a138489 Preventing access to the config folder 
It isn't uncommon that admins create a backup file of the config (i.e. `config.php.bak`) before performing any changes. This would allow everybody to read the backup of the configuration file which contain several secret and critical values.

I don't believe this is worth a backport or getting added to the installer. It's just a nice to have. People that create public readable backups of their configuration are the one to blame, not us :-)
 2014-04-24 08:33:58 +02:00
Jenkins for ownCloud
435672feaa [tx-robot] updated from transifex 2014-04-24 01:55:33 -04:00
Volkan Gezer
ff0dab6e92 This adds one more missing untranslated text from lib/share 
Also displays the untrusted domain warning in English
 2014-04-24 01:42:18 +02:00
blizzz
645ecb7644 Merge pull request #6297 from leo-b/fix_ldap_errors 
only check ldap_errno if an ldap_* function actually fails
 2014-04-23 16:26:43 +02:00
Thomas Müller
3aee23ee2b Merge pull request #8233 from owncloud/fix-newdialog-ie 
fix shift of icons in 'New' menu in IE8/9, fix #7987
 2014-04-23 16:17:24 +02:00
Thomas Müller
e68aaf1f5b Merge pull request #8284 from owncloud/fix_8280 
Adjust renaming of directories with a dot in name
 2014-04-23 16:06:50 +02:00
Robin McCorkell
c2f7848aeb Adjust renaming of directories, fixes #8280 
Directories will not be considered to have an extension, even if a dot is
found.

Stop Scrutinizer being annoyed

But the spaced version looked good!

Stop jsHint being annoyed

These code quality tools are really pestering
 2014-04-23 16:04:01 +02:00
Thomas Müller
4ba6f4839d fixing typos and PHPDoc 2014-04-23 15:36:01 +02:00
Robin Appelman
e77d89fc4b Revert changes to OC_Connector_Sabre_Server 2014-04-23 14:21:09 +02:00
icewind1991
c8801a41d8 Merge pull request #8324 from owncloud/expired-link-error 
Fix error when viewing expired link
 2014-04-23 14:13:44 +02:00
Bjoern Schiessle
b312d38d38 remove hard-coded shared folder 2014-04-23 12:59:22 +02:00
Bjoern Schiessle
7ef8f6d352 always allow to rename the share mount point 2014-04-23 12:54:26 +02:00
Bjoern Schiessle
b102222fed split-up the update script and add unit tests for it 2014-04-23 12:54:26 +02:00
Bjoern Schiessle
93469ca468 make it possible to move files out of a shared mount point 2014-04-23 12:54:26 +02:00
Thomas Müller
dd1e47b3b8 typos, use, unused and return fixed 2014-04-23 12:54:26 +02:00
Robin Appelman
2049bedcaf Dont throw an error when a storage isn't found for shared cache 2014-04-23 12:54:26 +02:00