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 |
|
kondou
|
74c9223281
|
Properly check for tmpavatar, invalidate cache, fix debug msgs
|
2013-09-01 21:17:48 +02:00 |
|
Robin Appelman
|
a22f9ff301
|
Provide an implementation of the fileapi for oc6 build on top of the old api
|
2013-09-01 19:47:48 +02:00 |
|
Jenkins for ownCloud
|
e68b5f8b0d
|
[tx-robot] updated from transifex
|
2013-09-01 13:30:40 -04:00 |
|
kondou
|
76b1b5b6a3
|
Provide 'enable_avatars' in config.php, to disable avatars
|
2013-09-01 18:17:14 +02:00 |
|
kondou
|
ab70b8c26e
|
Merge branch 'master' into oc_avatars
|
2013-09-01 17:52:13 +02:00 |
|
Christopher
|
36424580b0
|
Merge pull request #4329 from owncloud/fix_4258
Fix #4258 and improve unittest
|
2013-09-01 08:46:27 -07:00 |
Bart Visscher
|
0aba549e7f
|
Use more object oriented way for console commands
|
2013-09-01 16:40:50 +02:00 |
|
kondou
|
2d6a400381
|
Check for $this->fileInfo and @depend on testData()
|
2013-09-01 15:50:58 +02:00 |
Frank Karlitschek
|
c54994d2e9
|
fixing this obvious typo directly
|
2013-09-01 08:23:11 +02:00 |
|
kondou
|
235638e5ab
|
Merge branch 'master' into fix_4258
Conflicts:
lib/image.php
|
2013-08-31 23:48:23 +02:00 |
|
Frank Karlitschek
|
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 |
|
Frank Karlitschek
|
58e036e304
|
remove knowledgebase calls that are no longer used in ownCloud 5/6
|
2013-08-31 18:00:53 +02:00 |
|
kondou
|
5d653753bd
|
Merge branch 'master' into oc_avatars
|
2013-08-31 12:56:36 +02:00 |
|
kondou
|
0869f9b655
|
Fix #4258, clean up \OC_Image and improve its unittest
|
2013-08-30 21:08:37 +02:00 |
|
Georg Ehrke
|
8ef40277b2
|
Merge master into oc_preview
|
2013-08-30 18:11:18 +02:00 |
Jan-Christoph Borchardt
|
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 |
|
Jenkins for ownCloud
|
dbc78b1a58
|
[tx-robot] updated from transifex
|
2013-08-30 09:38:20 -04:00 |
Stephane Martin
|
95f42d6544
|
Merge pull request #4578 from houbaastef/master
fixes #4574
|
2013-08-30 06:20:07 -07:00 |
|
kondou
|
30526ded80
|
Fix \OCP\Avatar
|
2013-08-30 13:26:13 +02:00 |
|
Arthur Schiwon
|
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 |
|
Jan-Christoph Borchardt
|
9c23ed580a
|
move CSS for browser-specific fixes out of styles.css into new fixes.css
|
2013-08-30 11:42:32 +02:00 |
|
Jan-Christoph Borchardt
|
cc8e19ad11
|
move CSS for apps out of styles.css into new apps.css
|
2013-08-30 11:38:49 +02:00 |
|
kondou
|
ecf187393b
|
Finish cropper, Get rid of TODOs, Improve \OCP\Avatar and "fix" unitests
|
2013-08-30 09:00:37 +02:00 |
|
Thomas Müller
|
0104d3df96
|
Merge pull request #4592 from owncloud/fix-logic
fix weird logical behaviour
|
2013-08-29 08:40:33 -07:00 |
|
Georg Ehrke
|
728fc7f123
|
fix parameter missing warning
|
2013-08-29 16:13:16 +02:00 |
|
Robin Appelman
|
1fa29b4c11
|
also emmit create hook when creating new files using touch()
|
2013-08-29 15:31:03 +02:00 |
|
kondou
|
0c708be76b
|
Use defaultavatars
|
2013-08-29 14:26:11 +02:00 |
|
Thomas Müller
|
301cce54cc
|
webdav quota information contains the values for used and free - not total
|
2013-08-29 12:34:48 +02:00 |
|
Georg Ehrke
|
b7758d0f8d
|
Merge master into oc_preview
|
2013-08-29 10:50:55 +02:00 |
|
Georg Ehrke
|
70b6e2161e
|
invert logic of disable_previews
|
2013-08-29 10:08:53 +02:00 |
|
kondou
|
0ba498119c
|
Merge branch 'master' into oc_avatars
Conflicts:
3rdparty
|
2013-08-28 23:21:26 +02:00 |
|
kondou
|
bdf48a6daa
|
Use OC.Router.generate, TODO use cache, prepare for defaultavatars
|
2013-08-28 21:20:28 +02:00 |
|
Morris Jobke
|
d4952bd9df
|
fix typo
|
2013-08-28 18:36:32 +02:00 |
|
Bart Visscher
|
3fd2df4088
|
Only enable logrotate when configured. Also rotate size is settable.
|
2013-08-28 17:41:27 +02:00 |
|
Bart Visscher
|
42f3ecb60f
|
Check for installed state before registering the logrotate background job
|
2013-08-28 17:11:43 +02:00 |
|
Bart Visscher
|
62560ef859
|
Add description to log rotate class
|
2013-08-28 17:11:43 +02:00 |
|
Bart Visscher
|
594a2af75a
|
Review fixes
|
2013-08-28 17:11:43 +02:00 |
|
Bart Visscher
|
b5e2842e00
|
Very simple log rotation
|
2013-08-28 17:11:43 +02:00 |
|
kondou
|
67c5be9f19
|
Merge branch 'master' into oc_avatars
Conflicts:
3rdparty
|
2013-08-28 16:44:11 +02:00 |
|
kondou
|
8d8a57de7f
|
Continue work on cropper
|
2013-08-28 16:39:00 +02:00 |
|
Bart Visscher
|
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 |
Thomas Tanghus
|
9843c8e838
|
Merge pull request #4434 from owncloud/fix_octemplate_escaping
Fix octemplate string escaping.
|
2013-08-28 03:59:43 -07:00 |
|
Jenkins for ownCloud
|
3e7ddbc9d9
|
[tx-robot] updated from transifex
|
2013-08-28 06:24:14 -04:00 |
|
Jenkins for ownCloud
|
d5062b9e0e
|
[tx-robot] updated from transifex
|
2013-08-27 11:23:18 -04:00 |
|
Morris Jobke
|
e91edabe0f
|
add documentation
|
2013-08-27 16:07:25 +02:00 |
Tom Needham
|
273f162b26
|
Code style
|
2013-08-27 15:39:47 +02:00 |
|
Tom Needham
|
f14ce1efdc
|
Add quota to core api
|
2013-08-27 15:39:43 +02:00 |
|
Jörn Friedrich Dreyer
|
13514fd1ad
|
Merge pull request #4348 from owncloud/fixing-4343-master
fixes #4343
|
2013-08-27 04:26:51 -07:00 |
|
blizzz
|
163269805a
|
Merge pull request #4507 from owncloud/existingusersfromgroup
return only existing users in group
|
2013-08-27 03:47:56 -07:00 |
|
Morris Jobke
|
ea446544ef
|
Merge pull request #4586 from owncloud/fixing-3431-master
kill zh_CN.GB2312
|
2013-08-27 02:00:48 -07:00 |
|
Morris Jobke
|
6e8bc13aa3
|
fix weird logical behaviour
|
2013-08-27 10:58:17 +02:00 |
|
Thomas Müller
|
d3d91ce347
|
revert debugging code which accidentially entered this pull request
|
2013-08-27 10:49:10 +02:00 |
|
Thomas Müller
|
c9123263ab
|
kill zh_CN.GB2312
|
2013-08-27 01:27:05 +02:00 |
|
Thomas Müller
|
8cf9336bcb
|
storage information is path specific
|
2013-08-27 00:59:58 +02:00 |
|
Thomas Müller
|
1e4ebf47e2
|
webdav quota now displays the same values as the web interface does
|
2013-08-27 00:57:28 +02:00 |
|
Thomas Müller
|
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 |
|
Morris Jobke
|
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 |
|
Arthur Schiwon
|
1f5a55ddff
|
consolidate validity check for users in group class
|
2013-08-26 17:46:31 +02:00 |
|
kondou
|
e6473e6d49
|
Clean up some cruft
|
2013-08-26 17:41:19 +02:00 |
|
kondou
|
31736a1df3
|
Have a controller instead ofo avatar.php and fix some cropper-design
|
2013-08-26 16:46:55 +02:00 |
Stephane Martin
|
81a45cfcf1
|
fixes #4574
|
2013-08-26 15:16:41 +02:00 |
|
Georg Ehrke
|
6f0c1e8d45
|
Merge master into oc_preview
|
2013-08-26 12:24:33 +02:00 |