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

14745 commits

This branch
This branch
All branches
Author SHA1 Message Date
Thomas Müller
1909288fcb Merge branch 'master' into fix-sharing-code 2013-10-23 17:16:16 +02:00
Jörn Friedrich Dreyer
4991a7bd06 fix translations 2013-10-23 17:02:41 +02:00
Jan-Christoph Borchardt
a2e9c0f81a better wording for share input field and share link 2013-10-23 17:57:06 +03:00
Thomas Müller
3d5e229ac5 Merge pull request #5442 from owncloud/extstorage-ignoreduplicateinserts 
Ignore duplicate inserts in file cache and mime type
 2013-10-23 07:47:50 -07:00
Vincent Petry
9aa164f381 Renamed current placeholder jquery plugin to imageplaceholder 
This is to prevent conflicts with jquery libs that handle text
placeholders in IE8
 2013-10-23 16:47:25 +02:00
Jörn Friedrich Dreyer
0bf034da96 prefer logo png from theme over svg from core 
The logo images are specified in the php templates with eg `image_path('', 'logo-wide.svg')`. If that file exists the correct path will be served to the client in the html template. Then the `SVGSupport()` is checked in https://github.com/owncloud/core/blob/master/core/js/js.js#L701 which will replace `svg` with `png` in img tags and css background definitions.

fixes #5074
partially solves #5421, but not when an svg has been specified in css and is then 'fixed' by js to point to a png which does not exist in the theme but is then might be resolved to an image from core .... well theoretical problem ... might not even be a problem

@karlitschek @jancborchardt please review
 2013-10-23 16:44:56 +02:00
Thomas Müller
b02a485712 handle case where fileid is not set 2013-10-23 16:40:29 +02:00
Bjoern Schiessle
2221aa9ca4 run first getUsersItemShared() with the owner 2013-10-23 16:34:26 +02:00
Bjoern Schiessle
60e219da43 update etags for user we haven't checked yet 2013-10-23 16:34:03 +02:00
Bjoern Schiessle
6ae761d946 keep a list of users we already checked to avoid loops 2013-10-23 16:33:44 +02:00
Bjoern Schiessle
dd972f65a8 fix infinite loop while updating etags, fix for #4365 2013-10-23 16:33:28 +02:00
Bjoern Schiessle
efdbcbddef Merge branch 'master' of github.com:owncloud/core 2013-10-23 16:29:17 +02:00
Markus Goetz
af58360434 files_encryption: Fix getFileSize() 
For certain file sizes, we rounded to the wrong chunk number
and the returned bogus results. This should fix
https://github.com/owncloud/mirall/issues/1009

Conflicts:
	apps/files_encryption/tests/util.php
 2013-10-23 16:28:43 +02:00
Vincent Petry
9656280252 Added left padding to notCreatable message 2013-10-23 16:20:53 +02:00
Thomas Müller
8c69a5388e Merge pull request #5478 from owncloud/core-logexceptionstacktrace 
Expand exception stack trace in log in debug mode
 2013-10-23 07:19:14 -07:00
