kondou
33827d690e
Use avatar.php in user-management
2013-08-25 21:05:38 +02:00
kondou
131d0edab6
Show avatar on personal.php always (except if avatars are disabled)
2013-08-25 21:04:49 +02:00
kondou
4521b54c67
Have /avatar.php as a central avatar-point
2013-08-25 21:04:49 +02:00
kondou
252548c62c
Improve styling & enable avatar-upload at personal page
2013-08-25 21:04:45 +02:00
kondou
a58d270684
Load avatar from path, if one's provided
2013-08-25 21:04:09 +02:00
kondou
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
kondou
fac671b14e
Modularize get(), async getAvatar, avatars @ usermgmt
...
And other small improvements
2013-08-25 21:04:04 +02:00
kondou
4a08f7d710
Add basic avatars and gravatar
2013-08-25 21:02:43 +02:00
Christopher
b8965c6107
Merge pull request #4331 from owncloud/improve_app-management
...
Improve app-management
2013-08-25 11:56:56 -07:00
kondou
fbe7a68ce8
Use personal-password for the password name in personal.php
...
Fix #4491
2013-08-24 14:31:32 +02:00
Jenkins for ownCloud
596ac40b7f
[tx-robot] updated from transifex
2013-08-23 20:17:08 -04:00
Georg Ehrke
58c727a495
fix return value of method
2013-08-23 23:27:36 +02:00
Georg Ehrke
13e34649bf
move path generation for previews to dedicated function
2013-08-23 23:19:21 +02:00
Georg Ehrke
6ffa2a28d0
Merge branch 'master' into oc_preview
2013-08-23 23:10:37 +02:00
Georg Ehrke
1dab076750
make it possible to disable previews
2013-08-23 23:05:44 +02:00
kondou
8dd93c8c02
Fix some phpdoc and camelcase
2013-08-23 07:30:42 +02:00
dampfklon
87c3f34a93
Make group suffix in share dialog translatable
2013-08-22 19:52:08 +02:00
Thomas Müller
9e1016f7d2
Merge branch 'master' into fixing-4343-master
...
Conflicts:
lib/connector/sabre/quotaplugin.php
2013-08-22 17:59:39 +02:00
Jenkins for ownCloud
02b2b5a808
[tx-robot] updated from transifex
2013-08-22 10:37:23 -04:00
Thomas Müller
582b33bdf1
Merge pull request #4537 from owncloud/no-realpath
...
Do not use realpath() on includes.
2013-08-22 01:50:31 -07:00
Thomas Müller
1c258087c9
fixing typos
2013-08-22 01:20:28 +02:00
Thomas Müller
fbc23c4a01
Merge branch 'master' of github.com:owncloud/core
2013-08-22 00:18:14 +02:00
Thomas Müller
f1eec74f70
additional readdir check in mappedlocal
2013-08-22 00:17:08 +02:00
Thomas Müller
101cfa2359
remove duplicate code
2013-08-22 00:09:43 +02:00
Arthur Schiwon
958130e8fe
Sharing: only determine path root if owner is available
2013-08-22 00:00:40 +02:00
Arthur Schiwon
c482512e23
LDAP: fix wrong hook name
2013-08-22 00:00:33 +02:00
kondou
0ce35af02a
Merge branch 'master' into improve_app-management
...
Conflicts:
settings/js/apps.js
2013-08-21 19:20:25 +02:00
Georg Ehrke
224b80f906
move isMimeSupported out of template files
2013-08-21 15:55:59 +02:00
Jenkins for ownCloud
a89199cc7b
[tx-robot] updated from transifex
2013-08-21 08:14:27 -04:00
Andreas Fischer
83afb46205
Use __DIR__ instead of dirname(__FILE__).
...
This is possible because we require PHP 5.3 or higher.
2013-08-21 11:01:24 +02:00
Andreas Fischer
85ac9572ce
Also remove other unnecessary realpath() calls.
2013-08-21 10:53:18 +02:00
Andreas Fischer
9753e44ac2
Do not use realpath() on includes.
...
If the file does not exist, realpath() returns false and "include false;"
produces "Failed opening '' for inclusion" which is a useless error message.
'include' works just fine with symlinks, "./" and "../".
2013-08-21 10:52:22 +02:00
Thomas Müller
38f9df4293
introducing OCP\AppFramework\App
2013-08-21 01:02:15 +02:00
Thomas Müller
911bd3c16f
moving response classes over to OCP
2013-08-21 01:00:26 +02:00
Thomas Müller
e39083c36f
typo
2013-08-21 00:58:33 +02:00
Thomas Müller
ba029ef4b2
initial setup of the server container
2013-08-21 00:58:15 +02:00
Thomas Müller
aa979f5dff
cleanup of tests
2013-08-21 00:44:39 +02:00
Thomas Müller
33db8a3089
kill superfluent classloader from tests - this approach might be of interest within the apps
2013-08-21 00:41:20 +02:00
Christopher
90da518e3e
Merge pull request #4262 from owncloud/fix_jslint_kondou
...
Fix some JSLint warnings
2013-08-20 12:45:10 -07:00
Thomas Müller
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
Thomas Müller
25ebe495b8
controller reuses IRequest methods
2013-08-20 21:05:55 +02:00
Thomas Müller
f115b94927
Introducing IRequest
2013-08-20 17:53:58 +02:00
Thomas Müller
6e1946ab00
Introducing IContainer into public api
2013-08-20 17:22:33 +02:00
Thomas Müller
93194bb396
Introducing IContainer into public api
2013-08-20 17:21:14 +02:00
Thomas Müller
cdada78aa4
typos & unused var fixed
2013-08-20 17:20:36 +02:00
kondou
f1518a54df
Merge branch 'master' into clean_up_util
...
Conflicts:
lib/util.php
2013-08-20 17:20:30 +02:00
Thomas Müller
0fa8f38076
fixing broken test
2013-08-20 16:51:12 +02:00
Thomas Müller
0fa2e1b3d9
there is no HttpMiddleware
2013-08-20 12:48:45 +02:00
Thomas Müller
72e1a8d83b
fixing require to Pimple
2013-08-20 12:47:23 +02:00
Morris Jobke
de949b1caa
Merge pull request #4447 from owncloud/fix_4351_master
...
Use JSON to send/receive group data.
2013-08-20 02:49:48 -07:00