Commit Graph

24692 Commits

Author SHA1 Message Date
Clark Tomlinson 9727386d8b fixing test 2015-05-11 09:38:23 -04:00
Clark Tomlinson 10d7eb56af adding username as param for isrecoveryenabled 2015-05-05 09:42:53 -04:00
Clark Tomlinson 3ef2e668ac fixing recovery tooltip 2015-05-04 09:40:59 +02:00
Thomas Müller 870ac88c85 Merge pull request #16020 from owncloud/set-charset-via-ini-set
Try to set required ini values in base.php
2015-05-04 09:35:32 +02:00
Thomas Müller 4de45b5e61 Merge pull request #15958 from owncloud/usage-of-public-log-interface
Use internally \OCP\ILogger instead of \OC\Log
2015-05-04 09:13:26 +02:00
Jenkins for ownCloud 7fa308977b [tx-robot] updated from transifex 2015-05-04 01:54:47 -04:00
Frank Karlitschek 55b2570f64 8.1 alpha 3 2015-05-03 19:04:41 -04:00
Lukas Reschke 8a85d8bc17 Try to set required ini values in base.php
Fixes https://github.com/owncloud/core/issues/16006
2015-05-03 13:23:29 +02:00
Morris Jobke 7a3b74a8b9 Merge pull request #15486 from owncloud/versions-rollbackkeepfileid
Keep fileid when restoring version, using stream copy
2015-05-03 13:12:54 +02:00
Morris Jobke 6bd861910b Merge pull request #16009 from owncloud/fix-searchresults
fix search results from other places, account for margin-bottom in files list
2015-05-03 11:48:00 +02:00
Jenkins for ownCloud 9f76b8b356 [tx-robot] updated from transifex 2015-05-03 01:55:17 -04:00
Morris Jobke 182304591d Merge pull request #16001 from owncloud/add-multiselect-new-title
also add title to multiselect create new element, force multiselect wider width, fix #15954
2015-05-02 21:46:28 +02:00
Morris Jobke c4dc988c2e Merge pull request #16015 from owncloud/add-proper-versioning
Add proper versioning for doc URL
2015-05-02 21:44:09 +02:00
Lukas Reschke 6738c17cb5 Add proper versioning for doc URL
As per 8.1 we have docs for minor versions as well so we need to link to `8.1` here instead to `8.0`.

