ad82a56f79
Merge branch 'master' into appframework-master
2013-09-15 21:18:59 +02:00
0f4e214a90
adding null check on a mount's storage
2013-09-15 20:40:40 +02:00
a58e176852
Merge pull request #4506 from owncloud/oc_avatars
...
OC Avatars
2013-09-14 16:00:36 -07:00
556bd1ef23
[tx-robot] updated from transifex
2013-09-13 21:49:24 -04:00
4480b0b164
Merge branch 'master' into appframework-master
2013-09-13 23:31:59 +02:00
6ff07f7681
Merge pull request #4712 from owncloud/fileapi-foreward
...
Provide an implementation of the fileapi for oc6 build on top of the old api
2013-09-13 14:31:11 -07:00
4da8fc6907
Merge branch 'appframework-master' of github.com:owncloud/core into appframework-master
2013-09-13 20:57:18 +02:00
5b3388c7c4
Merge branch 'master' into appframework-master
2013-09-13 20:56:49 +02:00
049e57ac4a
remove unused OC_L10N
2013-09-13 17:41:09 +02:00
8c9add4d32
adding TB and GB to OC_Helper::humanFileSize
2013-09-13 17:22:45 +02:00
d5ddbfb045
Merge pull request #4719 from owncloud/port_4701_master
...
Always check variable type before using readdir to avoid surprises
2013-09-12 15:44:20 -07:00
786017c247
Register EventSubscriber that resets Oracle's NLS_DATE_FORMAT etc.
2013-09-12 23:43:20 +02:00
7f07d737f8
Create instance of Doctrine\Common\EventManager() in OC_DB.
2013-09-12 23:43:20 +02:00
58ed78aa9e
cleanup public storage interface a bit
2013-09-12 21:58:32 +02:00
c9d2663159
Merge branch 'master' into fileapi-foreward
2013-09-12 21:43:35 +02:00
c9c5e1b97f
Merge branch 'master' into oc_avatars
2013-09-12 07:41:44 +02:00
8543951cf9
adding icons for shared folders and external folders
2013-09-12 00:12:20 +02:00
62eeac3390
Merge pull request #4798 from owncloud/fixing-variable-typos-master
...
no further comment - which dev did not test this BEFORE submitting the p...
2013-09-11 05:58:07 -07:00
68015b2761
[tx-robot] updated from transifex
2013-09-11 06:50:06 -04:00
bf7f94422f
Bring another enable_avatars to $_ and fix $thus->$this
2013-09-11 07:11:33 +02:00
af2164bbcb
no further comment - which dev did not test this BEFORE submitting the pull request?
...
which reviewer did not test the pull request?
2013-09-11 01:23:37 +02:00
a2ade4294c
Merge pull request #4472 from owncloud/remove-disconnect
...
Remove disconnect function from OC_DB
* owncloud/remove-disconnect:
Remove disconnect function from OC_DB
2013-09-10 21:48:56 +02:00
2e5ce091f0
add storage backend interface to public namespace
2013-09-10 20:13:47 +02:00
9ad7891b4e
improve phpdoc for the public files interface
2013-09-10 20:10:25 +02:00
e271a55783
move filesystem expceptions to global namespace
2013-09-10 19:44:23 +02:00
315344eb9c
move public files api to a clearer namespace
2013-09-10 19:34:38 +02:00
72689f643b
[tx-robot] updated from transifex
2013-09-10 10:42:16 -04:00
7810e27dad
Changed default behaviour to not log IP address in case of an auth failure. Can be configured in OC conf now.
...
Log level changed to warning .
2013-09-10 11:07:26 +02:00
63a5409c6e
Merge pull request #4757 from owncloud/deleteAll-alias
...
change View->deleteAll to an alias of View->rmdir since rmdir works recursive
2013-09-09 15:08:18 -07:00
5e1821f21d
Merge pull request #4772 from owncloud/preview_improvements
...
oc\preview use avconv instead of ffmpeg
2013-09-09 12:32:45 -07:00
1832eb8872
Pass view in \OC_Avatar to constructor and use $_ for enable_avatars
2013-09-09 16:57:46 +02:00
0cd6473909
On an auth failure the uid and the IP address should be logged to the standard log file.
...
This update works for a standard setup, when using a proxy for the server one can probably use the X-forwarded-for header
instead of the remote address.
2013-09-09 15:35:39 +02:00
92f6c3bb10
[tx-robot] updated from transifex
2013-09-08 21:37:53 -04:00
46a57a9f05
change View->deleteAll to an alias of View->rmdir since rmdir works recursive
2013-09-07 14:10:51 +02:00
e895cf9188
[tx-robot] updated from transifex
2013-09-07 04:46:57 -04:00
2e1b534957
update phpdoc for public fileapi
2013-09-06 20:55:47 +02:00
0131a32025
extract interfaces from fileapi for public namespace
2013-09-06 20:38:59 +02:00
1cfd03771f
use ===
2013-09-06 20:20:17 +02:00
b8241aa79d
remove some more debug output
2013-09-06 16:07:54 +02:00
edb78c917c
remove some error_logs
2013-09-06 16:07:45 +02:00
d33fabd02d
remove error logs
2013-09-06 16:07:25 +02:00
627b6164c4
if the files doesn't exist yet we start with the parent to search for shares
2013-09-06 16:07:07 +02:00
e9849270e3
Revert "fixes #4574"
...
This reverts commit 81a45cfcf1
2013-09-06 00:28:13 +02:00
221bbd275c
Use \OC_App for checking whether encryption is enabled
2013-09-05 23:26:02 +02:00
f8563ec583
Merge branch 'master' into sharing_mail_notification_master
...
increased version number to trigger db update
Conflicts:
lib/util.php
2013-09-05 13:39:45 +02:00
0527fb05ad
[tx-robot] updated from transifex
2013-09-05 07:37:32 -04:00
c01675de5d
more is_resource checks before readdir
2013-09-05 11:58:57 +02:00
2954db165b
use avconv instead of ffmpeg
2013-09-05 09:53:35 +02:00
fbedd643f7
Merge pull request #4477 from owncloud/hooks-view
...
also emit hooks for views that are a subfolder of the user folder
2013-09-04 16:09:22 -07:00
7618cf3005
adding public interface for preview
2013-09-04 23:45:11 +02:00
835f477d8f
Merge branch 'master' into appframework-master
2013-09-04 23:15:17 +02:00
b643c02bd5
Fix some bugs and remove \OCP\Avatar for now
2013-09-04 22:13:59 +02:00
68dce9dde5
fixing style, var name & PHPDoc
2013-09-04 21:22:36 +02:00
ec3639dc7a
Always check variable type before using readdir to avoid surprises
2013-09-04 13:06:04 +02:00
820fd42161
Merge branch 'master' into oc_avatars
2013-09-04 12:56:40 +02:00
823b4cce60
More trimming
2013-09-04 08:16:27 +02:00
09187f3b3b
Merge pull request #4449 from owncloud/clean_up_util
...
Clean up \OC\Util
2013-09-03 22:53:03 -07:00
fe0b8ac2c0
[tx-robot] updated from transifex
2013-09-03 07:46:55 -04:00
fd7469db9e
coding-style fixes
2013-09-03 13:37:06 +02:00
65413a95dc
Merge branch 'master' into oc_avatars
...
Conflicts:
config/config.sample.php
2013-09-03 04:43:11 +02:00
431cf06e99
Merge pull request #4672 from owncloud/ocs_cleanup
...
Ocs cleanup
2013-09-02 14:24:46 -07:00
e7e3f1b81a
Fix some of @jancborchardt's complaints in oc_avatars
2013-09-02 17:07:38 +02:00
931e90634e
fix db queries
2013-09-02 17:03:35 +02:00
983da0d78f
fix db queries
2013-09-02 17:01:10 +02:00
b918c06be6
Merge branch 'master' into sharing_mail_notification_master
...
Conflicts:
lib/util.php
2013-09-02 14:41:46 +02:00
06870a6e39
Merge pull request #4673 from owncloud/ocsapi_cleanup
...
remove the activity call here. it is not implemented anyways.
2013-09-02 01:46:29 -07:00
e5fc7b9dbe
Merge branch 'master' into clean_up_util
...
Conflicts:
lib/base.php
2013-09-02 07:58:06 +02:00
74c9223281
Properly check for tmpavatar, invalidate cache, fix debug msgs
2013-09-01 21:17:48 +02:00
a22f9ff301
Provide an implementation of the fileapi for oc6 build on top of the old api
2013-09-01 19:47:48 +02:00
e68b5f8b0d
[tx-robot] updated from transifex
2013-09-01 13:30:40 -04:00
76b1b5b6a3
Provide 'enable_avatars' in config.php, to disable avatars
2013-09-01 18:17:14 +02:00
ab70b8c26e
Merge branch 'master' into oc_avatars
2013-09-01 17:52:13 +02:00
36424580b0
Merge pull request #4329 from owncloud/fix_4258
...
Fix #4258 and improve unittest
2013-09-01 08:46:27 -07:00
0aba549e7f
Use more object oriented way for console commands
2013-09-01 16:40:50 +02:00
2d6a400381
Check for $this->fileInfo and @depend on testData()
2013-09-01 15:50:58 +02:00
c54994d2e9
fixing this obvious typo directly
2013-09-01 08:23:11 +02:00
235638e5ab
Merge branch 'master' into fix_4258
...
Conflicts:
lib/image.php
2013-08-31 23:48:23 +02:00
206f83941b
move new interfaces into lib/public and OCP
2013-08-31 21:34:29 +02:00
97bdf008b1
PHPDoc added to existing interfaces
2013-08-31 20:57:16 +02:00
f1836a997f
remove the activity call here. it is not implemented anyways. This will be provided by Activity app in the future.
2013-08-31 18:14:46 +02:00
58e036e304
remove knowledgebase calls that are no longer used in ownCloud 5/6
2013-08-31 18:00:53 +02:00
5d653753bd
Merge branch 'master' into oc_avatars
2013-08-31 12:56:36 +02:00
ec9b7d1e84
fixing file header
2013-08-31 01:41:24 +02:00
a9d6b59307
Merge branch 'master' into appframework-master
2013-08-31 01:38:44 +02:00
0869f9b655
Fix #4258 , clean up \OC_Image and improve its unittest
2013-08-30 21:08:37 +02:00
8ef40277b2
Merge master into oc_preview
2013-08-30 18:11:18 +02:00
0f5df181a3
Merge pull request #4661 from owncloud/separate-app-styles
...
Move CSS for apps and browser-specific fixes out of main styles.css
2013-08-30 09:08:25 -07:00
4bbefdf608
add expiration date if it is already set
2013-08-30 17:20:10 +02:00
10cf1b3a4e
return mailSend status in getItems()
2013-08-30 15:39:43 +02:00
dbc78b1a58
[tx-robot] updated from transifex
2013-08-30 09:38:20 -04:00
95f42d6544
Merge pull request #4578 from houbaastef/master
...
fixes #4574
2013-08-30 06:20:07 -07:00
77adaee645
enable user to inform recipients about a shared file by mail
2013-08-30 13:53:49 +02:00
30526ded80
Fix \OCP\Avatar
2013-08-30 13:26:13 +02:00
7d398ba622
Use the real username in preferences and magic cookie instead of case-insensitive user input. Fixes 4616.
2013-08-30 11:45:16 +02:00
9c23ed580a
move CSS for browser-specific fixes out of styles.css into new fixes.css
2013-08-30 11:42:32 +02:00
cc8e19ad11
move CSS for apps out of styles.css into new apps.css
2013-08-30 11:38:49 +02:00
ecf187393b
Finish cropper, Get rid of TODOs, Improve \OCP\Avatar and "fix" unitests
2013-08-30 09:00:37 +02:00
0104d3df96
Merge pull request #4592 from owncloud/fix-logic
...
fix weird logical behaviour
2013-08-29 08:40:33 -07:00
14b67d6c5f
fixing typo
2013-08-29 16:25:25 +02:00
728fc7f123
fix parameter missing warning
2013-08-29 16:13:16 +02:00
1fa29b4c11
also emmit create hook when creating new files using touch()
2013-08-29 15:31:03 +02:00
0c708be76b
Use defaultavatars
2013-08-29 14:26:11 +02:00
301cce54cc
webdav quota information contains the values for used and free - not total
2013-08-29 12:34:48 +02:00
b7758d0f8d
Merge master into oc_preview
2013-08-29 10:50:55 +02:00
70b6e2161e
invert logic of disable_previews
2013-08-29 10:08:53 +02:00
0ba498119c
Merge branch 'master' into oc_avatars
...
Conflicts:
3rdparty
2013-08-28 23:21:26 +02:00
bdf48a6daa
Use OC.Router.generate, TODO use cache, prepare for defaultavatars
2013-08-28 21:20:28 +02:00
d4952bd9df
fix typo
2013-08-28 18:36:32 +02:00
3fd2df4088
Only enable logrotate when configured. Also rotate size is settable.
2013-08-28 17:41:27 +02:00
42f3ecb60f
Check for installed state before registering the logrotate background job
2013-08-28 17:11:43 +02:00
62560ef859
Add description to log rotate class
2013-08-28 17:11:43 +02:00
594a2af75a
Review fixes
2013-08-28 17:11:43 +02:00
b5e2842e00
Very simple log rotation
2013-08-28 17:11:43 +02:00
67c5be9f19
Merge branch 'master' into oc_avatars
...
Conflicts:
3rdparty
2013-08-28 16:44:11 +02:00
8d8a57de7f
Continue work on cropper
2013-08-28 16:39:00 +02:00
45076edf4f
Merge pull request #3891 from owncloud/fix_loadAppScriptFile
...
Check if the app is enabled and the app path is found before trying to l...
2013-08-28 06:10:06 -07:00
9843c8e838
Merge pull request #4434 from owncloud/fix_octemplate_escaping
...
Fix octemplate string escaping.
2013-08-28 03:59:43 -07:00
3e7ddbc9d9
[tx-robot] updated from transifex
2013-08-28 06:24:14 -04:00
d5062b9e0e
[tx-robot] updated from transifex
2013-08-27 11:23:18 -04:00
e91edabe0f
add documentation
2013-08-27 16:07:25 +02:00
273f162b26
Code style
2013-08-27 15:39:47 +02:00
f14ce1efdc
Add quota to core api
2013-08-27 15:39:43 +02:00
13514fd1ad
Merge pull request #4348 from owncloud/fixing-4343-master
...
fixes #4343
2013-08-27 04:26:51 -07:00
163269805a
Merge pull request #4507 from owncloud/existingusersfromgroup
...
return only existing users in group
2013-08-27 03:47:56 -07:00
ea446544ef
Merge pull request #4586 from owncloud/fixing-3431-master
...
kill zh_CN.GB2312
2013-08-27 02:00:48 -07:00
6e8bc13aa3
fix weird logical behaviour
2013-08-27 10:58:17 +02:00
d3d91ce347
revert debugging code which accidentially entered this pull request
2013-08-27 10:49:10 +02:00
c9123263ab
kill zh_CN.GB2312
2013-08-27 01:27:05 +02:00
8cf9336bcb
storage information is path specific
2013-08-27 00:59:58 +02:00
1e4ebf47e2
webdav quota now displays the same values as the web interface does
2013-08-27 00:57:28 +02:00
21fd352c1a
as a quick example the public contacts API has been ported over as a service hosted within the server container
2013-08-26 23:48:18 +02:00
a995e81686
Merge branch 'master' into appframework-master
2013-08-26 21:31:15 +02:00
d1a6d2bc8f
lacy initialization of fileView - in case basic auth is used FileSystem is not yet initialized during the initialize() call
2013-08-26 20:21:16 +02:00
7d141656ee
Merge branch 'xsendfile_complete_zip_fix' of github.com:riso/owncloud-core into riso-xsendfile_complete_zip_fix from pull request #3307
...
Conflicts:
lib/helper.php
2013-08-26 18:04:49 +02:00
1f5a55ddff
consolidate validity check for users in group class
2013-08-26 17:46:31 +02:00
e6473e6d49
Clean up some cruft
2013-08-26 17:41:19 +02:00
31736a1df3
Have a controller instead ofo avatar.php and fix some cropper-design
2013-08-26 16:46:55 +02:00
81a45cfcf1
fixes #4574
2013-08-26 15:16:41 +02:00
6f0c1e8d45
Merge master into oc_preview
2013-08-26 12:24:33 +02:00
d587146a5a
[tx-robot] updated from transifex
2013-08-25 19:21:52 -04:00
9a8908b643
Use Jcrop, have inline errormsg, work on cropping, clean up, WIP
2013-08-25 21:06:44 +02:00
5eb17aadb3
Fix spacing, have remove() and return JSON for custom-default-avatars
2013-08-25 21:06:02 +02:00
81cadd5ea3
Remove gravatar and no-avatar functionality, prepare for default avatars even more and reword some stuff
2013-08-25 21:06:02 +02:00
4a9c89fb33
Clean up and prepare a bit for custom default avatars
2013-08-25 21:06:01 +02:00
9c12da6a94
Several improvements
...
- Don't use gravatars default avatars
- Use "profile image" instead of "avatar"
- Use <p> instead of tables
- Ease updateAvatar()
- Actually return something in \OCP\Avatar
2013-08-25 21:05:40 +02:00
9500109349
Refactor newavatar.php and show (for now) an alert on problems when setting new avatars
2013-08-25 21:05:40 +02:00
4521b54c67
Have /avatar.php as a central avatar-point
2013-08-25 21:04:49 +02:00
252548c62c
Improve styling & enable avatar-upload at personal page
2013-08-25 21:04:45 +02:00
a58d270684
Load avatar from path, if one's provided
2013-08-25 21:04:09 +02:00
2bfe662235
Add unittests & check filetype in setLocalAvatar()
...
TODO: Fix OC_Image->mimetype(), it always returns "image/png"
2013-08-25 21:04:09 +02:00
fac671b14e
Modularize get(), async getAvatar, avatars @ usermgmt
...
And other small improvements
2013-08-25 21:04:04 +02:00
4a08f7d710
Add basic avatars and gravatar
2013-08-25 21:02:43 +02:00
b8965c6107
Merge pull request #4331 from owncloud/improve_app-management
...
Improve app-management
2013-08-25 11:56:56 -07:00
596ac40b7f
[tx-robot] updated from transifex
2013-08-23 20:17:08 -04:00
58c727a495
fix return value of method
2013-08-23 23:27:36 +02:00
6ffa2a28d0
Merge branch 'master' into oc_preview
2013-08-23 23:10:37 +02:00
1dab076750
make it possible to disable previews
2013-08-23 23:05:44 +02:00
8dd93c8c02
Fix some phpdoc and camelcase
2013-08-23 07:30:42 +02:00
9e1016f7d2
Merge branch 'master' into fixing-4343-master
...
Conflicts:
lib/connector/sabre/quotaplugin.php
2013-08-22 17:59:39 +02:00
02b2b5a808
[tx-robot] updated from transifex
2013-08-22 10:37:23 -04:00
1c258087c9
fixing typos
2013-08-22 01:20:28 +02:00
fbc23c4a01
Merge branch 'master' of github.com:owncloud/core
2013-08-22 00:18:14 +02:00
f1eec74f70
additional readdir check in mappedlocal
2013-08-22 00:17:08 +02:00
958130e8fe
Sharing: only determine path root if owner is available
2013-08-22 00:00:40 +02:00
0ce35af02a
Merge branch 'master' into improve_app-management
...
Conflicts:
settings/js/apps.js
2013-08-21 19:20:25 +02:00
a89199cc7b
[tx-robot] updated from transifex
2013-08-21 08:14:27 -04:00
38f9df4293
introducing OCP\AppFramework\App
2013-08-21 01:02:15 +02:00
911bd3c16f
moving response classes over to OCP
2013-08-21 01:00:26 +02:00
e39083c36f
typo
2013-08-21 00:58:33 +02:00
ba029ef4b2
initial setup of the server container
2013-08-21 00:58:15 +02:00
395deacc67
reducing controller annotations to:
...
@PublicPage - No user logon is expected
@NoAdminRequired - the login user requires no admin rights
@NoCSRFRequired - the incoming request will not check for CSRF token
2013-08-20 21:21:21 +02:00
25ebe495b8
controller reuses IRequest methods
2013-08-20 21:05:55 +02:00
f115b94927
Introducing IRequest
2013-08-20 17:53:58 +02:00
6e1946ab00
Introducing IContainer into public api
2013-08-20 17:22:33 +02:00
93194bb396
Introducing IContainer into public api
2013-08-20 17:21:14 +02:00
cdada78aa4
typos & unused var fixed
2013-08-20 17:20:36 +02:00
f1518a54df
Merge branch 'master' into clean_up_util
...
Conflicts:
lib/util.php
2013-08-20 17:20:30 +02:00
0fa2e1b3d9
there is no HttpMiddleware
2013-08-20 12:48:45 +02:00
72e1a8d83b
fixing require to Pimple
2013-08-20 12:47:23 +02:00
884c6b5a82
Merge pull request #4512 from owncloud/readdir-strict-equals
...
use strict equals in readdir loops to prevent issues with '0' files
2013-08-20 01:17:25 -07:00
e9644c2f52
[tx-robot] updated from transifex
2013-08-19 15:14:38 -04:00
cbeccb2fcd
Merge branch 'master' into readdir-strict-equals
2013-08-19 17:30:56 +02:00
64c0e5d807
no assoc index here, makes tests pass again
2013-08-19 15:53:20 +02:00
d7dde3cfbc
Merge pull request #4467 from owncloud/storage-wrapper-quota
...
Move quota logic from filesystem proxy to storage wrapper
2013-08-19 03:38:55 -07:00
48f0c54261
style fixes for preview lib
2013-08-19 12:16:55 +02:00
c5402f4575
use strict equals in readdir loops to prevent issues with '0' files
2013-08-19 12:04:53 +02:00
0f7fad7166
return only existing users in group
2013-08-19 11:48:21 +02:00
f2702ff1ca
Merge master into oc_preview
2013-08-19 11:24:17 +02:00
9be836814c
Merge pull request #4239 from owncloud/decrypt_files_again
...
Enable user to decrypt files again after encryption app was disabled
2013-08-18 09:51:48 -07:00
c7af26ec84
Merge pull request #4497 from owncloud/newlines_at_eof_kondou
...
Add newlines at the end of files
2013-08-18 07:16:15 -07:00
3366bbeb8a
Port DAV groupMemberSet fix to master #4458
2013-08-18 15:54:56 +02:00
9f4bd7cb47
Don't use an alert for displaying app-mgmt-errors
...
Rather display a dominant div and mark the problematic app in the applist.
Fix #305
2013-08-18 13:49:34 +02:00
ba430a7dfa
Merge pull request #4485 from guruz/class_autoloader_optimization
...
Class Auto Loader: Cache paths in APC
2013-08-18 03:32:13 -07:00
aba64a0b81
Class Auto Loader: Cache paths in APC
...
Using benchmark_single.php (from administration repo) I can
measure a speed improvement of 5% to 20% loading the /index.php
when logged in. (when using APC and php-fpm).
2013-08-18 12:29:43 +02:00
c741a25eaa
Merge branch 'master' into improve_app-management
2013-08-18 12:15:22 +02:00
d8c71ba734
merge master in storage-wrapper-quota
2013-08-18 11:34:56 +02:00
9e8a6b704d
Add _many_ newlines at the end of files
2013-08-18 11:06:59 +02:00
65d802329f
Fix some naming and spacing in lib/util.php
2013-08-18 10:33:09 +02:00
12f4494de0
Merge pull request #4339 from owncloud/mimetype-defaults
...
Add the option to provide templates for newly created files
2013-08-17 08:42:49 -07:00
cabe92ef12
Merge branch 'master' into decrypt_files_again
...
Conflicts:
apps/files_encryption/tests/keymanager.php
2013-08-17 13:15:22 +02:00
de52157e76
remove ru_RU - fixes #3135
2013-08-17 11:43:37 +02:00
fde9cabe97
initial import of appframework
2013-08-17 11:16:48 +02:00
d43b4c52ae
also emit hooks for views that are a subfolder of the user folder
2013-08-17 10:57:31 +02:00
a0b7bf78a6
Remove disconnect function from OC_DB
2013-08-16 19:05:07 +02:00
5c9aedac1b
remove outdated quota proxy
2013-08-16 15:50:50 +02:00
8f10c9571f
fix quota wrapper reporting negative free_space, breaking user interface
...
return 0 instead
2013-08-16 15:48:45 +02:00
1e8849b04e
Merge pull request #4314 from owncloud/css-fixes
...
Design fixes
2013-08-16 01:05:29 -07:00
6bd0ba79df
[tx-robot] updated from transifex
2013-08-16 01:32:30 -04:00
399adf67b0
merge master into css-fixes
2013-08-16 00:29:43 +02:00
7279a07ca2
Merge branch 'master' into mimetype-defaults
...
Conflicts:
apps/files/ajax/newfile.php
2013-08-16 00:13:10 +02:00
4574c5cf5c
check if ->resource is a resource
2013-08-15 16:13:01 +02:00
9c5416fe4a
Clean up \OC\Util
...
- Use camelCase
- Add some phpdoc
- Fix some indents
- Use some more spacing
2013-08-15 15:57:32 +02:00
ada13a4d40
fixing all broken translation files
2013-08-15 15:41:45 +02:00
7a11911aea
add comment to make @jancborchardt happy
2013-08-15 13:25:45 +02:00
825d8610d0
fix svg and cache transparency issue
2013-08-15 13:22:05 +02:00
7fe9320ffe
improve unknown backend
2013-08-15 13:22:04 +02:00
3972198b61
Cache OC_Util::checkServer() result in session
...
The return value almost never changes but this function
is called for every request.
2013-08-15 11:58:09 +02:00
680ac48856
[tx-robot] updated from transifex
2013-08-15 04:53:54 -04:00
ca495758bd
Fix octemplate string escaping.
2013-08-14 23:06:43 +02:00
623f9ec817
don't generate previews of empty txt files
2013-08-14 21:20:31 +02:00
4b5fb08c2c
Merge master into oc_preview
2013-08-14 20:56:44 +02:00
e5761d90ef
fix deleting old previews after file changed
2013-08-14 20:49:47 +02:00
8f3f47e868
Merge pull request #4376 from owncloud/use_plurals
...
Use plural translations
2013-08-14 10:23:19 -07:00
f9b2815767
remove \OC\Preview::showErrorPreview
2013-08-14 12:21:27 +02:00
6c3efaf26c
throw exception if encryption was disabled but files are still encrypted to prevent the client from syncing unreadable files
2013-08-14 09:44:29 +02:00
53bb89824d
check if some encrypted files are left after the app was disabled and warn the user
2013-08-12 17:25:27 +02:00
f22719b1ee
Scanner: correctly pass trough reuse options when doing a recursive scan
2013-08-12 15:37:39 +02:00
5ebff8cfc4
[tx-robot] updated from transifex
2013-08-11 08:11:03 -04:00
43be3eb4d0
Changing elseif statement to what the PEAR coding guidelines say.
2013-08-09 22:32:38 +02:00
9c22046bff
Do not pass numeric strings to strtotime() when formatting dates.
...
strtotime() will return false and the date will be formatted as the 0-timestamp
(e.g. January 1, 1970 00:00) otherwise.
2013-08-09 22:32:38 +02:00
b24b208dce
Throw exceptions instead of only logging in \OC_Installer::installApp()
2013-08-09 21:57:01 +02:00
9549bd3e68
Use plural translations
2013-08-09 20:37:18 +02:00
80e9744da0
Merge branch 'master' into improve_app-management
2013-08-09 18:02:40 +02:00
605050df9b
Log exception at the catching code
2013-08-09 18:01:49 +02:00
4c0ec974b9
Merge pull request #4344 from owncloud/appmgmt-in-navigation
...
show 'More apps' link to app administration directly in app navigation
2013-08-09 08:49:41 -07:00
98f836363a
[tx-robot] updated from transifex
2013-08-09 08:06:31 -04:00
1c9d52774e
update indexes of oc_permissions
2013-08-09 09:31:53 +02:00
881e362f93
final fix for xsendfile zip generation race condition
2013-08-08 23:34:04 +02:00
a2ac5e0163
Merge pull request #4271 from owncloud/plural_translations
...
Plural translations
2013-08-08 10:34:28 -07:00
e38025ba67
Merge pull request #4151 from owncloud/doctrine-object
...
Move dbtype depending logic into object per type
2013-08-08 08:46:30 -07:00
c24bf47db8
Merge pull request #4349 from owncloud/oc_cache_fix
...
oc_cache needs to disable file proxys for read/write operation.
2013-08-08 08:19:14 -07:00
062769ab61
Remove noisy Log/Debug message
2013-08-08 16:39:33 +02:00
df358dfef5
fix function call for searUsers()
2013-08-08 13:41:04 +02:00
fed1792510
adding unit tests for quota checks
2013-08-08 13:33:00 +02:00
d3a69bf4c6
adding unit tests to determine length
2013-08-08 11:04:40 +02:00
ab6e47b44a
oc_cache needs to disable file proxys for read/write operation. Otherwise the operation will go through the encryption app which will not work.
2013-08-08 09:44:19 +02:00
fb890eee67
fixes #4343
2013-08-08 00:42:28 +02:00
d563367b0f
More style fixes
2013-08-07 22:22:33 +02:00
83988a5906
Fix stupid bug
2013-08-07 21:01:31 +02:00
0783267e2c
Move query processing after the check for prepared statement cache
2013-08-07 18:21:49 +02:00
367b248bc0
show 'More apps' link to app administration directly in app navigation
2013-08-07 18:18:09 +02:00
2cc94cbc73
Style fixes
2013-08-07 18:17:37 +02:00
a0243e03ef
use ===
2013-08-07 17:17:30 +02:00
9321eceed6
add the option to have templates for newly created files
2013-08-07 16:53:09 +02:00
fc332acf8a
split of mimetype detection code from OC_Helper, adding the option for apps to register additional mimetype mappings
2013-08-07 16:38:57 +02:00
0deae7b86f
[tx-robot] updated from transifex
2013-08-07 09:04:32 -04:00
dcc92445a0
allow permissions.user to be null as suggested by @butonic
2013-08-07 11:51:08 +02:00
1a4465f41d
Improve app-management
...
- Better error messages
- Translate untranslated strings
Basically picks non-app-dependency related stuff from #4017
2013-08-06 17:19:18 +02:00
3e7a86c6ec
remove deleted files while scanning
2013-08-06 15:59:06 +02:00
95a959b10b
merge master into doctrine-object
2013-08-06 15:43:58 +02:00
9b6357e6aa
Merge pull request #4291 from owncloud/schema
...
update DB Schema class
2013-08-05 11:29:52 -07:00
af983b843d
fix merge conflicts
2013-08-05 14:27:38 +02:00
554b1990e2
suppress is_file error msg
2013-08-05 14:23:30 +02:00
464afb5eca
use isset to prevent undefined index
2013-08-05 13:51:45 +02:00
d1a39ab01c
Merge pull request #4293 from owncloud/config-date
...
make log date configurable, default to iso 8601
2013-08-04 15:18:05 -07:00
b5f18111f4
Merge pull request #4308 from owncloud/fix-4194
...
Port log level filtering from OC_Log_Owncloud to OC_Log_Syslog.
2013-08-04 15:16:32 -07:00
0ae2bb77ba
Merge pull request #4228 from owncloud/fix-3836
...
app migrate: Use = instead of LIKE as described in the comment above.
2013-08-04 15:00:24 -07:00
33d78ab9c7
fixing PHPDoc
2013-08-04 23:13:34 +02:00
b716d035c3
fixing PHPDoc
2013-08-04 22:58:40 +02:00
5a77b67147
change long couldn't be determined string to question mark again
2013-08-04 16:27:17 +02:00
e03d9e3aa0
Port log level filtering from OC_Log_Owncloud to OC_Log_Syslog.
2013-08-04 02:48:00 +02:00
b229381dda
initialize $plural_form_string with English default
2013-08-03 23:29:31 +02:00
3534c3b373
add reveal mimetype
2013-08-03 21:59:44 +02:00
e04bf0aaeb
unit tests for plural translations added
2013-08-02 23:08:41 +02:00
35a42da3ca
PHPDoc comments adjusted *partially* - fixing call to createPluralFormFunction
2013-08-02 21:46:25 +02:00
afc8ee721d
Merge pull request #4299 from owncloud/simplify-db-transaction
...
Simplify OC_DB transaction functions
2013-08-02 12:32:41 -07:00
2af27434a4
merge master into doctrine-object
2013-08-02 19:53:04 +02:00
fd317f599b
Simplify OC_DB transaction functions
2013-08-02 16:12:34 +02:00
5ffb8fac24
Use function to create schema manager
2013-08-02 16:02:33 +02:00
821a99b937
Merge pull request #4287 from Takuto88/language-config
...
Make default language configurable via config.php
2013-08-02 06:49:54 -07:00
258e54182a
remove invalid type hinting and cleanup namespaces a bit
2013-08-02 15:09:50 +02:00
f5c3a346b0
make log date configurable, default to iso 8601
2013-08-02 13:34:20 +02:00
59c5529a2b
Rename \OC\DB\Schema to \OC\DB\MDB2SchemaManager
2013-08-02 13:19:27 +02:00
9432885428
Change OC_DB_Schema to use DI for db connection object
2013-08-02 13:14:18 +02:00
79351d064f
Make default language configurable via config.php
2013-08-02 09:41:31 +02:00
2f17dcdba8
Fix syntax error.
2013-08-01 21:46:52 +02:00
eee2c369d9
Fix copy and paste errors in l10n.php
2013-08-01 21:36:33 +02:00
9673a563b5
Create plural functions on the fly
2013-08-01 21:25:14 +02:00
1b567b2ad1
Don't throw a fatal, if is_file() parameter isn't
...
a 'valid path', but only a data/base64-string.
Related to #4283
2013-08-01 21:01:26 +02:00
495e44e76c
Update l10n.php to read plural_forms string
2013-08-01 19:54:51 +02:00
eed63ae512
Merge pull request #4221 from owncloud/fix-3698
...
Fix calculating size for empty folders
2013-08-01 08:05:19 -07:00
9253627327
cancel sharing if some users doesn't have a working encryption set-up.
2013-08-01 13:04:55 +02:00
30963d60bc
Merge pull request #4155 from owncloud/mdb2schemareader-booleans
...
Fix boolean support for xml schema definitions
2013-08-01 02:09:01 -07:00
0d69feb12e
Merge pull request #4208 from owncloud/scanner-php53
...
Fix scanner hooks throwing errors
2013-08-01 00:05:56 -07:00
b037f2dc6e
[tx-robot] updated from transifex
2013-08-01 01:57:04 -04:00
99354f9a28
fix searchUsers() call in group.php
2013-07-31 11:34:22 +02:00
50101a85a6
Merge pull request #3982 from owncloud/test_lastinsertid
...
test lastinsertid
2013-07-31 00:03:29 -07:00
761f40328c
[tx-robot] updated from transifex
2013-07-31 02:01:45 -04:00
f35aadb576
Merge pull request #4227 from owncloud/fixing-testGetById-master
...
implement a platform independent version of basename
2013-07-30 08:39:53 -07:00
93cdfc3e8a
Merge branch 'master' into oc_preview
2013-07-30 13:52:53 +02:00
640253fa31
fix code style of try catch blocks
2013-07-30 13:43:15 +02:00
d84d8f7108
fix merge conflicts
2013-07-30 12:35:39 +02:00
ac6a3133ec
style fixes
2013-07-30 12:33:54 +02:00
17c36b5074
fixes #4026
2013-07-30 10:26:42 +02:00
88e1ccbce3
[tx-robot] updated from transifex
2013-07-30 01:57:50 -04:00
f658852276
Merge branch 'master' into fixing-testGetById-master
2013-07-30 00:37:05 +02:00
7425efade7
Merge branch 'master' into oc_preview
...
Conflicts:
3rdparty
lib/template.php
2013-07-30 00:34:36 +02:00
085fdfec2f
adding unit tests for OC_Util::basename
2013-07-29 23:32:03 +02:00
7c6246fa45
Merge pull request #4213 from owncloud/scanning-performance
...
Cache: don't check if the parent exists in the cache if we are already sure it does
2013-07-29 13:08:23 -07:00
89f8f8e42d
app migrate: Use = instead of LIKE as described in the comment above.
...
The LIKE operator is not defined on integers (probably any non-text) columns
on PostgreSQL.
2013-07-29 18:41:22 +02:00
74c54587ec
better variable naming
2013-07-29 18:27:19 +02:00
e2d3225e5a
implement a platform independent version of basename
2013-07-29 18:24:05 +02:00
dea3472ad7
remove unneeded 'use'
2013-07-29 17:04:28 +02:00
64774f30ba
dont need to explicitly pass by reference
2013-07-29 17:03:57 +02:00
d6c56b584a
make MDB2Schema reader non static
2013-07-29 16:33:00 +02:00
fbbe0ebe77
add function to get config object from OC_Config
2013-07-29 16:32:37 +02:00
1faac6108c
Use query to calculate folder size
2013-07-29 10:22:44 -04:00
1e4ec2ac27
add class='preview-icon' to rows in file app that make use of previews
2013-07-29 15:47:17 +02:00
e01bc7de98
Revert "OC\Preview - outsource static methods"
...
This reverts commit 14a35267c1
2013-07-29 14:51:06 +02:00
65affdc9b3
make previews in files app smaller
2013-07-29 14:40:26 +02:00
954b5d9019
Merge pull request #4216 from owncloud/clean_php55_opcache
...
Also clean PHP 5.5 opcache
2013-07-29 04:40:01 -07:00
05fa55f2eb
always return int
2013-07-29 02:17:09 +02:00
dd4e33fe6b
Fix calculating size for empty folders
2013-07-28 16:14:49 -04:00
c8e60900fc
Move check so the variable will never be undefined
2013-07-28 15:32:48 -04:00
8cd671c207
Also clean PHP 5.5 opcache
2013-07-28 16:33:03 +02:00
48621115c1
[tx-robot] updated from transifex
2013-07-28 01:58:28 -04:00
e1e7b6a940
Cache: don't check if the parent exists in the cache if we are already sure it does
2013-07-27 11:36:27 +02:00
fa35650e0a
[tx-robot] updated from transifex
2013-07-27 02:03:03 -04:00
d7916363e1
Make DB connection available to use for dependency injection
2013-07-26 20:36:48 +02:00
59bdba9bac
fix scanner hooks, cant use inside closures in php 5.3
2013-07-26 15:43:10 +02:00
88cc2ccb3b
use renamed constants
2013-07-25 16:14:46 +02:00
e2f04b3b42
use storage wrapper for quota instead of a filesystem proxy
2013-07-25 16:01:37 +02:00
5209cff371
add conveince function to wrap all storages
2013-07-25 16:01:05 +02:00
d042c8f166
use renamed constants
2013-07-25 16:00:48 +02:00
f4b6a8aa08
add option to wrap existing mounts
2013-07-25 16:00:24 +02:00
4e490b0688
fix getPermissionsCache for storage wrapper
2013-07-25 15:59:57 +02:00
1b50154c95
functions in OCP should be static
2013-07-25 15:25:17 +02:00
75e93d041d
Merge pull request #3887 from owncloud/apc_user_cache
...
The APC User Cache doesn't return the cache_list anymore
* owncloud/apc_user_cache:
Add ACPu memory cache
2013-07-25 03:48:26 +02:00
cd8f0c21ce
add quota storage wrapper
2013-07-25 00:31:51 +02:00
10d3e63ce5
add quota streamwrapper that limits the amount of data that can be written to a stream
2013-07-25 00:31:51 +02:00
94560c68ba
rename constants
2013-07-25 00:29:27 +02:00
25003fb213
Add ACPu memory cache
2013-07-24 21:50:15 +02:00
ff86b6f134
Merge pull request #4183 from owncloud/fix-group-id
...
Fix group id naming fid->gid
2013-07-24 11:09:47 -07:00
1986416248
Merge pull request #3898 from owncloud/sabre-objecttree
...
WebDAV performance improvements
2013-07-24 10:46:27 -07:00
4e3bfd8ddd
Fix group id naming fid->gid
2013-07-24 17:54:31 +02:00
9b1866f1ac
merge master
2013-07-24 16:31:01 +02:00
ad266a4253
Merge branch 'master' into sabre-objecttree
2013-07-24 15:53:48 +02:00
651479322b
Merge pull request #4177 from owncloud/move_defaults_to_template_constructor
...
Move defaults to template constructor
2013-07-24 06:42:52 -07:00
98858e6f00
Merge pull request #3995 from owncloud/groups
...
Refactoring of group management code
2013-07-24 06:13:05 -07:00
75fd6d4fde
initialize OC_Defaults in template constructorX
2013-07-24 11:51:21 +02:00
2622839fcf
Merge pull request #4171 from owncloud/fix-config
...
Fix config
2013-07-24 00:48:43 -07:00
1a73e607bd
Merge branch 'master' into more-themable-strings
...
Conflicts:
lib/template.php
2013-07-24 09:35:33 +02:00
60ce492fac
Merge branch 'master' into groups
2013-07-24 01:11:12 +02:00
5fc0535f1b
Merge pull request #4090 from owncloud/cleanup-some-template-functions
...
Cleanup some template functions
2013-07-23 15:53:43 -07:00
793ff0fec9
Fix lastInsertId for OCI8 adapter
2013-07-23 22:16:04 +02:00
fb40d9e1e6
Merge branch 'master' into groups
2013-07-23 22:06:03 +02:00
7ad38535e5
Merge pull request #3392 from owncloud/googledrive
...
Switch to using Google Drive SDK, closes #2047
2013-07-23 12:23:08 -07:00
93b227d803
shorten wording on config directory errors
2013-07-23 18:41:00 +02:00
3eb5fff02a
Add documentation to OC\DB\adapter class
2013-07-23 18:09:42 +02:00
485e8ab0a5
ignore config read failures
2013-07-23 17:38:37 +02:00
5caa7576d4
Revert "fix failing master branch - Test_Config::testWriteData"
...
This reverts commit 8f93490ac4
2013-07-23 17:36:08 +02:00
f7422ad132
Merge pull request #4150 from owncloud/better-error-handling
...
Better error handling
2013-07-23 08:30:02 -07:00
a94c55be98
[tx-robot] updated from transifex
2013-07-23 02:03:19 -04:00
179b42c56d
Fixed review issues
2013-07-22 23:04:14 +02:00
499a01f179
use ===
2013-07-22 17:41:33 +02:00
cb4cf3e2f7
need to use \OC_Image to escape OCP namespace
2013-07-22 17:25:55 +02:00
bc86ce00cf
Merge pull request #4154 from owncloud/return-ocl10n
...
return result from getL10N
2013-07-22 08:05:32 -07:00
b073a34e77
add support for the <primary/> element within field definitions
2013-07-22 16:25:07 +02:00
dc272e6e20
db: cast default values for boolean fields to booleans
2013-07-22 16:24:46 +02:00
d509a0c403
return result from getL10N
2013-07-22 15:52:02 +02:00
f1e939e1a3
Merge branch 'master' into fix_return_value_search_principals
2013-07-22 15:30:57 +02:00
be7c613993
Fix errors from unit tests
2013-07-21 23:17:37 +02:00
b66c9098bd
Correct namespace of OC_ classes
2013-07-21 23:17:37 +02:00
000b5a801f
Move building error string to connection
2013-07-21 23:17:37 +02:00
de83bf98c7
Group database connection and schema function
2013-07-21 23:17:37 +02:00
013333fe6a
Cleanup: remove code for multiple database backends
2013-07-21 23:17:37 +02:00
3e0e2cfa19
Use $connection for schema changes
2013-07-21 23:17:37 +02:00
8a332cdc94
Simplify OC_DB transaction functions
2013-07-21 23:17:37 +02:00
19b9c89634
Move insertIfNotExist to Connection wrapper
...
Real implementation is in DB\Adapter* classes
2013-07-21 23:17:37 +02:00
58991150ab
Move query statement fixup handling to Connection wrapper
2013-07-21 23:17:37 +02:00
1d5d23a1de
Move limit/offset handling to Connection wrapper
2013-07-21 23:17:37 +02:00
a48e9c488b
Move prepared query cache handling to Connection wrapper
2013-07-21 23:17:36 +02:00
e3c5fea989
Move lastInsertId to adapter classes
2013-07-21 23:17:36 +02:00
cd98ff1eaf
Move db prefix handling to Connection wrapper
2013-07-21 23:17:36 +02:00
66a215651b
Create DB Connection wrapper and DB\Adapter* classes
2013-07-21 23:17:36 +02:00
62ce3a5613
Only close db connection when disconnecting, keep the connection object
2013-07-21 23:17:36 +02:00
25e3c9cbeb
Only display call trace in debug mode
2013-07-21 22:56:21 +02:00
aa22194a09
In debug mode uncaught exceptions should display a nice page
2013-07-21 22:40:35 +02:00
8c5df31c49
DRY use OC_Template::printErrorPage
2013-07-21 22:30:32 +02:00
df8ad46dae
Change exit calls to throwing an exception
...
This way the error won't be fatal in a unit test
2013-07-21 22:29:50 +02:00
6d39e0ad6f
Change to use !== and ===
2013-07-21 21:42:42 +02:00
01c39cf2be
fixing typos, PHPDoc and missing namespace \
2013-07-21 21:42:42 +02:00
3de8570e35
Move basic template functions to their own class
2013-07-21 21:42:42 +02:00
2593395561
Move template functions to there own file
2013-07-21 21:37:25 +02:00
5965f3ecea
Split locating JS and CSS files to their own class
2013-07-21 21:36:15 +02:00
37a731bcad
Merge pull request #4131 from owncloud/scanner-split
...
Remove scanner logic from ajax file and place it in it's own class
2013-07-21 11:32:11 -07:00
639097db59
Merge pull request #4092 from owncloud/base-better-errors
...
Generate better errors in base.php
2013-07-21 11:20:30 -07:00
9bf12da750
Merge pull request #3880 from owncloud/code-checker
...
Add classes replaced by the public api to the code checker
2013-07-21 11:19:20 -07:00
8f93490ac4
fix failing master branch - Test_Config::testWriteData
2013-07-21 11:13:29 +02:00
05c83a163a
add proper deprecated tag
2013-07-21 10:30:00 +02:00
Thomas Müller
Bernhard Posselt
Andreas Fischer
Robin Appelman
kondou
VicDeo
Axel Roenn
Bjoern Schiessle
Arthur Schiwon
Georg Ehrke
Thomas Tanghus
Morris Jobke
Jörn Friedrich Dreyer
Bart Visscher
Frank Karlitschek
Jan-Christoph Borchardt
Stephane Martin
Tom Needham
Stephane Martin
icewind1991
Björn Schießle
Markus Goetz
Valerio Ponte
Owen Winkler
Bernhard Posselt
Lennart Rosam
Jakob Sack
Michael Gapczynski