wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
11475 commits 157 branches 562 tags 714 MiB
Commit graph

11475 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael Gapczynski
ea55367678 Organize conditionals in a better order 2013-05-29 10:40:05 -04:00
Michael Gapczynski
04805d0be9 Only update metadata that has changed 2013-05-29 10:19:03 -04:00
icewind1991
fee43ec506 Merge pull request #3511 from owncloud/sessionclass 
Abstract session access away in a class
 2013-05-28 13:37:39 -07:00
Robin Appelman
fa6bfe8837 didn't mean to commit this yet 2013-05-28 17:21:44 +02:00
Florin Peter
4b4b447e2a fixed missing convert to new session handler 2013-05-28 17:06:37 +02:00
Florin Peter
5b7395f55b Merge branch 'sessionclass' of https://github.com/owncloud/core into sessionclass 2013-05-28 17:04:44 +02:00
Florin Peter
6ae7bde788 fixed encryption session namespace to avoid problems 2013-05-28 17:04:35 +02:00
Robin Appelman
57f712f8a9 implement ArrayInterface with Session 2013-05-28 16:52:40 +02:00
Robin Appelman
cc0cf93136 merge master into sessionclass 2013-05-28 14:55:42 +02:00
Jörn Friedrich Dreyer
1d720099c3 Merge pull request #3179 from pawl/patch-1 
Improve IE Compatibility
 2013-05-28 05:18:43 -07:00
Jörn Friedrich Dreyer
da55c76168 Merge pull request #2778 from Kondou-ger/optimize_pictures 
Optimize pictures with optipng.
 2013-05-28 04:48:38 -07:00
blizzz
3beff3fdc2 Merge pull request #3488 from zafi/master 
The "lost password" field in the personal setting depends on OC_USER_BACKEND_SET_PASSWORD
 2013-05-28 02:39:02 -07:00
FlorinPeter
086c33ef57 Merge pull request #3512 from owncloud/file_encryption_session_fix 
fix for losing private key while being logged in and accessing a public link
 2013-05-28 01:55:55 -07:00
Florin Peter
0041711fe3 fix for undefined index 2013-05-28 09:36:14 +02:00
Florin Peter
6f9e425939 fix for losing private key while being logged in and accessing a public link 2013-05-28 09:27:04 +02:00
Jenkins for ownCloud
3420d853ab [tx-robot] updated from transifex 2013-05-28 02:07:51 +02:00
Robin Appelman
9c99048429 fix syntax error 2013-05-28 01:31:26 +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
Frank Karlitschek
aeff1a4c4d Merge pull request #3510 from owncloud/publicemitter 
Add PublicEmitter class
 2013-05-27 13:45:47 -07:00
Robin Appelman
9e65f40d1b Add PublicEmitter class 2013-05-27 20:20:06 +02:00
Björn Schießle
4c05259ccf legacyBlockDecryprt() needs to be public 2013-05-27 17:35:38 +02:00
Björn Schießle
df22a7c495 make legacyDecrypt() private als always call legacyBlockDecrypt() from other classes 2013-05-27 17:35:28 +02:00
Björn Schießle
8b35578833 fix migration from old to new encryption 2013-05-27 17:35:06 +02:00
Björn Schießle
f8d1c32112 Merge pull request #3506 from owncloud/fix_3320 
fix https://github.com/owncloud/core/issues/3320
 2013-05-27 08:04:55 -07:00
Thomas Tanghus
c6d6925b78 Merge pull request #3495 from owncloud/file_encryption_util_is_error 
added OC_DB::isError and logging for #3486
 2013-05-27 07:56:12 -07: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
Georg Ehrke
841b420bc4 add event.preventDefault to undelete function 2013-05-27 16:37:43 +02:00
Georg Ehrke
d408cd7f37 fix https://github.com/owncloud/core/issues/3320 2013-05-27 15:24:37 +02:00
Florin Peter
80433fc4c4 Merge branch 'master' into file_encryption_util_is_error 
Conflicts:
	apps/files_encryption/lib/util.php
 2013-05-27 14:41:53 +02:00
Björn Schießle
5e243b48bb Merge pull request #3481 from owncloud/firsttime_enc 
fix first time encryption after app was enabled
 2013-05-27 05:17:31 -07:00
FlorinPeter
d878926256 Merge pull request #3496 from owncloud/file_encryption_tests 
improved tests for files_encryption
 2013-05-27 05:15:21 -07:00
Florin Peter
8cf827ee9d Merge branch 'master' into file_encryption_tests 2013-05-27 12:54:33 +02:00
Florin Peter
89f0c8f39d added check by numRows() 
changed to public api where it was possible
reformat code to comply with the coding guidelines
 2013-05-27 12:41:55 +02:00
Jenkins for ownCloud
73e0b4c10a [tx-robot] updated from transifex 2013-05-27 02:07:24 +02:00
Florin Peter
9dd277576a added users for tests 
reformat code to meet coding guidelines
 2013-05-26 20:44:15 +02:00
Florin Peter
c7981abbc9 improved test 
- fixed testPermanentDeleteFile sometimes failed
- speed optimization
- reformat code
 2013-05-26 03:22:16 +02:00
Jenkins for ownCloud
0c621ff6a9 [tx-robot] updated from transifex 2013-05-26 02:03:54 +02:00
Florin Peter
788c5940f0 fixed error rising from fetchRow 2013-05-25 23:20:55 +02:00
Florin Peter
9a6cd89a69 added OC_DB::isError and logging 2013-05-25 21:33:05 +02:00
Michael Gapczynski
dbb6a10364 Merge pull request #3478 from davidak/master 
small typo fix: added 2 whitespaces
 2013-05-25 11:21:21 -07: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
Frank Karlitschek
29c8cbf4d1 increase version and add warning 2013-05-25 12:08:18 +02:00
zafi
f314eb8f72 The "lost password" field depends on OC_USER_BACKEND_SET_PASSWORD 
so it should only be visible for users with a supporting backend.
 2013-05-25 09:03:07 +02:00
Jenkins for ownCloud
6a6c18dfab [tx-robot] updated from transifex 2013-05-25 02:11:52 +02:00