mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
17,977 Commits 349 Branches 696 Tags 1.6 GiB
Commit Graph

17977 Commits

Author SHA1 Message Date
Thomas Müller 4e2cdb2f8a Merge pull request #8713 from owncloud/typo-files-encr 
fix grammar
 2014-05-27 23:03:32 +02:00
Bart Visscher a51e9a5cfe Merge pull request #8136 from owncloud/contactsmanager-register 
Implement the register function of OC\ContactsManager
 2014-05-27 22:35:50 +02:00
blizzz 339554ae71 Merge pull request #8744 from owncloud/l10n-whoops-user-ldap 
forgotten infobox messages translations
 2014-05-27 21:00:32 +02:00
Volkan Gezer 8eee8e76d1 forgotten infobox messages translations 2014-05-27 16:39:22 +02:00
Volkan Gezer e70ed36d8e Merge pull request #8740 from owncloud/l10n-forgotten-tags 
reverts 188c543
 2014-05-27 14:47:21 +02:00
Vincent Petry a9661962fe Merge pull request #8736 from owncloud/appinfo-newrequirefields 
App info new fields "requiremin" and "requiremax"
 2014-05-27 14:28:47 +02:00
Volkan Gezer 1a22478446 reverts 188c543 and translates only mail 2014-05-27 12:58:46 +02:00
Vincent Petry d38f867055 Merge pull request #8721 from owncloud/sharing_don_lose_filesize 
don't lose file size during rename
 2014-05-27 12:25:55 +02:00
Vincent Petry 17276af6ad Merge pull request #8733 from owncloud/l10n-forgotten-tags 
unwrapped strings fix
 2014-05-27 11:55:33 +02:00
Vincent Petry c64e920b4d Adjust core apps to use "requiremin" instead of "require" 
Also added a few missing authors.
 2014-05-27 11:54:44 +02:00
Vincent Petry d43a7c5f6e Added requiremin/requiremax fields for apps 
Apps can now specify a minimum and maximum version of ownCloud in which
they are supported.
 2014-05-27 11:54:12 +02:00
Vincent Petry a79f3fd1c0 Merge pull request #8728 from owncloud/sharing_fix_reshare 
allow resharing of files with only share permissions
 2014-05-27 09:02:52 +02:00
Jenkins for ownCloud a756666585 [tx-robot] updated from transifex 2014-05-27 01:54:54 -04:00
Volkan Gezer 188c5435d8 unwrapped strings fix 2014-05-27 03:48:24 +02:00
Bjoern Schiessle 36f63ea990 allow resharing of files with only share permissions 2014-05-26 20:32:24 +02:00
Bjoern Schiessle 95bd7fee9c don't lose file size during rename 2014-05-26 14:11:33 +02:00
Vincent Petry a34491e288 Merge pull request #8687 from owncloud/recursive-remove-smb 
Make the recursive delete more robust
 2014-05-26 11:06:13 +02:00
Frank Karlitschek 48d0cebc42 Merge pull request #8674 from owncloud/watch-policy 
Add a config option for setting the filesystem watcher policy
 2014-05-26 10:48:44 +02:00
Jenkins for ownCloud 790c0e8e7c [tx-robot] updated from transifex 2014-05-26 01:55:36 -04:00
Volkan Gezer 59125cb796 fix grammar 2014-05-25 20:42:52 +02:00
Volkan Gezer 5fa67a4fb0 Merge pull request #8711 from owncloud/l10n-fully-translatable-ldap 
make user_ldap fully translatable
 2014-05-25 19:26:37 +02:00
Volkan Gezer f880734827 make user_ldap fully translatable 2014-05-25 14:41:59 +02:00
Thomas Müller 3348019bfa Merge pull request #8705 from wakeup/master 
fix typo
 2014-05-25 11:00:34 +02:00
