Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #24466 from owncloud/issue_13936_wording_ldap | Morris Jobke | 2016-05-09 | 1 | -1/+1 |
|\ | | | | | wording in LDAP wizard | ||||
| * | wording in LDAP wizard | davicente | 2016-05-04 | 1 | -1/+1 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-05-09 | 6 | -16/+38 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-05-08 | 14 | -2/+120 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-05-07 | 16 | -0/+64 |
| | | |||||
* | | Merge pull request #24400 from owncloud/cache_shareManager | Vincent Petry | 2016-05-06 | 1 | -4/+5 |
|\ \ | | | | | | | Cache shareManager | ||||
| * | | Cache shareManager | Roeland Jago Douma | 2016-05-02 | 1 | -4/+5 |
| | | | | | | | | | | | | | | | There is no need to call \OC::$server->getShareManager for each Node. We have it available so better pass it around. | ||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-05-06 | 16 | -22/+104 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-05-05 | 24 | -28/+132 |
| |/ |/| | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-05-04 | 8 | -12/+36 |
| | | |||||
* | | Merge pull request #24406 from ↵ | Roeland Douma | 2016-05-04 | 12 | -1/+3 |
|\ \ | | | | | | | | | | | | | owncloud/psr4-comments-systemtags-updatenotifications Move comments, systemtags and updatenotifications to PSR-4 | ||||
| * | | Move comments, systemtags and updatenotifications to PSR-4 | Joas Schilling | 2016-05-03 | 12 | -1/+3 |
| | | | |||||
* | | | Merge pull request #24396 from owncloud/ctrlEnter-submit-comment | blizzz | 2016-05-03 | 1 | -2/+7 |
|\ \ \ | | | | | | | | | Adds functionality to submit comment on ctrl+Enter | ||||
| * | | | fixes indentation | Vincent Chan | 2016-05-03 | 1 | -1/+1 |
| | | | | |||||
| * | | | adds functionality to submit comments with cmd+Enter | Vincent Chan | 2016-05-03 | 1 | -4/+4 |
| | | | | |||||
| * | | | Submit comment on ctrl+Enter | Vincent Chan | 2016-05-02 | 1 | -0/+5 |
| | |/ | |/| | | | | | | | closes #24302 | ||||
* | | | Merge pull request #23844 from owncloud/disable-user | Thomas Müller | 2016-05-03 | 3 | -19/+128 |
|\ \ \ | | | | | | | | | Add occ commands to enable and disable a user + a disabled user can n… | ||||
| * | | | Add provisioning api to enable and disable users | Thomas Müller | 2016-05-02 | 3 | -19/+128 |
| | | | | |||||
* | | | | Merge pull request #24389 from owncloud/login-by-email | Lukas Reschke | 2016-05-03 | 3 | -0/+26 |
|\ \ \ \ | | | | | | | | | | | Allow login by email address | ||||
| * | | | | Fixing local event delivery for calendar events based on the email address | Thomas Müller | 2016-05-02 | 3 | -0/+26 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #24392 from owncloud/declare-cron-jobs-in-info.xml | Thomas Müller | 2016-05-03 | 4 | -7/+3 |
|\ \ \ \ | | | | | | | | | | | Declare cron jobs in info.xml | ||||
| * | | | | Add background job declaration of dav app to info.xml | Thomas Müller | 2016-05-03 | 4 | -7/+3 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #22989 from owncloud/lock_sharing_ops | Morris Jobke | 2016-05-03 | 2 | -43/+222 |
|\ \ \ \ | |/ / / |/| | | | Add locking to modifying operation of the OCS Share API | ||||
| * | | | Unlock before all returns | Roeland Jago Douma | 2016-04-30 | 1 | -7/+50 |
| | | | | |||||
| * | | | Add locking to modifying operation of the OCS Share API | Roeland Jago Douma | 2016-04-30 | 2 | -39/+175 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #17243 This is done in the OCS Share API instead of the share manager since we want lazy shares in general. However when doing modifying calls via the OCS Share API it is fine to force real nodes. * Updated unit tests to work with logging | ||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-05-03 | 4 | -0/+4 |
| | | | | |||||
* | | | | Merge pull request #24394 from owncloud/cleanup_share_classmap | Roeland Douma | 2016-05-03 | 7 | -19/+11 |
|\ \ \ \ | | | | | | | | | | | Cleanup Files_Sharing CLASSPATH | ||||
| * | | | | Cleanup Files_Sharing CLASSPATH | Roeland Jago Douma | 2016-05-02 | 7 | -19/+11 |
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * OC\Files\Cache\SharedScanner * OC\Files\Cache\Shared_Cache * OC\Files\Cache\Shared_Permissions * OC\Files\Cache\Shared_Updater * OC\Files\Cache\Shared_Watcher * OCA\Files\Share\Maintainer * OCA\Files\Share\Proxy | ||||
* / | | | Move activity manager to the namespace | Joas Schilling | 2016-05-02 | 1 | -2/+2 |
|/ / / | |||||
* | | | Merge pull request #24238 from owncloud/caldav-test-event-in-far-future | Joas Schilling | 2016-05-02 | 3 | -4/+8 |
|\ \ \ | | | | | | | | | Test an event in the far future | ||||
| * | | | firstoccurence and lastoccurence have a length now - triggering BIGINT on ↵ | Thomas Müller | 2016-04-29 | 2 | -1/+3 |
| | | | | | | | | | | | | | | | | postgres - refs #24221 | ||||
| * | | | Test an event in the far future - refs #24221 | Thomas Müller | 2016-04-29 | 1 | -3/+5 |
| | | | | |||||
* | | | | Merge pull request #24376 from owncloud/remove_dead_code | Roeland Douma | 2016-05-02 | 1 | -15/+0 |
|\ \ \ \ | | | | | | | | | | | Remove dead code | ||||
| * | | | | Remove dead code | Roeland Jago Douma | 2016-05-02 | 1 | -15/+0 |
| | | | | | | | | | | | | | | | | | | | | Ancient files_sharing updater code I came across. | ||||
* | | | | | 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 |