Andreas Fischer
9db0a82a26
We obviously have to pass the hostname as is when there is no ':' in the hostname.
...
This reverts commit 73062040e6
.
2014-06-17 14:48:32 +02:00
Jenkins for ownCloud
ce179dcdcb
[tx-robot] updated from transifex
2014-06-17 01:55:43 -04:00
Volkan Gezer
dd2dd7eaae
Merge pull request #9059 from owncloud/simplify-warning-layout
...
simplify security warning on admin page
2014-06-16 21:30:46 +02:00
Lukas Reschke
bd4f3849a3
That file was accidentally commited. Partially revert f2fc214ce0
2014-06-16 20:38:21 +02:00
Lukas Reschke
f2fc214ce0
Add deprecation notice to load* functions
...
This functions are deprecated and/or removed since ownCloud 7. Additionally a issubdirectory check has been added here to prevent developers to use this function in a potentially insecure way.
Port of https://github.com/owncloud/core/pull/9033
2014-06-16 20:33:04 +02:00
Morris Jobke
a5f1846170
simplify security warning on admin page
2014-06-16 20:25:02 +02:00
Morris Jobke
c42d087fc5
Merge pull request #9053 from owncloud/small_ux_improvement
...
share settings, small ux improvement
2014-06-16 20:18:51 +02:00
Morris Jobke
99467898e1
Merge pull request #9055 from owncloud/add_new_keynote_mimetype
...
add new keynote mimetype
2014-06-16 20:13:35 +02:00
Volkan Gezer
08c8ae699f
Merge pull request #9049 from owncloud/fix-upload-button
...
fix CSS for upload button - fixes #8939
2014-06-16 18:23:55 +02:00
Jörn Friedrich Dreyer
cd77f92f4c
add new keynote mimetype
2014-06-16 16:25:12 +02:00
Georg Ehrke
15c215cd03
Merge pull request #8808 from owncloud/update_shipped_apps_from_appstore
...
Make shipped apps updatable via appstore
2014-06-16 15:54:50 +02:00
Bjoern Schiessle
c1ef536896
show explenation only if the setting is activated
2014-06-16 15:33:46 +02:00
Morris Jobke
b67588d35c
Merge pull request #9048 from owncloud/fix_9041
...
format group or username for delete notification, fixes #9041
2014-06-16 15:23:08 +02:00
Morris Jobke
b75fe439e7
fix CSS for upload button - fixes #8939
2014-06-16 13:51:49 +02:00
Georg Ehrke
86f546ff64
disable code check for shipped apps
2014-06-16 13:49:02 +02:00
Arthur Schiwon
f12c4f6d11
style
2014-06-16 13:46:31 +02:00
Arthur Schiwon
3ebb1565a7
escape before output, fixes #9041
2014-06-16 13:44:41 +02:00
Morris Jobke
4fbab3c12d
Merge pull request #9040 from owncloud/fix-xss
...
Sanitize name of sharee
2014-06-16 13:13:28 +02:00
Morris Jobke
3069091e61
Merge pull request #9030 from owncloud/default-allow-user-mount-backends
...
AllowUserMount defaults now to all backends fixes #7958
2014-06-16 13:10:01 +02:00
Volkan Gezer
83b45926ee
Merge pull request #8716 from owncloud/forget-documentation
...
app manager forgets the documentation links workaround for #8081
2014-06-16 12:24:39 +02:00
Morris Jobke
0a2c676cda
fix camelCase and avoiud re-wrapping $()
2014-06-16 11:35:48 +02:00
Morris Jobke
78b6f59523
fix typo - Backups -> Backends
2014-06-16 11:33:51 +02:00
Vincent Petry
a48bcceb23
Merge pull request #8917 from owncloud/repair-routine-base
...
Add support for repair step classes
2014-06-16 11:13:10 +02:00
Vincent Petry
d21845557e
Merge pull request #9027 from owncloud/fix-password-saved-share-layout
...
fix layout of password protected shares
2014-06-16 11:11:03 +02:00
Jenkins for ownCloud
ec5448bf7d
[tx-robot] updated from transifex
2014-06-16 01:54:35 -04:00
macjohnny
e5224782fa
Merge pull request #9022 from owncloud/speedup-nested-ldap-groups
...
drastic speedup for nested ldap groups
2014-06-16 07:50:53 +02:00
Jenkins for ownCloud
4d6fc6f309
[tx-robot] updated from transifex
2014-06-15 01:55:06 -04:00
Lukas Reschke
35740cf941
Do even more sanitization
2014-06-14 20:56:54 +02:00
Lukas Reschke
1066f4ec9a
Sanitize name of sharee
...
Fixes a XSS introduced with 271684dcfe
2014-06-14 20:45:10 +02:00
Morris Jobke
06ec82fd68
Fix path
2014-06-14 15:26:27 +02:00
Lukas Reschke
01de7b8b9e
Merge pull request #9028 from owncloud/table-to-paragraph-layout-for-https
...
migrate table layout to paragraph layout for HTTPS setting
2014-06-14 13:08:58 +02:00
Frank Karlitschek
db9ac13574
Merge pull request #8618 from owncloud/yet-another-ajax-lost-password
...
Basic ajax lost password
2014-06-14 12:01:13 +02:00
Jenkins for ownCloud
4a26219ecf
[tx-robot] updated from transifex
2014-06-14 01:55:24 -04:00
Morris Jobke
fd5fad194d
remove double space
2014-06-14 01:03:03 +02:00
Morris Jobke
35f7565e9b
Merge pull request #8978 from owncloud/movie_preview_improvements
...
movie previews: use file directly when it's stored locally and encryption is not enabled
2014-06-14 01:01:59 +02:00
Georg Ehrke
65028c459b
don't skip code check for skipped apps
...
those apps will have to use the public api
2014-06-13 21:51:16 +02:00
Georg Ehrke
c378e76412
skip certain tests for shipped apps
2014-06-13 21:45:31 +02:00
Volkan Gezer
2b82e3c251
Merge pull request #9025 from owncloud/fix-mail-settings
...
fix mail settings save function - ref #8854
2014-06-13 18:26:14 +02:00
Morris Jobke
86e1d8ca54
AllowUserMount defaults now to all backends fixes #7958
2014-06-13 18:14:41 +02:00
Frank Karlitschek
87101e6638
Merge pull request #9018 from owncloud/dbms-socket-support
...
Refactor OC_DB::connect() to properly support sockets.
2014-06-13 18:09:51 +02:00
Morris Jobke
dc2212cd46
migrate table layout to paragraph layout for HTTPS setting
2014-06-13 16:54:47 +02:00
Morris Jobke
fc9787ed64
fix layout of password protected shares
...
* add password icon
* fix upshifted arrow button - fixes #9024
2014-06-13 16:38:42 +02:00
Morris Jobke
dda5e6c85b
add proper Exception message for invalid token
2014-06-13 16:18:58 +02:00
Morris Jobke
1cb7239cb7
use array_merge for merging arrays in PHP
2014-06-13 16:18:39 +02:00
Morris Jobke
ed8b7fc101
complete renaming uid to userId
2014-06-13 16:18:21 +02:00
Morris Jobke
ebbf228309
remove whitespace at end of line
2014-06-13 16:03:13 +02:00
Morris Jobke
a53cfcb9d1
Migrate ´ to '
2014-06-13 16:02:41 +02:00
Morris Jobke
cedca03ef5
Remove infield label, add password icon, fix layout
2014-06-13 15:56:21 +02:00
Morris Jobke
d0b71dffca
reformat method call and fix paranthesis mismatch
2014-06-13 15:39:44 +02:00
Bernhard Posselt
2b2b1b487c
more style fixes
2014-06-13 15:34:52 +02:00