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

3724 Commits

Author SHA1 Message Date
Robin Appelman cc0cf93136 merge master into sessionclass 2013-05-28 14:55:42 +02:00
Jenkins for ownCloud 3420d853ab [tx-robot] updated from transifex 2013-05-28 02:07:51 +02:00
Robin Appelman 040045cc2e provide a dummy session for CLI 2013-05-28 01:15:38 +02:00
Robin Appelman f547b66d6b check fix if session start is successfull 2013-05-28 01:13:36 +02:00
Robin Appelman e73c04501e Fix session not working error 2013-05-28 01:10:18 +02:00
Robin Appelman 44f9af5a7f Use the new session wrapper 2013-05-28 01:04:09 +02:00
Robin Appelman 76d13120ea Abstract the session away in a class 2013-05-28 00:50:00 +02:00
Robin Appelman 9e65f40d1b Add PublicEmitter class 2013-05-27 20:20:06 +02:00
Michael Gapczynski 6151c0d310 Merge pull request #3412 from owncloud/fix_2013 
Don't set Content-Length header if size is unknown
 2013-05-27 07:44:35 -07:00
Jenkins for ownCloud 73e0b4c10a [tx-robot] updated from transifex 2013-05-27 02:07:24 +02:00
Jenkins for ownCloud 0c621ff6a9 [tx-robot] updated from transifex 2013-05-26 02:03:54 +02:00
Michael Gapczynski 0fdf3a7e63 Merge pull request #3388 from roha4000/master 
Duplicate DB entries in filecache table when renaming folder in WebUI #2
 2013-05-25 11:18:20 -07:00
Michael Gapczynski c870aed1b6 Merge pull request #3493 from owncloud/bumpversion 
Bump version for files_encryption changes
 2013-05-25 10:20:42 -07:00
Michael Gapczynski 2893bb9543 Bump version for files_encryption changes 2013-05-25 11:42:28 -04:00
Jenkins for ownCloud 6a6c18dfab [tx-robot] updated from transifex 2013-05-25 02:11:52 +02:00
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
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 ee53bd1aa3 Merge branch 'master' into files_encryption 
Conflicts:
	lib/files/cache/cache.php
 2013-05-22 15:29:22 +02: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
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 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
Florin Peter 28d72b822d Merge branch 'master' into files_encryption 
Conflicts:
	lib/files/cache/cache.php
 2013-05-22 01:26:35 +02:00
Thomas Müller e2444ec9c5 Merge pull request #3266 from owncloud/hooks 
New hook system
 2013-05-21 15:21:25 -07:00
Robin Appelman 81fd1badc3 merge master into filecache_mtime 2013-05-21 23:35:19 +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
Björn Schießle 5cd14425f9 Merge branch 'master' into files_encryption 
Conflicts:
	apps/files_trashbin/l10n/nn_NO.php
 2013-05-21 15:30:19 +02:00
Michael Gapczynski 09ff46eda2 Remove user name addition to paths in deleteAll 2013-05-20 10:21:55 -04:00
Thomas Tanghus c38dc36665 Remove debug output 2013-05-20 13:56:57 +02:00
Thomas Tanghus b1bb899867 Add rename() method to OC_VCategories. 2013-05-20 10:16:07 +02:00
Florin Peter 31037241e1 Merge branch 'master' into files_encryption 2013-05-20 02:25:56 +02:00
Jenkins for ownCloud 6609de28d8 [tx-robot] updated from transifex 2013-05-20 02:10:11 +02:00
Florin Peter 58a8d67a9b fix for webdav because initMounts() is triggered twice so we lost the root path 2013-05-20 01:57:16 +02:00
Florin Peter b3b6738d59 Revert "fix for webdav and wrong reference for findByStorageId" 
This reverts commit 079f918d5c.
 2013-05-20 01:47:35 +02:00
Florin Peter 079f918d5c fix for webdav and wrong reference for findByStorageId 2013-05-19 22:30:03 +02:00
Michael Gapczynski fc5bce1f76 Fix undefined variable for copying empty folders 2013-05-19 15:04:41 -04:00
Michael Gapczynski 41e2d64c86 Add support for copying/moving folders between storages, move isIgnoredDir() to Filesystem 2013-05-19 14:15:49 -04:00
Michael Gapczynski 67729f5f9f Merge pull request #3421 from owncloud/pre_login_password 
Add password to pre_login
 2013-05-19 10:09:24 -07:00
Lukas Reschke 7ec36c5bbb Add password to pre_login 
I need this to intercept passwords for my WIP multi-factor
authentication app.
 2013-05-19 13:33:33 +02:00
Michael Gapczynski 9bebf9b4c8 Don't set Content-Length header if size is unknown 2013-05-17 14:14:12 -04:00
FlorinPeter 0f314c1404 Merge pull request #3375 from owncloud/fix_for_SQLite3Result_object_in_post_addToGroup 
fix for SQLite3Result::fetchArray() on setup
 2013-05-17 01:55:28 -07:00
Jenkins for ownCloud 6a6079176b [tx-robot] updated from transifex 2013-05-17 02:07:36 +02:00
Florin Peter d7dc710c8b revert changes 2013-05-17 01:22:30 +02:00
Florin Peter a92dead754 only connect share hooks if installation OC is installed 2013-05-17 01:20:02 +02:00