Thomas Müller
b60ae11db8 introducing new dav property {xmlns:oc="http://owncloud.org/ns}id 2013-10-23 16:03:57 +02:00
Andreas Fischer
8166aaf82c Some tests for OC_L10N::findLanguage() 2013-10-23 15:41:15 +02:00
Andreas Fischer
06f2ae082e Have to also strtolower() on available language name. Otherwise no match. 2013-10-23 15:39:50 +02:00
Andreas Fischer
daf93c4516 Sort, so 'de' is preferred over 'de_DE' when performing non-exact matching. 2013-10-23 15:38:54 +02:00
Andreas Fischer
c14b470ea2 Apply substring on the correct value. 2013-10-23 15:38:22 +02:00
Vincent Petry
5aeafab9ab Fixed wrong id when reading checkbox value for force SSL setting 
Fixes #5488
 2013-10-23 15:21:18 +02:00
VicDeo
959b0f9125 Merge pull request #5458 from owncloud/fixing-5222-master 
php 5.3 compatibility regarding OC\DB\Connection fixed
 2013-10-23 05:35:33 -07:00
Johannes Twittmann
76f831979b Update CONTRIBUTING.md 
Gave more info on how to search issues.
 2013-10-23 14:21:28 +02:00
blizzz
32e02c24a2 Merge pull request #5404 from owncloud/ldap_settings_wizard 
Ldap settings wizard
 2013-10-23 05:12:47 -07:00
Vincent Petry
c4dee281e6 Added $app parameter to logException 2013-10-23 13:58:42 +02:00
Vincent Petry
a542c57a7b Catch duplicate insertion errors while scanning files 
When two scanning processed run at the same time, for example when
scan.php and list.php were called at the same time on an external
storage mountpoint, duplicate insertion errors can occurs.

These errors are now logged and ignored.

Since both scans are running in parallel transactions, they don't see
each other's changes directly in the DB which can cause duplicate
insertion errors for mime types as well, but those mime types can't be
selected yet. The solution to this is to force-reload the mimetypes list
after the transaction is finished.

Fixes #5199
 2013-10-23 13:00:46 +02:00
Andreas Fischer
4c76dd3871 Better variable names. 2013-10-23 12:56:51 +02:00
Andreas Fischer
207f6d55ce Fix coding style for else. 2013-10-23 12:39:12 +02:00
Thomas Müller
3c710696e8 add missing file header 2013-10-23 12:27:54 +02:00
Andreas Fischer
9d1b425b62 Correct indentation for default language. 2013-10-23 12:25:48 +02:00
Arthur Schiwon
30c0f5dee6 LDAP Wizard: proper strings and translations for user and group count text 2013-10-23 12:20:13 +02:00
Jörn Friedrich Dreyer
3121dc8cb5 Merge branch 'master' into prevent_user_from_creating_or_renaming_to_an_existing_filename 
Conflicts:
	apps/files/js/filelist.js
 2013-10-23 12:02:06 +02:00
Arthur Schiwon
d78a80a689 merge master with resolved conflicts 2013-10-23 12:01:45 +02:00
Jörn Friedrich Dreyer
8ed73e5ced use a more descriptive error message when the user tries to create '/Shared' 2013-10-23 11:08:30 +02:00
Jörn Friedrich Dreyer
a9735c8a6f cleanup array value assignment 2013-10-23 11:01:05 +02:00
Jörn Friedrich Dreyer
c478a792fb add missing ; 2013-10-23 10:59:01 +02:00
Jörn Friedrich Dreyer
af7ec3169b cleanup precondition checking when creating new files / folders 
- use i18n
- use trim when checking for empty file / folder name
- use more verbose error descriptions
 2013-10-23 10:59:01 +02:00
Jörn Friedrich Dreyer
bc0faa1c4e use correct filename in error result json 2013-10-23 10:59:01 +02:00
Jörn Friedrich Dreyer
20716a153a fix message dialog titles in IE8 2013-10-23 10:58:25 +02:00
Vincent Petry
42c58220de Moved logException to OCP\Util class 2013-10-23 10:48:27 +02:00
Björn Schießle
2d14daf36b Merge pull request #5472 from owncloud/enc_init_status_on_enable 
Encryption set init status on enable
 2013-10-23 01:02:45 -07:00
Thomas Müller
4bf37f72b2 Merge pull request #5482 from owncloud/fix_weird_http_namespace 
Fix namespace for OCP\Appframework\Http
 2013-10-23 00:40:30 -07:00
Christian Berendt
128d3221cc make Swift::testLocal workable by using a delimiter 2013-10-23 08:07:59 +02:00
Christian Berendt
a1e956263c Revert "make Swift::testLocal workable by fixing the prefix used with the object listing in opendir" 
This reverts commit b92061da5a.
 2013-10-23 08:01:32 +02:00
Christian Berendt
b92061da5a make Swift::testLocal workable by fixing the prefix used with the object listing in opendir 2013-10-23 07:57:41 +02:00
Thomas Müller
cf61b1a977 Merge pull request #5391 from owncloud/undefined-property-in-schema-master 
removing pointless calls on quoteIdentifier() - reason: name on $tableDi...
 2013-10-22 22:46:43 -07:00
Thomas Tanghus
ad017285e1 Fix namespace for OCP\Appframework\Http 
To avoid having to use OCP\Appframework\Http\Http in the public - and stable
- API OCP\Appframework\Http is now both a class and a namespace.
 2013-10-23 05:57:34 +02:00
Thomas Müller
064fd5ae53 Merge pull request #5451 from owncloud/reuse-session-ocs-master 
Support existing sessions within OCS API calls
 2013-10-22 14:41:21 -07:00
Christopher Schäpers
70c0d7d6bc Merge pull request #5310 from owncloud/hide_filestable-header_when_empty 
Hide files list header, when theres no files to see
 2013-10-22 14:39:14 -07:00
Thomas Müller
70b02f0513 Merge pull request #5479 from owncloud/fixing-4502-master 
Fix webdav to fullfil litmus test suite
 2013-10-22 14:25:49 -07:00