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

18235 Commits

Author SHA1 Message Date
ringmaster 3d1ba574e4 Change visibility of scanner internals 
so that descendant classes can access them.
 2014-05-28 07:59:38 -04:00
Thomas Müller ed8e0f0a92 updating unit test expectations 2014-05-28 13:47:27 +02:00
Joas Schilling dc83b17f49 Fix double "saved" message when changing email settings 2014-05-28 11:50:55 +02:00
Vincent Petry 7e055a9404 Fixed DOM elements, styling and code style issues 
- Reduced number of DOM elements
- Also added mention of "config" backup.
 2014-05-28 11:29:22 +02:00
Vincent Petry 09645b9221 Merge pull request #8755 from owncloud/fix-8737-master 
remove legacy OC_Filesystem being used in a hook callback
 2014-05-28 10:57:54 +02:00
Volkan Gezer de1f7c9600 Merge pull request #8750 from owncloud/l10n-add-title-property 
add title property to share dialog will close #8638
 2014-05-28 10:52:00 +02:00
Jan-Christoph Borchardt 3d701ca3ca Merge pull request #8732 from owncloud/fix-warning-text 
fix warning text and margin. fixes #8715
 2014-05-28 10:43:28 +02:00
Jenkins for ownCloud 80641cae72 [tx-robot] updated from transifex 2014-05-28 01:56:09 -04:00
Bernhard Posselt 5e9ea2b365 fix 8757, get rid of service locator antipattern 2014-05-28 02:15:16 +02:00
Thomas Müller f03a3d9d05 remove legacy OC_Filesystem being used in a hook callback 2014-05-28 00:13:54 +02:00
Volkan Gezer c100da33bb upgraded phpmailer into v5.2.8 via composer 2014-05-27 23:33:18 +02:00
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
Volkan Gezer 9c5fdc5005 add title property to share dialog 2014-05-27 22:09:55 +02:00
ringmaster 26d169b27c Use 'filesystem_check_enable' as a config option. 2014-05-27 16:01:16 -04:00
ringmaster 3b287f8274 Allow the default behavior to come from the config. 2014-05-27 15:21:35 -04:00
ringmaster fdf26c5a3f Rename variable to something more appropriate. 2014-05-27 15:12:56 -04:00
ringmaster 645e7035a4 Allow apps to control via a hook to skip adding/removing a file during filescan 2014-05-27 15:12:54 -04: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
scolebrook 7151369e5f Add ability to enable/disable maintenance mode from cli. 2014-05-27 13:03:53 -04:00
Volkan Gezer 8eee8e76d1 forgotten infobox messages translations 2014-05-27 16:39:22 +02:00
Vincent Petry ca45937d84 Fixed styles in update overview page 2014-05-27 16:36:21 +02:00
Vincent Petry 02f682b156 Now showing disabled apps as upgrade status line 
- Added app id in update overview.
- Added status message for disabled app for CLI upgrade and web upgrade
 2014-05-27 15:20:33 +02:00
Vincent Petry 146583a98d Added update overview page 2014-05-27 14:53:08 +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
Volkan Gezer 46555b50a1 fix warning text and margin 2014-05-27 12:29:08 +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
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