Fixes https://github.com/owncloud/core/issues/16002
2015-05-02 21:05:11 +02:00
Lukas Reschke 6528a17ea3 Merge pull request #16005 from owncloud/remove-more-apps
remove 'More apps' link from apps mgmt now that we have support for experimental apps
2015-05-02 19:54:42 +02:00
Jan-Christoph Borchardt 954968e9d8 fix search results from other places, account for margin-bottom in files list 2015-05-02 09:07:42 -04:00
Jenkins for ownCloud aa0d439ed9 [tx-robot] updated from transifex 2015-05-02 01:54:49 -04:00
Jan-Christoph Borchardt 4c070b3e12 remove 'More apps' link from apps mgmt now that we have support for experimental apps 2015-05-01 18:07:55 -04:00
Jan-Christoph Borchardt 8ccf1c85d9 force minimum multiselect width to properly show longer groups 2015-05-01 13:51:01 -04:00
Jan-Christoph Borchardt 4dd8a22e51 also add title to multiselect create new element, fix #15954 2015-05-01 13:47:37 -04:00
Thomas Müller 6b691e3840 Merge pull request #15937 from owncloud/file-locking
Add memcache based shared/exclusive locking
2015-05-01 17:47:23 +02:00
Jenkins for ownCloud eda4d45836 [tx-robot] updated from transifex 2015-05-01 01:54:43 -04:00
Morris Jobke 8f117cb89b Merge pull request #15993 from owncloud/admin-documentation
add admin documentation links for Sharing, Encryption and Email server
2015-05-01 00:15:06 +02:00
Jan-Christoph Borchardt 9ec80377e6 fix layout for documentation link hints 2015-04-30 17:12:34 -04:00
Jan-Christoph Borchardt 8b37e25ec2 add admin documentation links for Sharing, Encryption and Email server 2015-04-30 17:10:24 -04:00
Thomas Müller ca8b6f24cb Merge pull request #15955 from owncloud/move-dummy-encryption
Moving encryption_dummy to the apps repo
2015-04-30 18:14:01 +02:00
Thomas Müller e14540c1f1 Merge pull request #15972 from owncloud/enable-scrutinizer-code-coverage
Enable code coverage on scrutinizer
2015-04-30 18:12:36 +02:00
Vincent Petry 972e189605 Use moveFromStorage instead of streamCopy when restoring version 2015-04-30 16:15:18 +02:00
Vincent Petry 2228faaa39 Fix version rollback to keep fileid 2015-04-30 16:15:18 +02:00
Thomas Müller 41d7870d7b Merge pull request #15964 from owncloud/fix-l10n-string-warn
Fix #15962
2015-04-30 15:55:40 +02:00
Robin Appelman ba7d221cff allow getting the path from the lockedexception 2015-04-30 14:48:42 +02:00
Robin Appelman 8119b8b040 add tests for castrait 2015-04-30 14:48:39 +02:00
Robin Appelman a40a237441 use trait for cas polyfill for xcache 2015-04-30 14:48:39 +02:00
Robin Appelman 96f9573a4b add memcache based shared/exclusive locking 2015-04-30 14:48:39 +02:00
Robin Appelman acf30ede95 add compare and swap to memcache 2015-04-30 14:48:39 +02:00
Robin Appelman 29213b6136 extends memcache with add, inc and dec 2015-04-30 14:48:36 +02:00
Thomas Müller 42097bfc6a Merge pull request #15968 from owncloud/enc-wrapper-presetup
use the preSetup hook to ensure the encryption wrapper is applied correctly
2015-04-30 14:14:31 +02:00
Robin Appelman d0ad69aa9c use the preSetup hook to ensure the encryption wrapper is applied correctly 2015-04-30 13:28:06 +02:00
Thomas Müller 4ef797f649 Enable code coverage on scrutinizer 2015-04-30 13:18:15 +02:00
Bernhard Posselt 360d0e3e5e fix #15962 2015-04-30 12:44:45 +02:00
Morris Jobke fbba7a61cb Use internally \OCP\ILogger instead of \OC\Log
* this is the preparation for some upcoming logger related changes
* also fixes an issue in the public interface where we request
  an internal class as parameter
2015-04-30 11:52:30 +02:00
Thomas Müller d308ec4f0e Merge pull request #15949 from owncloud/l10n-string-json
Implement json serialize for l10n string
2015-04-30 11:11:16 +02:00
Thomas Müller 7795265d93 Moving encryption_dummy to the apps repo - fixes #15950 2015-04-30 10:51:51 +02:00
Morris Jobke b9c1bf26ee Merge pull request #15951 from owncloud/fix-install-again
Make command optional
2015-04-30 10:45:23 +02:00
Thomas Müller 08aef98e11 Merge pull request #15946 from owncloud/auto-controller-resolve
Make controller automatically assemblable
2015-04-30 10:12:17 +02:00
Morris Jobke 8bc9c56dcf Merge pull request #15947 from owncloud/add-title-to-multiselect
add title to multiselect list items so longer group names are visible
2015-04-30 10:04:43 +02:00
Jenkins for ownCloud ae853445ef [tx-robot] updated from transifex 2015-04-30 03:27:57 -04:00
Joas Schilling 9205a9b52e Merge pull request #15942 from owncloud/revert-15875-multiline-buttons
Revert "fix layout for multiline buttons which are <a class='button'>"
2015-04-30 08:25:43 +02:00
Clark Tomlinson 4209757d61 Merge pull request #15919 from owncloud/enc_handle_empty_files
Encryption improve handling of empty and unencrypted files
2015-04-29 19:32:02 -04:00
Bernhard Posselt 7c0dc06c10 make command optional 2015-04-29 22:53:16 +02:00