mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
22,853 Commits 349 Branches 696 Tags 1.6 GiB
Commit Graph

22853 Commits

Author SHA1 Message Date
Morris Jobke 11283c57d9 Merge pull request #11056 from AdamWill/9885-opcode 
add function to invalidate one opcache file, use it if possible #9885
 2015-02-10 17:21:15 +01:00
Vincent Petry bd01ff135a Merge pull request #13190 from is-apps/master-sftp-key 
Add SFTP public key authentication support
 2015-02-10 16:44:29 +01:00
Lukas Reschke 5ae03fd650 Merge pull request #14028 from frsela/charset_utf8 
Setting default charset to UTF-8 in .htaccess and .user.ini
 2015-02-10 10:38:12 +01:00
Fernando Rodriguez Sela 66b584ae7e Setting default charset to UTF-8 in .htaccess and .user.ini 2015-02-10 09:39:06 +01:00
Jenkins for ownCloud 124e48aec0 [tx-robot] updated from transifex 2015-02-10 01:55:06 -05:00
Morris Jobke 1bb6de7c1b Merge pull request #13425 from owncloud/phpdoc_cleanup 
Cleanup of PHPDoc return types
 2015-02-10 01:14:00 +01:00
Morris Jobke 4a99849c6c Merge pull request #13663 from owncloud/issue/13624-notification-when-favorting-fails 
Only update favorite icon if the operation was successful
 2015-02-10 00:05:39 +01:00
Morris Jobke 068f6107c6 Merge pull request #13842 from owncloud/is_file_2_is_readable 
check if cache files are readable
 2015-02-09 23:45:32 +01:00
Morris Jobke 297b52fa4c Merge pull request #14007 from owncloud/fix-broken-master 
[master] Request requires a second parameter
 2015-02-09 23:34:14 +01:00
Thomas Müller c60dabd11b Request requires a second parameter 2015-02-09 23:06:55 +01:00
Thomas Müller 4872d6c08a Merge pull request #13923 from owncloud/l10n-ignore-jsmin 
Ignore minified js in translation process
 2015-02-09 21:07:13 +01:00
Lukas Reschke 74de345c7f Merge pull request #13511 from owncloud/naturalsort_speeeeeed 
NaturalSort performance improvements
 2015-02-09 18:39:52 +01:00
Vincent Petry c4d9ae8af4 Merge pull request #13928 from owncloud/prevent_ghost_files_master 
prevent creation of ghost directories
 2015-02-09 18:15:45 +01:00
Vincent Petry 5296767393 Merge pull request #13921 from owncloud/ocs-af 
Add a controller and reponse for ocs
 2015-02-09 18:11:47 +01:00
Vincent Petry 605e2357a1 Merge pull request #13852 from owncloud/cache-app-versions 
Cache app versions
 2015-02-09 18:03:19 +01:00
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
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
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