820fd42161
Merge branch 'master' into oc_avatars
2013-09-04 12:56:40 +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
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
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
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
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
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
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
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
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
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
f1518a54df
Merge branch 'master' into clean_up_util
...
Conflicts:
lib/util.php
2013-08-20 17:20:30 +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
kondou
Morris Jobke
Jenkins for ownCloud
blizzz
Jörn Friedrich Dreyer
Robin Appelman
Frank Karlitschek
Georg Ehrke
Jan-Christoph Borchardt
Stephane Martin
Bart Visscher
Thomas Tanghus
Tom Needham
Stephane Martin