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
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
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
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
kondou
3001db6b50
Update jquery to 1.10.0 & add jquery-migrate 1.2.1
2013-05-27 20:13:13 +02:00
Georg Ehrke
557cc4c1ab
make method names camelCase
2013-05-27 19:24:31 +02:00
Georg Ehrke
d69b7e24d2
update comment
2013-05-27 19:20:29 +02:00
Georg Ehrke
58c9175a56
move check if internet connection is disabled on purpose to a dedicated method
2013-05-27 19:19:17 +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
Florin Peter
adcafbde34
Merge branch 'master' into fix_for_2377
2013-05-25 20:37:28 +02:00
Florin Peter
505a300776
we should also normalize on update and search because the database layer will not do this for us
2013-05-25 20:35:12 +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
Michael Gapczynski
0a29d2029a
Clear opcode caches after writing to the config file, fixes #3372
2013-05-25 11:25:43 -04:00
Florin Peter
c245f5a99f
added more places where normalization is needed
2013-05-25 14:56:00 +02:00
Florin Peter
f6bf9de6de
prevent for returning while false normalize string
2013-05-25 14:54:36 +02:00
Jenkins for ownCloud
6a6c18dfab
[tx-robot] updated from transifex
2013-05-25 02:11:52 +02:00
Florin Peter
946e9ccc0a
Merge branch 'master' into fix_for_2377
2013-05-24 20:54:13 +02:00
Florin Peter
736f10039d
changed builtin normalizer to \OC_Util::normalizeUnicode
2013-05-24 20:36:20 +02:00
Florin Peter
661b5501b0
added normalizeUnicode() method to OC_Util
2013-05-24 20:35:01 +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
Florin Peter
d4b700ef4e
revert previous fix and added normalizer to cache class
2013-05-23 20:29:46 +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
Florin Peter
85e0c78166
fix problems with german "Umlaut" in folder name
2013-05-23 01:21:36 +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
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
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
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
Michael Gapczynski
c62f230ddb
Merge branch 'master' into move-maint-start
2013-05-21 11:26:56 -04: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
Florin Peter
469d6028ad
revert changes
2013-05-17 01:17:55 +02:00
Björn Schießle
95297c2469
add pre-shared hooks
2013-05-16 17:44:28 +02:00
Björn Schießle
9d1e60325c
allow admin to recover users files in case of password lost
2013-05-16 14:53:04 +02:00
Thomas Tanghus
c8bbf90feb
Port OC.dialogs to use octemplate except for prompt() and form().
...
Also load octemplate per default.
2013-05-16 13:41:04 +02:00
Jenkins for ownCloud
966c2231e3
[tx-robot] updated from transifex
2013-05-16 02:01:37 +02:00
Thomas Mueller
3c779b0632
Merge branch 'master' into hooks
2013-05-15 23:49:41 +02:00
Thomas Mueller
5dcec346e5
Merge branch 'master' into fix-3353
2013-05-15 23:43:46 +02:00
Thomas Müller
dfddaf8fbf
Merge pull request #3374 from owncloud/vobject_compound_property
...
Add Compound property to avoid double escaping values.
2013-05-15 14:34:16 -07:00
Florin Peter
c50bf3e3c5
fix for losing mount point "/"
2013-05-15 20:09:02 +02:00
Florin Peter
68059b1ec3
fix for SQLite3Result::fetchArray(): The SQLite3Result object has not been correctly initialised in post_addToGroup
2013-05-15 19:49:40 +02:00
Thomas Tanghus
cb41a30b00
Add Compound property to avoid double escaping values.
2013-05-15 18:56:54 +02:00
Florin Peter
0916769f67
fix for SQLite3Result::fetchArray(): The SQLite3Result object has not been correctly initialised in post_addToGroup
2013-05-15 17:00:01 +02:00
Michael Gapczynski
d91161186b
Fix finding mount in background watcher, fixes #3353
2013-05-15 09:33:38 -04:00
Florin Peter
751487ded7
merge changes for files_encryption
2013-05-15 10:20:19 +02:00
Florin Peter
807740a07a
fix for losing mount point "/"
2013-05-15 10:19:38 +02:00
Florin Peter
226aec8d56
Merge branch 'master' into files_encryption
2013-05-15 03:22:06 +02:00
Michael Gapczynski
f8336c1e2c
Turn off theme before update
2013-05-14 09:34:01 -04:00
Michael Gapczynski
71eed76dbe
Prevent backgroundScan() from looping if opendir() is failing for the same path
2013-05-13 11:17:08 -04:00
Frank Karlitschek
0e55accee2
Set the SQLite database lock timeout to 60 seconds which is the default in PHP anyways. I don't know why the MDB2 driver has this hardcoded to 0.1 seconds. This potentially fixes a lot of SQLite database lock problems and stuck in maintainance mode during upgrade issues.
2013-05-13 02:42:18 +02:00
infoneo
be4eef682a
Fixed problems with a dots in a filenames
2013-05-12 15:22:57 +03:00
Morris Jobke
c5cb3f9577
Merge pull request #3311 from owncloud/disable_mbstring.func_overload
...
disable mbstring.func_overload in setup v.3
2013-05-12 03:28:18 -07:00
Thomas Tanghus
baf058316c
disable mbstring.func_overload in setup
2013-05-12 10:56:32 +02:00
Lukas Reschke
63d51980e1
Get config from template
2013-05-12 10:51:21 +02:00
Jenkins for ownCloud
74f92d0c7f
[tx-robot] updated from transifex
2013-05-12 02:05:29 +02:00
infoneo
8f19c5ecab
Dots in a filenames fix
2013-05-12 01:47:48 +02:00
Morris Jobke
9f3c156aca
Merge pull request #3283 from owncloud/move-legacy-fs
...
Move legacy filesystem classes
2013-05-10 07:53:04 -07:00
Jörn Friedrich Dreyer
9134395b43
don't emit rename hooks on partial file renames
2013-05-10 12:01:50 +02:00
Jörn Friedrich Dreyer
c3b0d3d38c
rename isIgnoredFile to isPartialFile, remove check of blacklisted files in isPartialFile, correct usage of isPartialFile and isFileBlacklisted
2013-05-10 12:00:13 +02:00
Robin Appelman
990f23c024
fix typo
2013-05-09 22:52:44 +02:00
Björn Schießle
2e81efc37e
don't call correctFolder() in touchHook, it will be called later in the writeUpdate()
2013-05-08 23:00:24 +02:00
Björn Schießle
0e30e68b22
update etag for for the touched file
2013-05-08 23:00:03 +02:00
Robin Appelman
d9c19fa8d7
Move legacy filesystem classes
2013-05-08 16:48:47 +02:00
FlorinPeter
e8a80c6c2f
Merge pull request #3271 from owncloud/fix_for_util_tearDownFS
...
fix for tearDownFS, after filesystem::tearDown() in Util
2013-05-08 05:43:54 -07:00
Robin Appelman
71fc4a2cf4
Autoloader: fix loading app clases located in lib/
2013-05-08 00:50:33 +02:00
Robin Appelman
2a01d39940
Autoloader: load the 3rdparty libraries using prefixes
2013-05-07 23:07:47 +02:00
Robin Appelman
0d25c0001c
check for setlocale after setting up the paths to prevent autoloader confusion
2013-05-07 22:53:07 +02:00
Robin Appelman
6d903cf7ae
Autoloader: add support for custom namespace paths
2013-05-07 22:39:35 +02:00
Robin Appelman
72ed74f28a
Autoloader: split getting the class paths and loading the class
2013-05-07 22:26:55 +02:00
Florin Peter
03d8907df8
fix for tearDownFS, after filesystem::tearDown() the root is not mounted
2013-05-07 22:26:16 +02:00
Robin Appelman
cac86bb4db
Allow disabling the global classpath in an autoloader
2013-05-07 22:24:47 +02:00
Robin Appelman
d1fcb7eb52
Allow the autoloader to try mutliple possible paths for each path
2013-05-07 22:21:59 +02:00
Robin Appelman
19cfe74bf5
Add per-autoloader classPath
2013-05-07 22:19:00 +02:00
Robin Appelman
0b5f6b9c13
Move autoloader to it's own class
2013-05-07 22:16:17 +02:00
icewind1991
5b61c5d478
Merge pull request #3044 from owncloud/backgroundwatcher
...
Add a background job to watch for external filesystem changes
2013-05-07 10:00:00 -07:00
Michael Gapczynski
349a533f66
Merge pull request #3025 from owncloud/move-file
...
Cache: only look for child entires when doing a move operation when moving a folder
2013-05-07 07:52:57 -07:00
Robin Appelman
b8a421a86d
New hook system
2013-05-07 16:34:09 +02:00
Bart Visscher
398fbb61f8
Merge pull request #2813 from owncloud/improve-lib-check
...
added correct check for gd and check for php-intl
2013-05-07 06:12:40 -07:00
Morris Jobke
2b9da8a6c9
remove hard php-intl requirement
2013-05-07 13:51:30 +02:00
Bart Visscher
51a1f829b8
Merge pull request #3120 from owncloud/ocs_properties
...
Allow subclassing of OC_OCS_Result class by changing properties from 'private' to 'protected'
2013-05-05 23:20:25 -07:00
Jenkins for ownCloud
a876240b32
[tx-robot] updated from transifex
2013-05-04 02:00:54 +02:00
Bart Visscher
460f827f7e
Also check for needed upgrade in the Sabre Maintenance connector
2013-05-04 00:07:30 +02:00
Bart Visscher
41f7eb948a
Move start of the maintenance mode to the ajax call
...
Make sure the update page is shown in a browser. And not an ajax request
2013-05-04 00:05:29 +02:00
Robin Appelman
b7585050b5
Move legacy backgroundjob classes to a place where they can be autoloaded
2013-05-03 16:42:48 +02:00
Bart Visscher
a541b80592
Merge pull request #3222 from owncloud/fix-3218
...
Fix retrieving of mount points for shared storage, fix #3218
2013-05-03 06:02:33 -07:00
Bart Visscher
dcbbca1f89
Merge pull request #2972 from AndreasErgenzinger/master
...
Translations for themes
2013-05-03 05:41:28 -07:00
Bart Visscher
05a0b4533b
Merge pull request #2491 from riso/xsendfile_fix_zip
...
improved handling of xsendfile zip generation race condition
2013-05-03 05:37:01 -07:00
Tom Needham
cb5a69dd22
Merge pull request #3216 from owncloud/fix-api-3rdparty
...
fix bug that would only return error responses for 3rdparty apps
2013-05-02 15:40:10 -07:00
Thomas Müller
444a209a2a
Merge pull request #3183 from miicha/patch-1
...
fixing mimetype for "new" ms office formats
2013-05-02 15:39:10 -07:00
Michael Gapczynski
73d7cae6df
One more mount point fix
2013-05-02 18:22:43 -04:00
Michael Gapczynski
7039421efc
Fix retrieving of mount points for shared storage, fix #3218
2013-05-02 17:47:11 -04:00
Bernhard Posselt
11afb2e5a8
respect format output
2013-05-02 14:51:53 +02:00
Bernhard Posselt
0f38e6ec9c
logout before output to not run into header already sent problems
2013-05-02 14:49:05 +02:00
Bernhard Posselt
ed0c23a9cc
fix bug that would only return error responses for 3rdparty apps
2013-05-02 14:36:16 +02:00
joel hansson
7f58b0ef7c
typo fix in a comment.
2013-05-01 12:29:15 +03:00
FlorinPeter
b464970142
Merge pull request #3169 from owncloud/fix_infinite_loop_for_file_cache
...
fix for infinite loop causing on files_encryption branch when testing
2013-04-29 17:05:41 -07:00
Jenkins for ownCloud
5764bf088e
[tx-robot] updated from transifex
2013-04-30 01:59:18 +02:00
miicha
fbf9233648
fixing mimetype for "new" ms office formats
...
right mime types for docx, pptx and xlsx
with the old mimetype I got a warning message from office everytime I opend such a file (it was downloaded as "filename.docx.doc")
2013-04-30 02:38:05 +03:00
Florin Peter
f55aaad858
fix for infinite loop causing on files_encryption branch when testing "apps/files_encryption/test/crypt.php" on Method testSymmetricStreamEncryptShortFileContent
2013-04-29 15:43:48 +02:00