Commit Graph

22745 Commits

Author SHA1 Message Date
Raimund Schlüßler c398e8e42e Fix variable already defined 2015-02-09 07:52:10 +01:00
Raimund Schlüßler fcc144ca74 Append search results to custom container
fixes #13968
2015-02-08 22:42:30 +01:00
Lukas Reschke 0e604aa875 Merge pull request #13948 from owncloud/cache-move-transaction
Use transactions when renaming directory contents
2015-02-08 19:08:52 +01:00
Lukas Reschke f167c3d9f6 Merge pull request #13895 from owncloud/disable-autocomplete-1
Disable autocomplete for SMTP Password
2015-02-08 14:03:57 +01:00
Jenkins for ownCloud 60e771685e [tx-robot] updated from transifex 2015-02-08 01:54:53 -05:00
Morris Jobke 8f8ecd67fd Merge pull request #13963 from RealRancor/external_user_note
external user app: Add note to enable it first
2015-02-07 20:11:17 +01:00
RealRancor 04d6f3e1fb external user app: Add note to enable it first 2015-02-07 14:01:38 +01:00
Morris Jobke 90556cb70b Merge pull request #12283 from oparoz/sfnt-fonts
Updated the media type of some font types
2015-02-07 13:33:49 +01:00
Morris Jobke b05e4e085c Merge pull request #13435 from Zillode/app-favicon
Allow application-specific favicons
2015-02-07 13:29:18 +01:00
Morris Jobke 108f3327e6 Merge pull request #13502 from owncloud/streamline-authentication-in-newfile
Streamline CSRF and login check
2015-02-07 13:27:46 +01:00
Morris Jobke 77c0314503 Merge pull request #13655 from Sugaroverdose/fix_#13632
Do not change color of 'new' button on hover and make new file menu more consistent with button
2015-02-07 13:25:43 +01:00
Morris Jobke 485e2a282b Merge pull request #13753 from owncloud/use-403-instead-of-200
Use 403 instead of 200 response
2015-02-07 13:25:15 +01:00
Morris Jobke 11ded92a73 Merge pull request #13830 from owncloud/fix-redirect-404
Don't encode url unecessary twice
2015-02-07 13:24:47 +01:00
Morris Jobke 57c1b499a1 Merge pull request #13848 from owncloud/ldap-warn
Reduce log level of bind failed to WARN - fixes  #11624
2015-02-07 13:24:11 +01:00
Morris Jobke b2f6b8d62e Merge pull request #13889 from owncloud/catch-exception
Catch exception properly
2015-02-07 13:23:34 +01:00
Jenkins for ownCloud 4bf7b2c130 [tx-robot] updated from transifex 2015-02-07 01:54:35 -05:00
Robin Appelman 6c00521e8b Use transactions when renaming directory contents 2015-02-06 15:20:53 +01:00
Jenkins for ownCloud 80e38b84dc [tx-robot] updated from transifex 2015-02-06 06:49:06 -05:00
Thomas Müller 3c46a51f77 Merge pull request #13937 from cmeh/patch-1
Coherent use of "SQLite" in lines 119 and 124
2015-02-06 12:46:02 +01:00
Thomas Müller 280a28f4df Merge pull request #13942 from cmeh/patch-2
Coherent use of "SQLite" in lines 159 and 161
2015-02-06 12:45:25 +01:00
Thomas Müller bc56fef619 Merge pull request #13932 from owncloud/revert-sabredav-etag-master
Revert "adding OC-ETag header"
2015-02-06 12:05:32 +01:00
cmeh 6abb28e2a6 Update installation.php
In line 161, "SQLite" has now the same capitalisation as in line 159.
2015-02-06 11:19:56 +01:00
cmeh c1d661d35b Coherent use of "SQLite" in lines 119 and 124
Just a cosmetic detail, but very obvious when working on localisations.
2015-02-06 10:00:47 +01:00
Frank Karlitschek df2808eec8 8.0 final 2015-02-06 08:08:29 +01:00
Lukas Reschke c8e84565e1 Merge pull request #13960 from owncloud/revert-13692-capabilities
Revert "Add OCS sharing info to capabilities"
2015-02-07 00:13:05 +01:00
Lukas Reschke a67627140c Revert "Add OCS sharing info to capabilities" 2015-02-07 00:12:26 +01:00
Frank Karlitschek 0b421e821b Merge pull request #13692 from rullzer/capabilities
Add OCS sharing info to capabilities
2015-02-06 16:46:47 -05:00
Thomas Müller b4b45a1a52 Merge pull request #13954 from owncloud/fix-enc-mig-user-retrieval
Fix enc mig user retrieval
2015-02-06 21:26:32 +01:00
Jenkins for ownCloud 988027fdca [tx-robot] updated from transifex 2015-02-06 15:26:04 -05:00
Frank Karlitschek 492fadd302 Merge pull request #13952 from owncloud/fix_migration
[encryption] don't check if we have a valid user during migration
2015-02-06 14:03:53 -05:00
Arthur Schiwon 15b2d33599 always specify limit, except you do like questionable surprises
always specify limit, except you do like questionable surprises, part 2
2015-02-06 17:51:40 +01:00
Bjoern Schiessle b2e13229fa don't check if we have a valid user 2015-02-06 17:31:15 +01:00
Lukas Reschke 4d91fa4c93 Normalize before processing 2015-02-06 15:03:29 +01:00
Roeland Jago Douma fe2aca5aa8 Updated unit tests 2015-02-06 12:13:53 +01:00
Roeland Jago Douma 3be3e20c0f Bit better formatting when using json output 2015-02-06 10:55:33 +01:00
Roeland Jago Douma d4e361db44 Updated sharing capabilities
Moved to files_sharing
Added more capabilities.
Tried to order to capabilities more OO style
2015-02-06 10:33:08 +01:00
Jenkins for ownCloud bd60abbefc [tx-robot] updated from transifex 2015-02-06 01:57:07 -05:00
Thomas Müller 0916d2ed6b Merge pull request #13933 from owncloud/enhance-sqlite-warning-2
Don't highly discourage
2015-02-05 23:50:06 +01:00
Vincent Petry 8210200770 Revert "adding OC-ETag header"
This reverts commit 96a931929e.
2015-02-05 20:43:37 +01:00
Thomas Müller d748368ecb Don't highly discourage 2015-02-05 17:21:10 +01:00
Bernhard Posselt 7a9d428d6f Merge pull request #13907 from owncloud/enhance-sqlite-warning
enhance sqlite warning on admin page as well as during setup
2015-02-05 13:07:56 +01:00
Lukas Reschke 59f54822f0 Merge pull request #13918 from owncloud/add-warning-for-54
Show warning for PHP versions older than 5.4.0
2015-02-05 12:28:10 +01:00
Lukas Reschke dc9c5ecdba Show warning for PHP versions older than 5.4.0
We can't check the PHP version in the installer since base.php already used 5.4 syntax. Thus for a better UX we show a simple warning instead of a fatal PHP error.
2015-02-05 11:41:00 +01:00
Jenkins for ownCloud 9adff77040 [tx-robot] updated from transifex 2015-02-05 01:54:49 -05:00
Frank Karlitschek defe41ee4e 8.0.0 RC2 2015-02-04 23:27:52 +01:00
Thomas Müller f86c73c9f6 enhance sqlite warning on admin page as well as during setup - fixes #13906 2015-02-04 20:55:54 +01:00
blizzz 4a1c0b1d21 Merge pull request #13897 from owncloud/fix-13644
fix user loading
2015-02-04 18:36:40 +01:00
Arthur Schiwon 30b24696c8 fix user loading 2015-02-04 17:19:11 +01:00
Lukas Reschke 40244c9eef Disable autocomplete for SMTP Password
While really nearly no modern browser cares about it anymore too much it's still not wrong to have it here (and also stops some automated scanners reporting this...)
2015-02-04 17:00:39 +01:00
Lukas Reschke 7b0d9f5035 Merge pull request #13894 from owncloud/revert-13892-disable-autocomplete
Revert "Disable autocomplete for SMTP Password"
2015-02-04 16:57:17 +01:00