Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Make permalinks work for trashed files (#24537) | Vincent Petry | 2016-05-11 | 3 | -30/+139 |
| | | | | Opening a permalink that points to a trashed file will now display the file within the "Deleted Files" section in the files web UI. | ||||
* | Move Provisioning api to PSR-4 (#24510) | Joas Schilling | 2016-05-11 | 8 | -176/+194 |
| | | | | | | | | * Move app to PSR-4 * Fix setUp method * Fix the tests | ||||
* | Merge pull request #24568 from owncloud/fix_24566 | Thomas Müller | 2016-05-11 | 1 | -1/+2 |
|\ | | | | | Fix etag propegation test race condition | ||||
| * | Fix test race condition | Roeland Jago Douma | 2016-05-11 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | E-tag propagation replies on the mtime of the file. Order of events: 1. add file 'foo.txt' with content 'bar' 2. Set mtime to now() - 1 3. Check if etag changed. Now this goes right often when 1 and 2 happen in the same second. However imagine 1. add file 'foo.txt' with content 'bar' (at t=0.999) 2. Set mtime to now() - 1 (at t=1.001) Now the mtime will be set to the same time. Thus not chaning the etag. | ||||
* | | use the UID for creating the session token, not the login name | Christoph Wurst | 2016-05-11 | 2 | -7/+14 |
| | | |||||
* | | create session token for DAV clients (sync clients) | Christoph Wurst | 2016-05-11 | 1 | -0/+1 |
|/ | |||||
* | Merge pull request #24433 from owncloud/user_psr4 | Thomas Müller | 2016-05-11 | 1 | -5/+5 |
|\ | | | | | lib/private/user to PSR-4 | ||||
| * | fix usage of legacy class in LDAP | Morris Jobke | 2016-05-10 | 1 | -5/+5 |
| | | |||||
* | | Yo-ho-oh - Murder all band 'o pirates | Thomas Müller | 2016-05-11 | 8 | -42/+0 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-05-11 | 6 | -4/+94 |
|/ | |||||
* | Merge pull request #24401 from owncloud/trash-list-cache | Vincent Petry | 2016-05-10 | 1 | -46/+38 |
|\ | | | | | use the cache for trash listing | ||||
| * | use the cache for trash listing | Robin Appelman | 2016-05-03 | 1 | -46/+38 |
| | | |||||
* | | Merge pull request #24434 from owncloud/permalinks | Lukas Reschke | 2016-05-10 | 11 | -25/+317 |
|\ \ | | | | | | | Permalinks | ||||
| * | | Do not encode slashes in "dir" URL param in files JS | Vincent Petry | 2016-05-06 | 2 | -16/+33 |
| | | | |||||
| * | | Add anchor icon in sidebar to copy permalink | Vincent Petry | 2016-05-06 | 3 | -3/+53 |
| | | | |||||
| * | | Auto-add fileid in URL for currently displayed folder | Vincent Petry | 2016-05-06 | 5 | -13/+78 |
| | | | |||||
| * | | Add route to resolve fileid to files app URL | Vincent Petry | 2016-05-06 | 3 | -3/+163 |
| | | | | | | | | | | | | | | | | | | | | | The following routes will redirect to the files app and display the matching folder. If the fileid is a file, it will scroll to it. - http://localhost/owncloud/index.php/f/$fileid - http://localhost/owncloud/index.php/files/?dir=somedir&fileid=$fileid | ||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-05-10 | 258 | -736/+668 |
| | | | |||||
* | | | 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 |
| | | | |