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

56476 Commits

Author SHA1 Message Date
Thomas Müller 4911305887 Merge pull request #3416 from owncloud/files_encryption 
New files encryption app
 2013-05-24 02:21:19 -07:00
Alessandro Cosentino 3fbfe3c06a small typo in the comments 2013-05-23 20:59:02 -04:00
Michael Gapczynski a98d6c4be6 Merge pull request #3425 from owncloud/move-storages 
Support for moving/copying folders between storages
 2013-05-23 17:35:11 -07:00
Jenkins for ownCloud b47729c5fc [tx-robot] updated from transifex 2013-05-24 02:02:43 +02:00
Florin Peter 6c8de5ae6d fixes after review from @DeepDiver1975 2013-05-23 23:56:31 +02:00
Florin Peter adc930d9f9 added l10n support in apps/files_encryption/ajax/adminrecovery.php 2013-05-23 22:09:28 +02:00
Björn Schießle 7b07168c46 code clean up; nicer solution to solve the public link share problem if a user is logged in 2013-05-23 21:18:31 +02:00
Björn Schießle a9ebf2aabe fix public link share if a user is logged in 2013-05-23 20:30:07 +02:00
Florin Peter d4b700ef4e revert previous fix and added normalizer to cache class 2013-05-23 20:29:46 +02:00
opensaucesystems acba7d7b13 Update settings.php 2013-05-23 17:27:22 +02:00
opensaucesystems b23ce9ed40 Remove http:// from label and add placeholder 2013-05-23 17:24:48 +02:00
opensaucesystems 169eb10030 Enable https authentication 
Allow authentication using https:// as well as http://
 2013-05-23 17:22:05 +02:00
opensaucesystems e866e564c2 Enable https authentication 2013-05-23 16:57:22 +02:00
Michael Gapczynski 30330b4343 Merge branch 'master' into move-storages 
Conflicts:
	tests/lib/files/view.php
 2013-05-23 10:25:12 -04:00
Michael Gapczynski 3b6d850e59 Switch to calling deleteAll via storage to avoid emitting delete hook 2013-05-23 10:23:16 -04:00
Björn Schießle cb79169cf5 Merge branch 'master' into files_encryption 2013-05-23 11:11:57 +02:00
Jenkins for ownCloud 698862519d [tx-robot] updated from transifex 2013-05-23 02:00:27 +02:00
Florin Peter 85e0c78166 fix problems with german "Umlaut" in folder name 2013-05-23 01:21:36 +02:00
Michael Gapczynski 1cfc9d269e Merge pull request #3457 from owncloud/fix-share-links 
Fix public links
 2013-05-22 15:20:15 -07:00
Florin Peter 46c784ccdf added trash bin tests 2013-05-22 23:51:35 +02:00
Florin Peter 842d0608f1 added static function registerHooks() for better unit tests handling 2013-05-22 23:50:45 +02:00
Michael Gapczynski 9b622bdeed RUNTIME_NOSETUPFS no longer exists, using tearDownFS() in public links instead 2013-05-22 15:02:11 -04:00
Björn Schießle b2aa97f166 revert changes to .gitmodules, they were applied by accident 2013-05-22 18:30:29 +02:00
Björn Schießle 1bd42762ae revert submodule changes 2013-05-22 18:28:44 +02:00
Björn Schießle 80dea1a8c5 settings clean-up; There is no blacklist in the new encryption app 2013-05-22 18:05:12 +02:00
Björn Schießle 15a3ae6db1 improved error messages 2013-05-22 18:01:18 +02:00
Björn Schießle ee53bd1aa3 Merge branch 'master' into files_encryption 
Conflicts:
	lib/files/cache/cache.php
 2013-05-22 15:29:22 +02:00
Georg Ehrke 00985068ca add previews for public files 2013-05-22 15:13:02 +02:00
Thomas Müller 26732ecaa6 Merge pull request #3337 from owncloud/oracle_fixes 
Oracle fixes
 2013-05-22 05:20:04 -07:00
Jörn Friedrich Dreyer 1f1abe595d cleanup codestyle 2013-05-22 13:59:08 +02:00
Jörn Friedrich Dreyer cbd5eb9a1a use to_char only for oracle, whitespace 2013-05-22 13:59:07 +02:00
Jörn Friedrich Dreyer eceb3c8ed5 add debug output 2013-05-22 13:59:07 +02:00
Jörn Friedrich Dreyer 1b68c0c0cd allow install when only oracle is available 2013-05-22 13:56:57 +02:00
Georg Ehrke efb2e69230 fix return value of OC_Util::isinternetconnectionworking() 2013-05-22 12:21:11 +02:00
Morris Jobke 9fd2be0757 Merge pull request #3406 from owncloud/oc_dialogs_oc_template 
Use js templates in OC.dialogs etc.
 2013-05-22 03:00:04 -07:00
Roland Hager 5c112657b2 New tests to assure that a move will not affect another users cache entries 
Added a second storage and cache Object to simulate a second user.
 2013-05-22 08:19:15 +02:00
Roland Hager 2ea2abf11e Fixing UPDATE error in filecache table when renaming files by calling move(). Add storage id to the where clause to avoid updating entries of other users. 2013-05-22 08:18:57 +02:00
Michael Gapczynski 7a0c592f93 Fix undefined index for share mount point retrieval 2013-05-21 20:21:19 -04:00
Jenkins for ownCloud d590064fdf [tx-robot] updated from transifex 2013-05-22 02:19:52 +02:00
Florin Peter c6722581f9 fix pgsql error 2013-05-22 02:02:42 +02:00
Florin Peter 28d72b822d Merge branch 'master' into files_encryption 
Conflicts:
	lib/files/cache/cache.php
 2013-05-22 01:26:35 +02:00
Florin Peter afbfa742d7 improved tests 2013-05-22 01:11:55 +02:00
Florin Peter 9ca9a22c6a fixed finding encrypted files in subfolders and removed unused code 2013-05-22 00:54:47 +02:00
Thomas Müller e2444ec9c5 Merge pull request #3266 from owncloud/hooks 
New hook system
 2013-05-21 15:21:25 -07:00
Thomas Müller 4bb6ac3aa7 Merge pull request #1586 from owncloud/filecache_mtime 
Emulate touch() for backends that don't support it
 2013-05-21 15:17:08 -07:00
Robin Appelman 81fd1badc3 merge master into filecache_mtime 2013-05-21 23:35:19 +02:00
Florin Peter 095fc790ac added webdav test 2013-05-21 21:09:39 +02:00
Florin Peter 1deeec93b7 fixed postFileSize 2013-05-21 21:09:25 +02:00
Jörn Friedrich Dreyer fb4d8ddf0a Merge pull request #3335 from owncloud/prevent-scan-loop 
Prevent backgroundScan() from looping
 2013-05-21 09:15:22 -07:00
Michael Gapczynski c62f230ddb Merge branch 'master' into move-maint-start 2013-05-21 11:26:56 -04:00