Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | fix german l10n | Morris Jobke | 2016-06-20 | 4 | -4/+4 |
| | |||||
* | fix more strings | Morris Jobke | 2016-06-20 | 4 | -12/+8 |
| | |||||
* | Remove obsolete contacts_cards_properties table | Florian Preinstorfer | 2016-06-19 | 1 | -0/+1 |
| | | | | | | | The table contacts_cards_properties was part of the contacts app until ownCloud 8.2. It got replaced with cards_properties (part of dav). See also: ownCloud/core #21889 | ||||
* | Drop obsolete tables: gallery_albums and gallery_photos | Florian Preinstorfer | 2016-06-19 | 1 | -1/+3 |
| | | | | | Commit 34a21a63ce5730a4f45af6745b4acd6f702e6e79 renamed gallery_albums to pictures_images_cache and removed gallery_photos entirely. | ||||
* | Merge branch 'master' of https://github.com/owncloud/core into downstream-160614 | Arthur Schiwon | 2016-06-14 | 3 | -9/+11 |
|\ | |||||
| * | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-06-13 | 2 | -8/+8 |
| | | |||||
| * | fail hard if 2fa provider can not be loaded (#25061) | Christoph Wurst | 2016-06-13 | 1 | -1/+3 |
| | | |||||
* | | emit correct signal if a app get's disabled | Bjoern Schiessle | 2016-06-13 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' of https://github.com/owncloud/core into downstream-160611 | Arthur Schiwon | 2016-06-11 | 16 | -8/+358 |
|\| | |||||
| * | Merge pull request #24863 from owncloud/propagator-batching | Vincent Petry | 2016-06-10 | 3 | -1/+110 |
| |\ | | | | | | | Propagator batching for the file scanner | ||||
| | * | fix mtime propagation on sqlite | Robin Appelman | 2016-06-02 | 1 | -3/+3 |
| | | | |||||
| | * | use propagator batching in the scanner | Robin Appelman | 2016-06-02 | 1 | -0/+4 |
| | | | |||||
| | * | add propagator batching | Robin Appelman | 2016-06-02 | 2 | -0/+105 |
| | | | |||||
| * | | Merge pull request #24898 from owncloud/avatar_repair | Vincent Petry | 2016-06-10 | 2 | -0/+117 |
| |\ \ | | | | | | | | | Repair job to fix permissions for avatars | ||||
| | * | | Empty string is null on oracle | Roeland Jago Douma | 2016-06-10 | 1 | -1/+9 |
| | | | | |||||
| | * | | Repair job to fix permissions for avatars | Roeland Jago Douma | 2016-06-10 | 2 | -0/+109 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #22978 On some older installations the permissions for the userRoot and the avatars are not correct. This breaks since we now use the Node API in the avatar code. This repair job makes sure that the permissions are set correctly. * Unit tests added | ||||
| * | | | Merge pull request #25055 from owncloud/enc-cappedcache-getaccesslist | Vincent Petry | 2016-06-10 | 1 | -0/+3 |
| |\ \ \ | | | | | | | | | | | Use capped cache for encryption's user access list | ||||
| | * | | | Use capped cache for encryption's user access list | Vincent Petry | 2016-06-10 | 1 | -0/+3 |
| | | | | | |||||
| * | | | | fetchall appconfig entries (#23835) | Jörn Friedrich Dreyer | 2016-06-10 | 1 | -1/+3 |
| | | | | | |||||
| * | | | | map oracle driver options to params (#23938) | Jörn Friedrich Dreyer | 2016-06-10 | 1 | -0/+4 |
| | |/ / | |/| | | |||||
| * | | | Merge pull request #25051 from owncloud/2fa-raw-php-files | Vincent Petry | 2016-06-10 | 2 | -1/+8 |
| |\ \ \ | | |/ / | |/| | | Check 2FA state for raw php files too | ||||
| | * | | Check 2FA state for raw php files too | Christoph Wurst | 2016-06-10 | 2 | -1/+8 |
| | | | | |||||
| * | | | Merge pull request #24080 from owncloud/support-calendar-class-property | Vincent Petry | 2016-06-10 | 1 | -1/+2 |
| |\ \ \ | | | | | | | | | | | Extract CLASS property from calendar object and store it in the database | ||||
| | * | | | Implement classification migration as repair step | Thomas Müller | 2016-06-09 | 1 | -1/+2 |
| | | | | | |||||
| * | | | | Merge pull request #25025 from owncloud/clear_old_calendar_shares | Vincent Petry | 2016-06-10 | 2 | -0/+105 |
| |\ \ \ \ | | |_|/ / | |/| | | | Add repair step to clean old calendar shares | ||||
| | * | | | Add repair step to clean old calendar/contact shares | Roeland Jago Douma | 2016-06-09 | 2 | -0/+105 |
| | | | | | | | | | | | | | | | | | | | | fixes #21889 | ||||
| * | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-06-10 | 4 | -4/+6 |
| | | | | | |||||
* | | | | | Merge pull request #19 from nextcloud/files-drop | Lukas Reschke | 2016-06-10 | 1 | -1/+4 |
|\ \ \ \ \ | | | | | | | | | | | | | add "hide file list" option | ||||
| * | | | | | add hide file list option | Bjoern Schiessle | 2016-06-09 | 1 | -1/+4 |
| | | | | | | |||||
* | | | | | | Downstream 2016-06-09 | Arthur Schiwon | 2016-06-09 | 22 | -57/+289 |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | Merge branch 'master' of https://github.com/owncloud/core into downstream-160609 | ||||
| * | | | | | Merge pull request #25000 from owncloud/fix-email-login-dav | Vincent Petry | 2016-06-09 | 2 | -5/+16 |
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | Allow login by email address via webdav as well | ||||
| | * | | | | Allow login by email address via webdav as well - fixes #24791 | Thomas Müller | 2016-06-09 | 2 | -5/+16 |
| | | | | | | |||||
| * | | | | | Merge pull request #25014 from owncloud/admin-datadircheck-fix | Vincent Petry | 2016-06-09 | 1 | -13/+24 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Use temporary htaccesstest.txt for data dir security check | ||||
| | * | | | | | Use temporary htaccesstest.txt for data dir security check | Vincent Petry | 2016-06-07 | 1 | -13/+24 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #24973 from owncloud/token-password-session-token | Vincent Petry | 2016-06-09 | 1 | -2/+30 |
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | When creating a session token, make sure it's the login password and … | ||||
| | * | | | | | catch sessionnotavailable exception if memory session is used | Christoph Wurst | 2016-06-08 | 1 | -5/+10 |
| | | | | | | | |||||
| | * | | | | | When creating a session token, make sure it's the login password and not a ↵ | Christoph Wurst | 2016-06-08 | 1 | -5/+28 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | device token | ||||
| * | | | | | | Merge pull request #24826 from owncloud/cors-client-login | Vincent Petry | 2016-06-09 | 1 | -6/+6 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | use client login method on CORS routes | ||||
| | * | | | | | | use client login method on CORS routes | Christoph Wurst | 2016-06-08 | 1 | -6/+6 |
| | |/ / / / / | |||||
| * | | | | | | Merge pull request #25028 from owncloud/scanner-user-not-setup | Vincent Petry | 2016-06-09 | 1 | -1/+6 |
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | skip scanning for a user when the user is not setup yet | ||||
| | * | | | | | skip scanning for a user when the user is not setup yet | Robin Appelman | 2016-06-08 | 1 | -1/+6 |
| | | |/ / / | | |/| | | | |||||
| * | | | | | Do not log token or challenge with exception stacktrace (#25026) | Joas Schilling | 2016-06-08 | 1 | -1/+27 |
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | * Make the filtering better readable * Add some more methods to the sensitive list | ||||
| * | | | | Merge pull request #24899 from owncloud/local-storage-symlinks | Vincent Petry | 2016-06-08 | 3 | -3/+38 |
| |\ \ \ \ | | | | | | | | | | | | | dissalow symlinks in local storages that point outside the datadir | ||||
| | * | | | | Ignore forbidden files while scanning | Robin Appelman | 2016-06-07 | 1 | -1/+6 |
| | | | | | | |||||
| | * | | | | dissalow symlinks in local storages that point outside the datadir | Robin Appelman | 2016-06-07 | 2 | -2/+32 |
| | |/ / / | |||||
| * | | | | Merge pull request #24983 from ↵ | Vincent Petry | 2016-06-08 | 4 | -5/+11 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | owncloud/issue-23776-do-not-allow-boolean-user-config Do not allow to store boolean configs, they behave unexpected on postgres | ||||
| | * | | | | Do not allow to store boolean configs, they behave unexpected on postgres | Joas Schilling | 2016-06-06 | 4 | -5/+11 |
| | | | | | | |||||
| * | | | | | Merge pull request #24991 from owncloud/2fa-do-not-generate-token | Vincent Petry | 2016-06-08 | 1 | -0/+1 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | do not generate device token if 2FA is enable for user | ||||
| | * | | | | | do not generate device token if 2FA is enable for user | Christoph Wurst | 2016-06-07 | 1 | -0/+1 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #24998 from owncloud/issue-24994-allow-decrypting-user-0-only | Vincent Petry | 2016-06-08 | 1 | -2/+2 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Allow to decrypt user '0' files only |