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

18039 commits

This branch
This branch
All branches
Author SHA1 Message Date
Volkan Gezer
c01f196f72 make reshare settings foldable 2014-05-29 21:14:20 +02:00
Robin McCorkell
32a50563d3 Merge pull request #8771 from owncloud/enc_get_mount_from_mountmanager 
get mount point from mount manager
 2014-05-29 17:52:28 +01:00
Bernhard Posselt
b8059fbc86 Merge pull request #8780 from owncloud/remove-deprecated-functions 
Remove deprecated functions
 2014-05-29 18:45:43 +02:00
Lukas Reschke
c8b32f4309 Remove deprecated functions 
This functions have been deprecated since Oct 2012 (ownCloud 5), let's finally remove them for ownCloud 7.

Ref c4b8bb1041
 2014-05-29 17:01:30 +02:00
Andreas Fischer
9fba8221a6 Merge pull request #8554 from owncloud/add_resetadminpass_command 
Add a resetadminpass command to console

* owncloud/add_resetadminpass_command:
  Move resetpassword into user: command space.
  Document type of user project.
  Receive \OC\User\Manager as a constructor dependency.
  Use userManager, color output, return 1 on error
  Add doc, check return-value, fix spacing, require interactive
  Back to the future
  Make ResetAdminPass to ResetPassword
  Add a resetadminpass command to console - fix #8248
 2014-05-29 14:43:27 +02:00
icewind1991
c0f02be50a Merge pull request #3908 from owncloud/storage-folder-copy-rename 
Recursive copy and remove for local storage backends
 2014-05-29 13:29:24 +02:00
Jenkins for ownCloud
368006c7af [tx-robot] updated from transifex 2014-05-29 01:54:40 -04:00
Andreas Fischer
678a6b98ff Merge pull request #8748 from owncloud/cli_maintenance_mode 
Add ability to enable/disable maintenance mode from cli.

* owncloud/cli_maintenance_mode:
  Use OC\Config instead of OC_Config
  Changed class name to mode
  Add ability to enable/disable maintenance mode from cli.
 2014-05-29 03:45:49 +02:00
Thomas Müller
3ef9570d02 Merge pull request #8547 from owncloud/path-length-master 
Handling long paths properly in \OC\Files\View
 2014-05-29 00:08:29 +02:00
Andreas Fischer
5754b0b9e7 Merge remote-tracking branch 'owncloud/master' into add_resetadminpass_command 
* owncloud/master: (238 commits)
  Change visibility of scanner internals
  [tx-robot] updated from transifex
  remove legacy OC_Filesystem being used in a hook callback
  add title property to share dialog
  forgotten infobox messages translations
  reverts 188c543 and translates only mail
  fix warning text and margin
  Adjust core apps to use "requiremin" instead of "require"
  Added requiremin/requiremax fields for apps
  [tx-robot] updated from transifex
  unwrapped strings fix
  allow resharing of files with only share permissions
  don't lose file size during rename
  drop superflous statement in phpdoc
  add preRememberedLogin hook and document this and postRememberedLogin in class descripttion. Also fixes documentation of postLogin hook
  [tx-robot] updated from transifex
  fix grammar
  make user_ldap fully translatable
  [tx-robot] updated from transifex
  fix typo
  ...

Conflicts:
	core/register_command.php
 2014-05-28 22:57:33 +02:00
Andreas Fischer
f81ee94cad Move resetpassword into user: command space. 2014-05-28 22:53:44 +02:00
Andreas Fischer
8981929e92 Document type of user project. 2014-05-28 22:48:35 +02:00
Lukas Reschke
1af293dc13 Merge pull request #8754 from owncloud/3rdparty-upgraded-phpmailer 
upgraded phpmailer into v5.2.8 via composer
 2014-05-28 22:42:45 +02:00
Andreas Fischer
52e7bf9630 Receive \OC\User\Manager as a constructor dependency. 2014-05-28 22:42:33 +02:00
scolebrook
43759f1f46 Use OC\Config instead of OC_Config 2014-05-28 16:26:13 -04:00
Lukas Reschke
ce9d5df6df Merge pull request #8681 from owncloud/logintimestamp 
Record login timestamp per user. Required for new user managament.
 2014-05-28 19:06:47 +02:00
Robin Appelman
467e9c2bb0 Remove code duplication 2014-05-28 18:16:24 +02:00
Robin Appelman
af35b6ad9d Fix LocalStorage->unlink to work on folder as expected 2014-05-28 18:16:24 +02:00
Robin Appelman
8187164fe1 re-use rescursive copy from common storage 2014-05-28 18:16:24 +02:00
Robin Appelman
488fc402e4 remove unneeded check 2014-05-28 18:16:23 +02:00
Robin Appelman
d15ed9b4d3 use \OC\Files\Filesystem::isIgnoredDir 2014-05-28 18:16:23 +02:00
Robin Appelman
1302602173 fix illegal usage of unlink in test case 2014-05-28 18:16:23 +02:00
Robin Appelman
ea44f0e20f fix recursive copy and rename for common storage backend 2014-05-28 18:16:23 +02:00
Robin Appelman
c3c9612c99 fix recursive copy and rename for mapped local storage backend 2014-05-28 18:16:23 +02:00
Robin Appelman
03ba497a8c add recursive copy to local storage backend 2014-05-28 18:16:23 +02:00
Robin Appelman
38c1da0976 fix recursive rename for local storage backend 2014-05-28 18:16:23 +02:00
Robin Appelman
e83b41493f remove unneeded delTree 2014-05-28 18:16:23 +02:00
Robin Appelman
c99e254178 aditional test cases for copy and rename 2014-05-28 18:16:23 +02:00
Bjoern Schiessle
9ed5083efd get mount point from mount manager 2014-05-28 17:28:31 +02:00
icewind1991
6d57e4c491 Merge pull request #8768 from owncloud/scanner_visibility 
Change visibility of scanner internals
 2014-05-28 15:59:57 +02:00
scolebrook
00f811f09c Changed class name to mode 2014-05-28 09:41:34 -04:00
Thomas Müller
a2e4bc8d33 # This is a combination of 2 commits. 
# The first commit's message is:

adding tests for long paths
increment path field in database up to 4000 (maximum for Oracle - otherwise we could use php's 4096)
increment version to trigger database migration
adding unit test for too long path

# This is the 2nd commit message:

fix too long path
 2014-05-28 15:30:44 +02:00
Thomas Müller
d89c5e2351 Update 3rdparty submodule after merge 2014-05-28 15:16:14 +02:00
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
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
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
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
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