Jenkins for ownCloud 3029029afd [tx-robot] updated from transifex 2014-05-25 01:54:35 -04:00
Volkan Gezer 426f492f57 fix typo 
Suggested by [mnestis](https://www.transifex.com/accounts/profile/mnestis/) on transifex
 2014-05-24 14:36:10 +02:00
Lukas Reschke 1b215b0131 Merge pull request #8688 from owncloud/public-image-positioning 
Show less whitespace above publicly shared images
 2014-05-24 12:49:12 +02:00
Jenkins for ownCloud 2afdd1bf1a [tx-robot] updated from transifex 2014-05-24 01:55:34 -04:00
Björn Schießle 864cd2455c Merge pull request #8699 from owncloud/sharing_improvements 
fix share label creation
 2014-05-23 20:53:32 +02:00
Jan-Christoph Borchardt d6a22acd67 Merge pull request #8690 from owncloud/design-noise 
remove noise texture from interface
 2014-05-23 18:13:02 +02:00
Bjoern Schiessle ff4bb3a9e6 fix share label creation 2014-05-23 16:21:15 +02:00
Jan-Christoph Borchardt 7be0ce6ada remove noise texture from interface (not necessary, and blurry on high-res) 2014-05-23 14:15:36 +02:00
Robin Appelman 10c1fc8d24 Show less whitespace above publicly shared images 2014-05-23 13:36:16 +02:00
Robin Appelman be8326668a Make the recursive delete more robust 2014-05-23 13:31:45 +02:00
Björn Schießle 71e1d919de Merge pull request #8675 from owncloud/sharing-improvements 
Sharing improvements
 2014-05-23 06:41:34 -04:00
Robin Appelman 151c48494e Add a config option fro setting the filesystem watcher policy 2014-05-23 12:20:31 +02:00
Vincent Petry 0b0e038b8b Merge pull request #8671 from owncloud/log-upload-errors 
php upload errors are written to log
 2014-05-23 11:33:14 +02:00
Bjoern Schiessle 3b279c9056 prevent default action when clicking on the share notification 2014-05-23 11:17:13 +02:00
Thomas Müller 6ffb139a46 Merge pull request #8658 from realriot/master 
Changed access mode for Dropbox to 'auto'
 2014-05-23 10:14:09 +02:00
Vincent Petry 9c9644e646 Merge pull request #8647 from owncloud/public-image-scaling 
Dont scale up the preview for publicly shared images
 2014-05-23 10:06:51 +02:00
Robin Appelman 157b139b57 Dont scale up the preview for publicly shared images 2014-05-22 16:45:51 +02:00
Bjoern Schiessle 11aa2cf74b always check for unique filename, if a file gets added from outside the mount 
point should be adjusted to ne unique again
 2014-05-22 14:31:22 +02:00
Bjoern Schiessle 1166d62d9b fileList needs be be declared before the if-statement 2014-05-22 14:31:16 +02:00
Björn Schießle 050df76830 Merge pull request #8599 from owncloud/sharing_disable_for_groups 
allow admin to disable sharing for specific groups of users
 2014-05-22 08:19:27 -04:00
Robin Appelman ff1f341d97 Fix phpdoc 2014-05-22 13:30:32 +02:00
Vincent Petry c4f6a80bdc Merge pull request #8163 from Xenopathic/files_external_priority 
Priority on external storage mounts
 2014-05-22 13:17:44 +02:00
Thomas Müller 201cc59fe0 php upload errors are written to log 2014-05-22 12:20:27 +02:00
Bjoern Schiessle 12338e0ef0 allow admin to disable sharing for specific groups of users 2014-05-22 10:43:44 +02:00
Remco Brenninkmeijer 4f0370f1da Fix for #8654 2014-05-22 10:35:01 +02:00
Thomas Müller 0249c6d8c7 Merge pull request #8634 from owncloud/handle-excpetions-in-console-master 
Handle excpetions in console master
 2014-05-22 10:30:33 +02:00
Vincent Petry 25ecd2bdda Merge pull request #8659 from owncloud/get-preference-multiple-user 
Add a method to get the values for multiple users to OC\Preferences
 2014-05-22 09:59:20 +02:00