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

18086 Commits

Author SHA1 Message Date
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
Arthur Schiwon 3a21c3e2f4 Merge branch 'logintimestamp' of git://github.com/owncloud/core into logintimestamp 2014-05-26 13:56:40 +02:00
Arthur Schiwon 4a4ea67a31 drop superflous statement in phpdoc 2014-05-26 13:56:08 +02:00
Arthur Schiwon 748a219243 add preRememberedLogin hook and document this and postRememberedLogin in class descripttion. Also fixes documentation of postLogin hook 2014-05-26 13:53:26 +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
Lukas Reschke c03e7fcfa9 Clarify comment 2014-05-24 10:24:42 +02:00
kondou f216d81408 Use userManager, color output, return 1 on error 2014-05-24 09:49:02 +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
Arthur Schiwon 7f7999c7d8 print time in 24h format 2014-05-23 19:12:51 +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
Jan-Christoph Borchardt c6c4bb62e1 move saved notification for mail server, so it's smaller 2014-05-23 18:09:45 +02:00
Jan-Christoph Borchardt b1ccfcde9e fix border-radius in settings to 3px 2014-05-23 18:07:25 +02:00
Jan-Christoph Borchardt 0977911c82 fix height of select boxes for OS X 2014-05-23 18:03:01 +02:00
Jan-Christoph Borchardt 574e4f0579 use user-select: none; on header, navigation and user menu 2014-05-23 17:57:29 +02:00
Jan-Christoph Borchardt 5bf13783e2 darken scrollbar to distinguish from selected sidebar items 2014-05-23 17:43:20 +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
Arthur Schiwon 2e85d5a852 increase scrutinizer happyiness by removing minor/informational issues 2014-05-23 11:20:46 +02:00
Bjoern Schiessle 3b279c9056 prevent default action when clicking on the share notification 2014-05-23 11:17:13 +02:00
Arthur Schiwon e9fa74bfb7 save a whitespace 2014-05-23 10:55:54 +02:00
Arthur Schiwon 09bb8e0e3a add cli command to check a users last login 2014-05-23 10:37:34 +02:00
Arthur Schiwon 86880acee9 clean up here is superflous, will already be removed by user session 2014-05-23 10:16:18 +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
Arthur Schiwon 60274d1729 test hooks also on login 2014-05-23 00:59:26 +02:00
Arthur Schiwon bf1f5f2af3 also test whether hooks work 2014-05-23 00:54:17 +02:00
Arthur Schiwon c46fada6b3 unit tests for loginWithCookie() 2014-05-23 00:18:07 +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