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

14611 commits

This branch
This branch
All branches
Author SHA1 Message Date
Thomas Müller
30cf7fee11 Merge pull request #5492 from owncloud/admin-forcesslwrongid 
Fixed wrong id when reading checkbox value for force SSL setting
 2013-10-23 10:37:52 -07:00
Thomas Müller
e95ad29d90 Merge pull request #5435 from owncloud/share-improvements 
Share improvements
 2013-10-23 09:56:24 -07:00
Frank Karlitschek
c7621badf3 beta 1 2013-10-23 18:14:07 +02:00
Vincent Petry
88c2646f7e Fixed share dropdown checkbox wrapping 
The "show cruds" button is now embedded into the last label/checkbox
group and wraps with it.

Added ellipsis to prevent long names to exceed the dropdown's width.
 2013-10-23 17:58:27 +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
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
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
Thomas Müller
3c710696e8 add missing file header 2013-10-23 12:27:54 +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
Arthur Schiwon
d78a80a689 merge master with resolved conflicts 2013-10-23 12:01:45 +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
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
Thomas Müller
cea1f80c1a Merge pull request #5466 from owncloud/files-thumbnailloadingdelaystyle 
Fixed ugly white space while loading file thumbnail
 2013-10-22 14:20:48 -07:00
Thomas Müller
e6aa7a8643 Merge pull request #5467 from owncloud/fixing-5063-master 
display the original file name - this will change in case of renames
 2013-10-22 14:10:35 -07:00
Thomas Müller
d2fa0f5ff2 Merge pull request #5473 from owncloud/files-startviewerfunc 
Added FileList.setViewerMode to hide controls
 2013-10-22 14:02:49 -07:00
Thomas Müller
6eec8b2550 Merge pull request #5476 from owncloud/admin-showwarningwhenhomeexists 
Added warning notification when user home already exists
 2013-10-22 13:45:45 -07:00
Thomas Müller
09903aa36c - delete properties on node delete 
- move properties on node move
 2013-10-22 19:41:26 +02:00
Vincent Petry
83956b1703 Expand exception stack trace in log in debug mode 2013-10-22 19:17:41 +02:00
Vincent Petry
00f4928866 Added warning notification when user home already exists 
When creating a user and the home already exists in the data dir, a
warning notification will be displayed.

Fixes #5161
 2013-10-22 18:10:29 +02:00
Vincent Petry
263f8bebfe Added FileList.setViewerMode to hide controls 
Some files app embed themselves under the controls (like the text
editor). The new method FileList.setViewerMode() makes it possible to
properly show/hide the control buttons using the correct permissions.

Apps using this approach must call setViewerMode(true) when starting and
setViewerMode(false) upon closing to restore the controls.

This is needed for #5284
 2013-10-22 16:44:57 +02:00
Bjoern Schiessle
3d1d443529 remove debug output 2013-10-22 16:21:04 +02:00
Bjoern Schiessle
eb348b776c set the init status to "NOT_INITIALIZED" if the encryption app gets enabled 2013-10-22 16:15:24 +02:00
Bjoern Schiessle
bd450d6f6b add post_enable hook if a app gets enabled 2013-10-22 16:15:19 +02:00
Thomas Müller
e23433f771 display the original file name - this will change in case of renames 2013-10-22 14:02:44 +02:00
Vincent Petry
3bb7cf939e Fixed ugly white space while loading file thumbnail 
Preview images are now pre-loaded before being set on the file element.

This fixes #5135 and prevents a white space to be displayed while the
thumbnails is being loaded.
 2013-10-22 12:08:05 +02:00
Thomas Müller
cadd71ec8a Merge pull request #5455 from owncloud/fixing-2423-master 
introduce link_to_docs() and migrate links
 2013-10-22 01:28:43 -07:00
Thomas Müller
9d976013da Merge pull request #5437 from owncloud/create-custom-logfile 
Try to create custom log file before falling back to default.
 2013-10-22 01:17:31 -07:00
Vincent Petry
efd71c80f0 Merge pull request #5426 from owncloud/fix-3612 
Adds margin to the SSL root certificate button
 2013-10-22 01:16:20 -07:00
Thomas Müller
7f1432600c fixing php 5.3.3 error: 
Undefined variable: this
lib/private/appframework/dependencyinjection/dicontainer.php:92
 2013-10-22 09:29:17 +02:00
Thomas Müller
d86508e36d Merge branch 'master' into fixing-5222-master 2013-10-22 09:23:23 +02:00
Arthur Schiwon
76a195a0be LDAP Wizard: l10n improvements 2013-10-21 23:15:21 +02:00