Björn Schießle
996b5cf368
change order, key -> uid and value -> display name, this way it is also possible to have non-unique display names
2013-01-28 13:10:54 +01:00
Björn Schießle
a606e8d944
use display name to show share_width and owner information
2013-01-25 17:40:23 +01:00
Björn Schießle
b4291f1e8e
allow to get the display name from an abitrary user
2013-01-25 13:00:17 +01:00
Björn Schießle
4271430e60
get all display names from users in a given group
2013-01-25 11:48:03 +01:00
Björn Schießle
9bb8e05839
get all display names
2013-01-25 11:05:00 +01:00
Björn Schießle
2fee1208ef
add display name to title instead if login-ID
2013-01-24 15:49:23 +01:00
Björn Schießle
d16574f070
new branch which introduces display names
...
first commit with some infrastructure code
2013-01-24 13:07:59 +01:00
Lukas Reschke
f9a9fc5670
Merge pull request #1265 from j-ed/master
...
add additional mail_smtp.. parameters to fix possible SMTP connection problems.
2013-01-24 00:11:03 -08:00
Jenkins for ownCloud
3ff32eba25
[tx-robot] updated from transifex
2013-01-24 00:07:38 +01:00
Jenkins for ownCloud
c986dbe573
[tx-robot] updated from transifex
2013-01-23 00:06:18 +01:00
Michael Gapczynski
9eecb91338
Merge pull request #1113 from owncloud/fix-issue-1085
...
Fix rendering of database connection error page
2013-01-22 14:38:44 -08:00
Thomas Müller
ec8609fa21
Merge pull request #1259 from TheSFReader/master
...
Add two specific mimetype extensions (ebooks): for epub and mobi files
2013-01-22 14:06:50 -08:00
Sam Tuke
aa648fca75
Merge branch 'master' into files_encryption
...
Conflicts:
apps/files_encryption/templates/settings.php
2013-01-22 17:31:05 +00:00
Sam Tuke
619780a67d
Merge branch 'master' into files_encryption
2013-01-22 16:50:20 +00:00
j-ed
df6ba6955d
Update lib/mail.php
...
Added three additional mail_smtp.. parameters.
- mail_smtpdebug - enable debug messages to analyse SMTP problems.
- mail_smtptimeout - set SMTP timeout which is set to 10s by
default and this is sometimes to short especially if a malware/
spam scanner is used.
- mail_smtpsecure - force secure SMTP connections.
2013-01-22 14:13:24 +01:00
Michael Gapczynski
5136f6d818
Make database connection error messages less verbose
2013-01-21 22:53:32 -05:00
Thomas Mueller
d58cee2f76
returning http status code 503 in case connecting to the database failed
2013-01-21 14:57:33 +01:00
Jenkins for ownCloud
aede26d996
[tx-robot] updated from transifex
2013-01-21 00:05:34 +01:00
Thomas Mueller
dea77b7610
cached queries need to be reset on schema change because they become invalid
...
fixes: https://github.com/owncloud/apps/issues/468
2013-01-20 22:46:26 +01:00
Jenkins for ownCloud
ebc0c4b85b
[tx-robot] updated from transifex
2013-01-20 00:06:40 +01:00
Lukas Reschke
42b924da0e
Also replace the backslash with a minus
...
For Windows systems
2013-01-19 19:47:26 +01:00
Bernhard Posselt
f1939866f3
Merge pull request #1214 from Raydiation/master
...
Load Classpaths of apps before appinfo/routes.php
2013-01-19 09:44:48 -08:00
Jenkins for ownCloud
a17ca3a69a
[tx-robot] updated from transifex
2013-01-19 00:05:38 +01:00
Thomas Müller
31cc9aa80d
Merge pull request #986 from owncloud/fixing-784-master
...
the maximum upload size is now part of the response of the upload and de...
2013-01-18 14:06:00 -08:00
Thomas Mueller
5ff29b4348
fixing indent
2013-01-18 20:09:03 +01:00
davidgumberg
487e401361
Typo fix (comment) /lib/base.php
2013-01-18 10:52:29 -08:00
Bart Visscher
9ffd4197ae
Fix wrong word in comment
2013-01-18 16:38:40 +01:00
Björn Schießle
d2c5f9bec7
fix error message, add "appid" to the output to know which app caused the error if OC_App::getStorage() fails.
...
Port of approved patch for stable45: https://github.com/owncloud/core/pull/1222
2013-01-18 15:14:42 +01:00
Thomas Müller
0ed635240a
Merge pull request #1205 from owncloud/ocs_api
...
Return 401 headers when trying to access a restricted api call
2013-01-18 05:52:51 -08:00
Thomas Müller
5df57e4ada
Merge pull request #1181 from owncloud/return-503-in-maintenance
...
in case of maintenance the error page returns http status 503.
2013-01-18 04:02:03 -08:00
Jenkins for ownCloud
824fcf6624
[tx-robot] updated from transifex
2013-01-18 00:04:36 +01:00
TheSFReader
73522fe189
Add ebook specific mimetypes
2013-01-17 22:20:57 +01:00
TheSFReader
eb9cd0858e
Add ebook specific mimetypes
2013-01-17 21:57:04 +01:00
Bernhard Posselt
2b95ae1e6d
spaces to tabs
2013-01-17 21:44:40 +01:00
Bernhard Posselt
a8094abac7
load classpaths of apps before routes
2013-01-17 21:42:46 +01:00
tomneedham
b4954c0c89
Correct spelling of 'Authorization'
2013-01-17 16:30:14 +00:00
Frank Karlitschek
d85e440aa1
Merge pull request #1148 from seancomeau/topic/setup
...
Fix issue #108
2013-01-16 22:38:57 -08:00
Jenkins for ownCloud
433fa19268
[tx-robot] updated from transifex
2013-01-17 00:27:40 +01:00
Tom Needham
358671ac1d
Fix incorrect indentation
2013-01-16 20:29:29 +00:00
Tom Needham
098c84a29c
Return 401 headers when authentication is required for the api call
2013-01-16 20:27:43 +00:00
Bart Visscher
5bfe4adbaa
Whitespace cleanup
2013-01-16 18:09:16 +01:00
Bart Visscher
a8f963d9cf
Spaces to tabs
2013-01-16 18:09:16 +01:00
Jan-Christoph Borchardt
cb0fd30458
Merge pull request #1185 from owncloud/fixing-1162-master
...
handling proper display of files/folders with negative size
2013-01-16 05:18:53 -08:00
Thomas Müller
1f7bf57ece
Merge pull request #1195 from owncloud/cache_prepared
...
Cache prepared statements in OC_DB
2013-01-15 22:23:34 -08:00
Robin Appelman
f18fc1c510
Clear cached prepared statements when switching between mdb2 and pdo
2013-01-16 01:12:13 +01:00
Thomas Müller
4668f8c86e
Merge pull request #1178 from owncloud/return_true_because_of_ponies
...
Remove uneeded return
2013-01-15 14:01:48 -08:00
Robin Appelman
a08490364d
Cache prepared statements in OC_DB
2013-01-15 20:21:06 +01:00
Thomas Mueller
388bb6a5e1
Merge branch 'master' into fixing-unused-and-undefined-in-master
2013-01-14 23:41:34 +01:00
Thomas Mueller
44e5c052b3
handling proper display of files/folders with negative size
...
refs #1162
2013-01-14 23:39:31 +01:00
Lukas Reschke
ab287d2ba4
Move { to same line
2013-01-14 22:04:31 +01:00