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 |
Robin Appelman
|
24a401a548
|
Cache mimetype icons
|
2013-05-29 15:43:41 +02:00 |
Björn Schießle
|
ae0f37e9e2
|
fix indention
|
2013-05-29 15:37:27 +02:00 |
|
Robin Appelman
|
44d217c425
|
Cache: provide a function to get the permissions of all files in a folder with one query
|
2013-05-29 15:25:42 +02:00 |
|
Björn Schießle
|
8587f565d2
|
remove unnecessary variable
|
2013-05-29 15:14:15 +02:00 |
|
Björn Schießle
|
63a2bec6e5
|
use public API for error handling; improved while condition
|
2013-05-29 14:40:47 +02:00 |
|
Björn Schießle
|
893a1ed6f5
|
for external storages we never reach the path 'files', instead we need to leave the loop if no further parent exists
|
2013-05-29 14:19:18 +02:00 |
|
Björn Schießle
|
672811c103
|
if one public link share was found, we don't have to check it for the other folders
|
2013-05-29 13:12:30 +02:00 |
|
Björn Schießle
|
b44192f366
|
check list of users with access to the file from the bottom to the top. This way we avoid calling getFileInfo() on every dir, which creates a lot of overhead, especially for external storages
|
2013-05-29 13:10:26 +02:00 |
Florin Peter
|
5dd865a57f
|
changes l10n after review
|
2013-05-29 12:47:50 +02:00 |
|
Florin Peter
|
efd629462e
|
changes after review
|
2013-05-29 12:23:33 +02:00 |
|
Florin Peter
|
c398fc59ad
|
Merge branch 'master' into remove_unused_vars
Conflicts:
apps/files_encryption/hooks/hooks.php
apps/files_encryption/lib/proxy.php
apps/files_encryption/lib/session.php
apps/files_encryption/lib/stream.php
|
2013-05-29 09:21:00 +02:00 |
Jenkins for ownCloud
|
7c0c6bd779
|
[tx-robot] updated from transifex
|
2013-05-29 02:10:54 +02:00 |
|
Robin Appelman
|
8320f41dbe
|
Emit leacgy OC_User hooks
|
2013-05-29 01:05:49 +02:00 |
|
Robin Appelman
|
3e7e2c8a5c
|
fix setting getting active userid
|
2013-05-29 00:47:55 +02:00 |
|
Robin Appelman
|
198655f109
|
fix User->setHome when the backend action fails
|
2013-05-29 00:47:44 +02:00 |
|
Robin Appelman
|
4b688db612
|
implement old user api on top of the new one
|
2013-05-29 00:32:10 +02:00 |
|
Robin Appelman
|
955bda1842
|
New user management classes
|
2013-05-29 00:31:55 +02: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 |
|
Florin Peter
|
71a532fc4d
|
fixed if fopen returns false typically on external storage
|
2013-05-28 20:50:14 +02: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 |
|
Florin Peter
|
09b54ccb2b
|
Merge branch 'master' into remove_unused_vars
Conflicts:
apps/files_encryption/lib/session.php
apps/files_encryption/lib/util.php
|
2013-05-28 11:00:49 +02: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 |
|
Björn Schießle
|
3a76c22372
|
$_POST["adminEnableRecovery"] is a string
|
2013-05-28 10:51:12 +02: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 |
|
Florin Peter
|
e1e1c58969
|
changed to public log api
|
2013-05-27 20:51:52 +02:00 |
|
Florin Peter
|
7224fc98b2
|
replace == with === and replace != with !==
|
2013-05-27 20:44:38 +02:00 |
|
Florin Peter
|
6075aff687
|
changed basic auth to test user
|
2013-05-27 20:32:59 +02:00 |
|
Robin Appelman
|
9e65f40d1b
|
Add PublicEmitter class
|
2013-05-27 20:20:06 +02:00 |
kondou
|
3001db6b50
|
Update jquery to 1.10.0 & add jquery-migrate 1.2.1
|
2013-05-27 20:13:13 +02:00 |
Georg Ehrke
|
183f8c90af
|
use false instead of 0
|
2013-05-27 19:26:53 +02:00 |
|
Georg Ehrke
|
557cc4c1ab
|
make method names camelCase
|
2013-05-27 19:24:31 +02:00 |