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

21622 Commits

Author SHA1 Message Date
Lukas Reschke 15be763d46 Add right margin to codestyle file 
Defaults to 120, we want 80 apparently
 2014-12-04 16:09:30 +01:00
Thomas Müller e9f0b30023 Merge pull request #12609 from owncloud/remove-53-fixme 
Remove workaround for 5.3
 2014-12-04 14:25:47 +01:00
Thomas Müller 884eb14181 Merge pull request #12533 from owncloud/app-dependencies-php-version 
App dependencies php version
 2014-12-04 14:23:03 +01:00
Björn Schießle c2b71d955c Merge pull request #12610 from owncloud/remove_php_version_check 
[encryption] remove check for PHP version
 2014-12-04 14:07:09 +01:00
Bjoern Schiessle 1509dd1358 update error message 2014-12-04 12:01:11 +01:00
Morris Jobke c5ee95a49e Merge pull request #12522 from owncloud/bower-jstz 
Bower jstz
 2014-12-04 11:58:46 +01:00
Thomas Müller b55ac514ac no nested xml tags on dependencies 2014-12-04 11:40:33 +01:00
Thomas Müller eb81c52b95 fix an issue where the types tag holds an empty string 2014-12-04 11:40:33 +01:00
Thomas Müller 086ec3de15 adding command dependency 2014-12-04 11:40:33 +01:00
Thomas Müller b028a6afac adjust dependency analyzer to use attributes properly 2014-12-04 11:40:33 +01:00
Thomas Müller c80ec91f28 switch to different parsing implementation to get xml attributes properly handled 2014-12-04 11:40:33 +01:00
Thomas Müller ba52c996cf adding supported databases 2014-12-04 11:40:33 +01:00
Thomas Müller d235a9c128 display missing dependencies in the apps management page 2014-12-04 11:40:33 +01:00
Thomas Müller b469e9f6fb introduce dependency analyzer to take care of app dependencies 
some more unit tests on xml info parser
 2014-12-04 11:40:33 +01:00
Thomas Müller f74d568bda adding new dependency for php version in apps info.xml 2014-12-04 11:40:33 +01:00
Thomas Müller 40e03ba314 adding default key value pair for 'types' 2014-12-04 11:40:33 +01:00
Thomas Müller 1354cee18e translate labels properly 2014-12-04 11:40:33 +01:00
Bjoern Schiessle 0dd44eaf27 OC8 and later requires PHP >= 5.4, so we can remove the check from the encryption app 2014-12-04 11:17:44 +01:00
Lukas Reschke ee1f8b0242 Remove workaround for 5.3 
Function is natively available with 5.4
 2014-12-04 11:17:33 +01:00
Jenkins for ownCloud 5aad902507 [tx-robot] updated from transifex 2014-12-04 01:54:42 -05:00
Thomas Müller 2eb81ff78f Merge pull request #12581 from owncloud/fix_typo 
fix typo in license header
 2014-12-03 19:55:07 +01:00
Bjoern Schiessle 0a173e2b58 fix typo 2014-12-03 19:46:32 +01:00
Thomas Müller 3d9c72d2d9 Merge pull request #12544 from owncloud/fix-windows-unittests 
Replace uniqid calls with $this->getUniqueID so tests pass again on windows
 2014-12-03 17:49:10 +01:00
Thomas Müller c90c9eb3e8 Merge pull request #12579 from owncloud/drop-files-external-tests 
drop files_external tests from autotest - they will be executed with aut...
 2014-12-03 17:44:56 +01:00
Joas Schilling 060cee223a Merge pull request #12542 from owncloud/update-autotestcmd 
Update autotest.cmd
 2014-12-03 17:40:28 +01:00
Lukas Reschke 80b15b48c5 Merge pull request #12492 from owncloud/deprecate-passwordsalt 
Officially deprecate passwordsalt
 2014-12-03 16:51:06 +01:00
