Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #24341 from owncloud/scan-nfd-showwarning | Morris Jobke | 2016-05-02 | 2 | -2/+19 |
|\ | | | | | Add files:scan warning when NFD or incompatible encoding found | ||||
| * | Fix SMB storage to not normalize UTF8 | Vincent Petry | 2016-04-29 | 1 | -1/+1 |
| | | | | | | | | | | | | | | This makes sure that even if a NFD file name exists, it is found by the storage and will be visible to higher layers. Even though the file will be discarded anyway there, it gives the scanner a chance to display a warning at least. | ||||
| * | Add files:scan warning when NFD or incompatible encoding found | Vincent Petry | 2016-04-29 | 1 | -1/+18 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-05-02 | 10 | -0/+22 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-05-01 | 18 | -24/+116 |
| | | |||||
* | | There is no need to do old etag propagation | Roeland Jago Douma | 2016-04-30 | 2 | -101/+0 |
| | | | | | | | | Etags are calculated differently now and don't require manual updating. | ||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-04-30 | 14 | -20/+26 |
|/ | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-04-29 | 16 | -0/+110 |
| | |||||
* | Merge pull request #24287 from owncloud/smb-110 | Vincent Petry | 2016-04-28 | 8 | -41/+122 |
|\ | | | | | update icewind/streams to 1.1.0 | ||||
| * | update icewind/streams to 1.1.0 | Robin Appelman | 2016-04-26 | 8 | -41/+122 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-04-28 | 20 | -0/+180 |
| | | |||||
* | | Merge pull request #22777 from owncloud/encrypt_all_master_key | Thomas Müller | 2016-04-27 | 4 | -29/+116 |
|\ \ | | | | | | | improved encrypt-all script | ||||
| * | | if we don't have a encrypted file key we can return a empty string right away | Bjoern Schiessle | 2016-04-26 | 2 | -5/+38 |
| | | | |||||
| * | | don't create a private-/public-key pair for each user if the master key is ↵ | Bjoern Schiessle | 2016-04-26 | 3 | -24/+78 |
| |/ | | | | | | | enabled | ||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-04-27 | 34 | -2/+92 |
| | | |||||
* | | Merge pull request #24027 from owncloud/translate_ocs_share | Thomas Müller | 2016-04-26 | 4 | -63/+94 |
|\ \ | |/ |/| | Translate OCS Share API error messages | ||||
| * | Translate OCS Share API error messages | Roeland Jago Douma | 2016-04-25 | 4 | -63/+94 |
| | | | | | | | | For https://github.com/owncloud/core/issues/22209 | ||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-04-26 | 192 | -1076/+1160 |
| | | |||||
* | | Merge pull request #23726 from owncloud/ldap-wizard-improve-status-indicator | Thomas Müller | 2016-04-25 | 1 | -0/+11 |
|\ \ | | | | | | | LDAP Wizard: reset connection status indicator when switching LDAP co… | ||||
| * | | LDAP Wizard: reset connection status indicator when switching LDAP config | Arthur Schiwon | 2016-04-25 | 1 | -0/+11 |
| | | | |||||
* | | | Merge pull request #22648 from owncloud/propagate-single | Thomas Müller | 2016-04-25 | 2 | -2/+1 |
|\ \ \ | | | | | | | | | do propagation in a single query | ||||
| * | | | do propagation in a single query | Robin Appelman | 2016-04-25 | 2 | -2/+1 |
| |/ / | |||||
* | | | Merge pull request #24244 from owncloud/mount-unique | Vincent Petry | 2016-04-25 | 2 | -2/+22 |
|\ \ \ | |/ / |/| | | don't get the config for the same mount multiple times | ||||
| * | | add test | Robin Appelman | 2016-04-25 | 1 | -0/+11 |
| | | | |||||
| * | | don't get the config for the same mount multiple times | Robin Appelman | 2016-04-25 | 1 | -2/+11 |
| | | | |||||
* | | | Merge pull request #24052 from owncloud/fix-ldap-cache-race-conditions | Thomas Müller | 2016-04-25 | 6 | -48/+32 |
|\ \ \ | | | | | | | | | Fix LDAP race conditions | ||||
| * | | | Fix LDAP race conditions | Morris Jobke | 2016-04-20 | 6 | -48/+32 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * getFromCache is wrapped in isCached * inbetween the two calls the cache entry hits it's TTL * getFromCache returns null * this fix only checkes if the returned value is null and return only non-null values | ||||
* | | | | Merge pull request #24240 from owncloud/issue-24233-add-missing-use-statement | Thomas Müller | 2016-04-25 | 1 | -0/+1 |
|\ \ \ \ | | | | | | | | | | | Add missing use statement | ||||
| * | | | | Add missing use statement | Joas Schilling | 2016-04-25 | 1 | -0/+1 |
| | | | | | |||||
* | | | | | Merge pull request #24230 from owncloud/you-form-of-activities | Lukas Reschke | 2016-04-25 | 1 | -0/+35 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | Translate the current user with "You ..." | ||||
| * | | | | Translate the current user with "You ..." | Joas Schilling | 2016-04-25 | 1 | -0/+35 |
| |/ / / | |||||
* | | | | Merge pull request #24214 from owncloud/fix-ldap-connection-unbind-on-login | Vincent Petry | 2016-04-25 | 2 | -11/+3 |
|\ \ \ \ | | | | | | | | | | | on clone Connection, do not take over the existing LDAP resource | ||||
| * | | | | on clone Connection, do not take over the existing LDAP resource | Arthur Schiwon | 2016-04-22 | 2 | -11/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For one, it solves potential conflicts when using the resource. For the other, one on the login check (the only place where a clone happens currently) we do not need to rebind after confirming the user's login was successful. | ||||
* | | | | | Merge pull request #24073 from owncloud/move_federated_sharing_settings_to_app | Björn Schießle | 2016-04-25 | 29 | -51/+259 |
|\ \ \ \ \ | |_|/ / / |/| | | | | move federated sharing settings to the federatedfilesharing app | ||||
| * | | | | move federated sharing settings to the federatedfilesharing app | Björn Schießle | 2016-04-22 | 29 | -51/+259 |
| | | | | | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-04-25 | 2 | -2/+2 |
| |_|_|/ |/| | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-04-24 | 36 | -14/+136 |
| | | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-04-23 | 12 | -0/+28 |
| |/ / |/| | | |||||
* | | | Merge pull request #24124 from owncloud/encryped-size-progation | Thomas Müller | 2016-04-22 | 2 | -14/+68 |
|\ \ \ | |/ / |/| | | dont do optimized size propagation for encrypted files | ||||
| * | | Add unit tests for shared size propagation with encryption | Robin Appelman | 2016-04-21 | 2 | -14/+68 |
| | | | |||||
* | | | Merge pull request #23918 from owncloud/cruds-for-federated-shares | Björn Schießle | 2016-04-22 | 5 | -43/+115 |
|\ \ \ | | | | | | | | | bring back CRUDS permissions for federated shares | ||||
| * | | | ask for share-permissions on propfind | Björn Schießle | 2016-04-20 | 1 | -0/+16 |
| | | | | |||||
| * | | | return correct share permissions on propfind | Björn Schießle | 2016-04-18 | 3 | -40/+88 |
| | | | | |||||
| * | | | set correct permissions in shareinfo | Björn Schießle | 2016-04-18 | 1 | -3/+11 |
| | |/ | |/| | |||||
* | | | Merge pull request #24151 from owncloud/create-personal-calendar | Thomas Müller | 2016-04-22 | 2 | -1/+83 |
|\ \ \ | | | | | | | | | Personal calendar should be generated even if the birthday calendar a… | ||||
| * | | | Personal calendar should be generated even if the birthday calendar already ↵ | Thomas Müller | 2016-04-21 | 2 | -1/+83 |
| | |/ | |/| | | | | | | | exists - fixes #24082 | ||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-04-22 | 16 | -0/+16 |
| | | | |||||
* | | | Merge pull request #24157 from ↵ | Thomas Müller | 2016-04-21 | 1 | -6/+9 |
|\ \ \ | | | | | | | | | | | | | | | | | owncloud/files-app-is-not-available-on-public-page OCA.Files.App is not available on public page | ||||
| * | | | OCA.Files.App is not available on public page | Christoph Wurst | 2016-04-21 | 1 | -6/+9 |
| |/ / | |||||
* | | | Merge pull request #24155 from owncloud/fix-birthday_calendar-acl | Thomas Müller | 2016-04-21 | 4 | -8/+27 |
|\ \ \ | | | | | | | | | Birthday calendar should never have write acl |