Bernhard Posselt
|
a58e176852
|
Merge pull request #4506 from owncloud/oc_avatars
OC Avatars
|
2013-09-14 16:00:36 -07:00 |
|
Jenkins for ownCloud
|
556bd1ef23
|
[tx-robot] updated from transifex
|
2013-09-13 21:49:24 -04:00 |
|
Thomas Müller
|
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 |
|
Thomas Müller
|
049e57ac4a
|
remove unused OC_L10N
|
2013-09-13 17:41:09 +02:00 |
|
Thomas Müller
|
8c9add4d32
|
adding TB and GB to OC_Helper::humanFileSize
|
2013-09-13 17:22:45 +02:00 |
|
Thomas Müller
|
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 |
|
Robin Appelman
|
58ed78aa9e
|
cleanup public storage interface a bit
|
2013-09-12 21:58:32 +02:00 |
|
Robin Appelman
|
c9d2663159
|
Merge branch 'master' into fileapi-foreward
|
2013-09-12 21:43:35 +02:00 |
|
kondou
|
c9c5e1b97f
|
Merge branch 'master' into oc_avatars
|
2013-09-12 07:41:44 +02:00 |
|
Thomas Müller
|
8543951cf9
|
adding icons for shared folders and external folders
|
2013-09-12 00:12:20 +02:00 |
|
VicDeo
|
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 |
|
Jenkins for ownCloud
|
68015b2761
|
[tx-robot] updated from transifex
|
2013-09-11 06:50:06 -04:00 |
|
kondou
|
bf7f94422f
|
Bring another enable_avatars to $_ and fix $thus->$this
|
2013-09-11 07:11:33 +02:00 |
|
Thomas Müller
|
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 |
|
Andreas Fischer
|
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 |
|
Robin Appelman
|
2e5ce091f0
|
add storage backend interface to public namespace
|
2013-09-10 20:13:47 +02:00 |
|
Robin Appelman
|
9ad7891b4e
|
improve phpdoc for the public files interface
|
2013-09-10 20:10:25 +02:00 |
|
Robin Appelman
|
e271a55783
|
move filesystem expceptions to global namespace
|
2013-09-10 19:44:23 +02:00 |
|
Robin Appelman
|
315344eb9c
|
move public files api to a clearer namespace
|
2013-09-10 19:34:38 +02:00 |
|
Jenkins for ownCloud
|
72689f643b
|
[tx-robot] updated from transifex
|
2013-09-10 10:42:16 -04:00 |
|
Thomas Müller
|
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 |
|
Thomas Müller
|
5e1821f21d
|
Merge pull request #4772 from owncloud/preview_improvements
oc\preview use avconv instead of ffmpeg
|
2013-09-09 12:32:45 -07:00 |
|
kondou
|
1832eb8872
|
Pass view in \OC_Avatar to constructor and use $_ for enable_avatars
|
2013-09-09 16:57:46 +02:00 |
|
Jenkins for ownCloud
|
92f6c3bb10
|
[tx-robot] updated from transifex
|
2013-09-08 21:37:53 -04:00 |
|
Robin Appelman
|
46a57a9f05
|
change View->deleteAll to an alias of View->rmdir since rmdir works recursive
|
2013-09-07 14:10:51 +02:00 |
|
Jenkins for ownCloud
|
e895cf9188
|
[tx-robot] updated from transifex
|
2013-09-07 04:46:57 -04:00 |
|
Robin Appelman
|
2e1b534957
|
update phpdoc for public fileapi
|
2013-09-06 20:55:47 +02:00 |
|
Robin Appelman
|
0131a32025
|
extract interfaces from fileapi for public namespace
|
2013-09-06 20:38:59 +02:00 |
|
Robin Appelman
|
1cfd03771f
|
use ===
|
2013-09-06 20:20:17 +02:00 |
|
Bjoern Schiessle
|
b8241aa79d
|
remove some more debug output
|
2013-09-06 16:07:54 +02:00 |
|
Bjoern Schiessle
|
edb78c917c
|
remove some error_logs
|
2013-09-06 16:07:45 +02:00 |
|
Bjoern Schiessle
|
d33fabd02d
|
remove error logs
|
2013-09-06 16:07:25 +02:00 |
|
Bjoern Schiessle
|
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 |
|
Thomas Müller
|
e9849270e3
|
Revert "fixes #4574"
This reverts commit 81a45cfcf1.
|
2013-09-06 00:28:13 +02:00 |
|
kondou
|
221bbd275c
|
Use \OC_App for checking whether encryption is enabled
|
2013-09-05 23:26:02 +02:00 |
|
Jenkins for ownCloud
|
0527fb05ad
|
[tx-robot] updated from transifex
|
2013-09-05 07:37:32 -04:00 |
|
Arthur Schiwon
|
c01675de5d
|
more is_resource checks before readdir
|
2013-09-05 11:58:57 +02:00 |
|
Georg Ehrke
|
2954db165b
|
use avconv instead of ffmpeg
|
2013-09-05 09:53:35 +02:00 |
|
Bernhard Posselt
|
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 |
|
kondou
|
b643c02bd5
|
Fix some bugs and remove \OCP\Avatar for now
|
2013-09-04 22:13:59 +02:00 |
|
Thomas Müller
|
68dce9dde5
|
fixing style, var name & PHPDoc
|
2013-09-04 21:22:36 +02:00 |
|
Arthur Schiwon
|
ec3639dc7a
|
Always check variable type before using readdir to avoid surprises
|
2013-09-04 13:06:04 +02:00 |
|
kondou
|
820fd42161
|
Merge branch 'master' into oc_avatars
|
2013-09-04 12:56:40 +02:00 |
|
Morris Jobke
|
09187f3b3b
|
Merge pull request #4449 from owncloud/clean_up_util
Clean up \OC\Util
|
2013-09-03 22:53:03 -07:00 |
|
Jenkins for ownCloud
|
fe0b8ac2c0
|
[tx-robot] updated from transifex
|
2013-09-03 07:46:55 -04:00 |
|
kondou
|
65413a95dc
|
Merge branch 'master' into oc_avatars
Conflicts:
config/config.sample.php
|
2013-09-03 04:43:11 +02:00 |
|
blizzz
|
431cf06e99
|
Merge pull request #4672 from owncloud/ocs_cleanup
Ocs cleanup
|
2013-09-02 14:24:46 -07:00 |
|
kondou
|
e7e3f1b81a
|
Fix some of @jancborchardt's complaints in oc_avatars
|
2013-09-02 17:07:38 +02:00 |
|
Jörn Friedrich Dreyer
|
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 |
|
kondou
|
e5fc7b9dbe
|
Merge branch 'master' into clean_up_util
Conflicts:
lib/base.php
|
2013-09-02 07:58:06 +02:00 |
|