Morris Jobke e014a18b4a drop files_external tests from autotest - they will be executed with autotest-external.sh which is coming 2014-12-03 16:38:25 +01:00
Morris Jobke 3fdb1937a3 Merge pull request #12382 from owncloud/enc_reorganize_folders2 
[encryption] reorganize folder structure (second try to make Jenkins happy)
 2014-12-03 16:08:40 +01:00
Thomas Müller e91dddd1a0 Merge pull request #12552 from szlwzl/master 
adding @ sign between email address and domain name to make syntax clearer
 2014-12-03 16:02:35 +01:00
Lukas Reschke 726626b439 Officially deprecated passwordsalt 
Hopefully this prevents people from using it in the future.
 2014-12-03 15:02:33 +01:00
Lukas Reschke 8700ffe698 Merge pull request #12572 from owncloud/issue/12571-disabled-preview-logflood 
Stop flooding the log, when previews are disabled
 2014-12-03 14:51:03 +01:00
Thomas Müller 7291b915b8 Merge pull request #12553 from owncloud/default-iosid 
add missing public interface for iOS client app id
 2014-12-03 14:05:27 +01:00
Thomas Müller 6daa588e1c Merge pull request #12556 from owncloud/add-route-for-versions 
Add route for download of versions
 2014-12-03 14:01:58 +01:00
Joas Schilling 69a5a0c1a0 Stop flooding the log, when previews are disabled 2014-12-03 12:52:42 +01:00
Volkan Gezer 7dcf0b02aa Merge pull request #12563 from owncloud/usermenu-remove-border 
remove border from user menu, adjust to apps menu
 2014-12-03 12:11:21 +01:00
Joas Schilling ea4c25609d Replace uniqid calls with $this->getUniqueID so tests pass again on windows 2014-12-03 12:10:55 +01:00
Vincent Petry 2303b09548 Merge pull request #12565 from owncloud/config-sample-databases 
add proper description what database is supported by CE and EE
 2014-12-03 10:16:45 +01:00
Lukas Reschke 8c8c257ce3 Merge pull request #12554 from owncloud/versions-app-autoload 
Autoload lib files of versions app
 2014-12-03 09:34:57 +01:00
Morris Jobke 98b28c68a3 add proper description what database is supported by CE and EE 2014-12-03 08:52:59 +01:00
Jenkins for ownCloud af50df8912 [tx-robot] updated from transifex 2014-12-03 01:54:32 -05:00
Robin Appelman 2bbb11fb63 Merge pull request #10881 from owncloud/touch-statcache 
Clear statcache before getting the mtime from local storage backends
 2014-12-02 23:29:24 +01:00
Lukas Reschke c4e0c02526 Add route for download of versions 
Otherwise on master it was not possible anymore to download older versions.

Fixes itself.
 2014-12-02 17:52:31 +01:00
Morris Jobke f9958153ef Merge pull request #12333 from owncloud/delete-selected-files 
Fix deleting non deletable files by selecting them
 2014-12-02 17:32:04 +01:00
Joas Schilling 1bd018a70c Autoload exception from files_trashbin 2014-12-02 17:26:42 +01:00
Joas Schilling 694003d147 Autoload lib files of versions app 2014-12-02 17:21:19 +01:00
Robin Appelman 1bbb18fe87 also clear statcache in mapped local 2014-12-02 16:39:03 +01:00
Morris Jobke a16d1a85ef Merge pull request #11975 from owncloud/Combustible-combustible_dev 
Check imagecreate*() return before using and use logger in \OC_Image
 2014-12-02 16:18:00 +01:00
Morris Jobke 5b3dbb4ef8 add missing public interface for iOS client app id 2014-12-02 16:10:07 +01:00
Bjoern Schiessle 9ca9acf3f8 small fixes 2014-12-02 16:08:06 +01:00
Simon Whittaker 6d04ca18d9 adding @ sign between email address and domain name to make the syntax clearer 2014-12-02 15:06:40 +00:00