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

13085 Commits

Author SHA1 Message Date
Bjoern Schiessle a6ced6b53f remove unused method, the right one is in util.php 2013-07-30 14:28:24 +02:00
Bjoern Schiessle aca7fbe2c8 adapt unit tests to the modified stream wrapper 2013-07-30 14:18:01 +02:00
Georg Ehrke 93cdfc3e8a Merge branch 'master' into oc_preview 2013-07-30 13:52:53 +02:00
Georg Ehrke 640253fa31 fix code style of try catch blocks 2013-07-30 13:43:15 +02:00
Bjoern Schiessle 6f20e081e4 added missing isEmpty ajax file 2013-07-30 12:48:41 +02:00
Georg Ehrke d84d8f7108 fix merge conflicts 2013-07-30 12:35:39 +02:00
Georg Ehrke ac6a3133ec style fixes 2013-07-30 12:33:54 +02:00
Bjoern Schiessle c7eba69aea only show decrypt all files option if encrypted files are available 2013-07-30 12:26:07 +02:00
Bjoern Schiessle 3640c99462 encrypt/decrypt file versions 2013-07-30 12:19:04 +02:00
Bjoern Schiessle 22b8967031 check if app is enabled 2013-07-30 12:19:01 +02:00
Thomas Müller 10939b0bdf Updating to the latest 3rdparty master commit 2013-07-30 11:09:58 +02:00
Jan-Christoph Borchardt 1a1c100719 fix loading.gif size for both upload and deletion, force visiblity 2013-07-30 10:44:01 +02:00
Bjoern Schiessle ba18452eda only write keyfiles if it was a new file, otherwise nothing changed 2013-07-30 10:43:16 +02:00
Thomas Müller 17c36b5074 fixes #4026 2013-07-30 10:26:42 +02:00
Bjoern Schiessle 223d3c91d6 use path relative to data/ 2013-07-30 10:14:17 +02:00
Bjoern Schiessle a7a7ef2b3a improved error handling 2013-07-30 09:48:30 +02:00
Thomas Müller 409268f322 adding test case with no / 2013-07-30 08:54:39 +02:00
Jenkins for ownCloud 88e1ccbce3 [tx-robot] updated from transifex 2013-07-30 01:57:50 -04:00
Thomas Müller f658852276 Merge branch 'master' into fixing-testGetById-master 2013-07-30 00:37:05 +02:00
Thomas Müller 7425efade7 Merge branch 'master' into oc_preview 
Conflicts:
	3rdparty
	lib/template.php
 2013-07-30 00:34:36 +02:00
Thomas Müller 085fdfec2f adding unit tests for OC_Util::basename 2013-07-29 23:32:03 +02:00
icewind1991 7c6246fa45 Merge pull request #4213 from owncloud/scanning-performance 
Cache: don't check if the parent exists in the cache if we are already sure it does
 2013-07-29 13:08:23 -07:00
Andreas Fischer 89f8f8e42d app migrate: Use = instead of LIKE as described in the comment above. 
The LIKE operator is not defined on integers (probably any non-text) columns
on PostgreSQL.
 2013-07-29 18:41:22 +02:00
Robin Appelman 74c54587ec better variable naming 2013-07-29 18:27:19 +02:00
Victor Dubiniuk 33fe24dc3d Replace delete icon with spinner 2013-07-29 19:27:11 +03:00
Thomas Mueller e2d3225e5a implement a platform independent version of basename 2013-07-29 18:24:05 +02:00
Victor Dubiniuk a10a17f818 Rewording 2013-07-29 18:25:17 +03:00
Björn Schießle 7f9795cc3d Merge pull request #4203 from owncloud/trashbin_improvements 
Trashbin improvements
 2013-07-29 08:15:53 -07:00
Bjoern Schiessle 4a9f5f64da remove whitespaces 2013-07-29 17:15:20 +02:00
Bjoern Schiessle b6fa0e4eef working decrypt files method 2013-07-29 17:06:05 +02:00
Robin Appelman dea3472ad7 remove unneeded 'use' 2013-07-29 17:04:28 +02:00
Robin Appelman 64774f30ba dont need to explicitly pass by reference 2013-07-29 17:03:57 +02:00
Victor Dubiniuk dec7b2fa40 Move styles from core to app 2013-07-29 17:36:59 +03:00
Robin Appelman a4df982dc3 add tests for MDB2SchemaReader 2013-07-29 16:33:27 +02:00
Robin Appelman d6c56b584a make MDB2Schema reader non static 2013-07-29 16:33:00 +02:00
Robin Appelman fbbe0ebe77 add function to get config object from OC_Config 2013-07-29 16:32:37 +02:00
Georg Ehrke b4a5239278 fix syntax in config.sample.php 2013-07-29 16:30:04 +02:00
Georg Ehrke 2ea8ee6139 add class='preview-icon' in trashbin app as well 2013-07-29 16:27:40 +02:00
Michael Gapczynski afff750011 Add test for calculating size of newly empty folder 2013-07-29 10:23:14 -04:00
Michael Gapczynski 1faac6108c Use query to calculate folder size 2013-07-29 10:22:44 -04:00
Victor Dubiniuk 97f2c393c1 Allow apps to have own 404 content, closes #3225 2013-07-29 16:54:19 +03:00
Georg Ehrke 1e4ec2ac27 add class='preview-icon' to rows in file app that make use of previews 2013-07-29 15:47:17 +02:00
Georg Ehrke e01bc7de98 Revert "OC\Preview - outsource static methods" 
This reverts commit 14a35267c1.
 2013-07-29 14:51:06 +02:00
Georg Ehrke 65affdc9b3 make previews in files app smaller 2013-07-29 14:40:26 +02:00
Thomas Müller 954b5d9019 Merge pull request #4216 from owncloud/clean_php55_opcache 
Also clean PHP 5.5 opcache
 2013-07-29 04:40:01 -07:00
Björn Schießle 830f5d24c7 add decryptall.php 2013-07-29 13:39:56 +02:00
Björn Schießle 0a3d662dd0 register decrypt all route 2013-07-29 13:39:37 +02:00
Björn Schießle e15e394fcc add ajax call to decrypt all files 
Conflicts:
	apps/files_encryption/lib/crypt.php
 2013-07-29 13:39:05 +02:00
Björn Schießle 2c8e5ec84f user interface to allow user to decrypt all his files once the encryption app was disabled 
Conflicts:
	settings/templates/personal.php
 2013-07-29 13:36:06 +02:00
Jenkins for ownCloud 0fde473cb7 [tx-robot] updated from transifex 2013-07-29 01:57:04 -04:00