Vincent Petry
c7fcd42edb
Merge pull request #13870 from owncloud/drop-oc-preferences-2
...
drop OC\Preferences
2015-02-09 17:49:05 +01:00
Vincent Petry
b7b8c0c2e5
Merge pull request #13869 from owncloud/drop-oc-preferences
...
drop OC_Preferences
2015-02-09 17:48:36 +01:00
Lukas Reschke
47c7eb4e70
Merge pull request #13973 from owncloud/enhancement/security/13366
...
Respect `mod_unique_id` and refactor `OC_Request::getRequestId`
2015-02-09 17:35:19 +01:00
Robin McCorkell
a79757bc37
Store FileInfo::getType() result for future use
2015-02-09 16:34:11 +00:00
Robin McCorkell
44c330aa5d
Performance improvements for NaturalSort
...
A combination of using isset() instead of count() or strlen(), caching the
chunkify function, and replacing is_numeric() with some comparisons
2015-02-09 16:32:43 +00:00
Vincent Petry
5d8f1a1de3
Merge pull request #13854 from owncloud/avatar-exists
...
Add a better way to check if an avatar exists for the user
2015-02-09 17:06:24 +01:00
blizzz
dc475ab3e0
Merge pull request #13925 from owncloud/fix-13898
...
no fruitless count attempts, and notification should disappear
2015-02-09 16:55:50 +01:00
Joas Schilling
018f9fddaf
Merge pull request #13977 from owncloud/tempmanager-check-handle
...
Check directory handle before we use it
2015-02-09 16:40:56 +01:00
Joas Schilling
4172ba48d4
Deduplicate template code and do not translate the links
2015-02-09 16:01:52 +01:00
Jan-Christoph Borchardt
0d8b3afc32
Merge pull request #13958 from owncloud/fix-resize-overlap
...
Avoid dropdown to float under sidebar for mid narrow screens
2015-02-09 14:23:19 +01:00
Vincent Petry
2bb65dd9b1
Merge pull request #13364 from is-apps/files_external_cleanup
...
Clean up files_external
2015-02-09 13:20:42 +01:00
Joas Schilling
c17b236c19
Add a test for the post_shared hook shareType
2015-02-09 13:12:34 +01:00
Joas Schilling
31b93ac19a
Do not overwrite the shareType so the post hook is still correct
2015-02-09 12:59:29 +01:00
Robin Appelman
45e3cbefc9
Check directory handle before we use it
2015-02-09 12:36:18 +01:00
Lukas Reschke
770fa761b8
Respect `mod_unique_id` and refactor `OC_Request::getRequestId`
...
When `mod_unique_id` is enabled the ID generated by it will be used for logging. This allows for correlation of the Apache logs and the ownCloud logs.
Testplan:
- [ ] When `mod_unique_id` is enabled the request ID equals the one generated by `mod_unique_id`.
- [ ] When `mod_unique_id` is not available the request ID is a 20 character long random string
- [ ] The generated Id is stable over the lifespan of one request
Changeset looks a little bit larger since I had to adjust every unit test using the HTTP\Request class for proper DI.
Fixes https://github.com/owncloud/core/issues/13366
2015-02-09 11:53:11 +01:00
Jenkins for ownCloud
e2d4b3c123
[tx-robot] updated from transifex
2015-02-09 01:54:53 -05:00
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
Morris Jobke
8b2e09a77e
Avoid dropdown to float under sidebar for mid narrow screens
2015-02-06 22:44:08 +01: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