summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* Make permalinks work for trashed files (#24537)Vincent Petry2016-05-113-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 Schilling2016-05-118-176/+194
| | | | | | | | * Move app to PSR-4 * Fix setUp method * Fix the tests
* Merge pull request #24568 from owncloud/fix_24566Thomas Müller2016-05-111-1/+2
|\ | | | | Fix etag propegation test race condition
| * Fix test race conditionRoeland Jago Douma2016-05-111-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 nameChristoph Wurst2016-05-112-7/+14
| |
* | create session token for DAV clients (sync clients)Christoph Wurst2016-05-111-0/+1
|/
* Merge pull request #24433 from owncloud/user_psr4Thomas Müller2016-05-111-5/+5
|\ | | | | lib/private/user to PSR-4
| * fix usage of legacy class in LDAPMorris Jobke2016-05-101-5/+5
| |
* | Yo-ho-oh - Murder all band 'o piratesThomas Müller2016-05-118-42/+0
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2016-05-116-4/+94
|/
* Merge pull request #24401 from owncloud/trash-list-cacheVincent Petry2016-05-101-46/+38
|\ | | | | use the cache for trash listing
| * use the cache for trash listingRobin Appelman2016-05-031-46/+38
| |
* | Merge pull request #24434 from owncloud/permalinksLukas Reschke2016-05-1011-25/+317
|\ \ | | | | | | Permalinks
| * | Do not encode slashes in "dir" URL param in files JSVincent Petry2016-05-062-16/+33
| | |
| * | Add anchor icon in sidebar to copy permalinkVincent Petry2016-05-063-3/+53
| | |
| * | Auto-add fileid in URL for currently displayed folderVincent Petry2016-05-065-13/+78
| | |
| * | Add route to resolve fileid to files app URLVincent Petry2016-05-063-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 transifexJenkins for ownCloud2016-05-10258-736/+668
| | |
* | | Merge pull request #24466 from owncloud/issue_13936_wording_ldapMorris Jobke2016-05-091-1/+1
|\ \ \ | | | | | | | | wording in LDAP wizard
| * | | wording in LDAP wizarddavicente2016-05-041-1/+1
| |/ /
* | | [tx-robot] updated from transifexJenkins for ownCloud2016-05-096-16/+38
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2016-05-0814-2/+120
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2016-05-0716-0/+64
| | |
* | | Merge pull request #24400 from owncloud/cache_shareManagerVincent Petry2016-05-061-4/+5
|\ \ \ | | | | | | | | Cache shareManager
| * | | Cache shareManagerRoeland Jago Douma2016-05-021-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 transifexJenkins for ownCloud2016-05-0616-22/+104
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2016-05-0524-28/+132
| |/ |/|
* | [tx-robot] updated from transifexJenkins for ownCloud2016-05-048-12/+36
| |
* | Merge pull request #24406 from ↵Roeland Douma2016-05-0412-1/+3
|\ \ | | | | | | | | | | | | owncloud/psr4-comments-systemtags-updatenotifications Move comments, systemtags and updatenotifications to PSR-4
| * | Move comments, systemtags and updatenotifications to PSR-4Joas Schilling2016-05-0312-1/+3
| | |
* | | Merge pull request #24396 from owncloud/ctrlEnter-submit-commentblizzz2016-05-031-2/+7
|\ \ \ | | | | | | | | Adds functionality to submit comment on ctrl+Enter
| * | | fixes indentationVincent Chan2016-05-031-1/+1
| | | |
| * | | adds functionality to submit comments with cmd+EnterVincent Chan2016-05-031-4/+4
| | | |
| * | | Submit comment on ctrl+EnterVincent Chan2016-05-021-0/+5
| | |/ | |/| | | | | | | closes #24302
* | | Merge pull request #23844 from owncloud/disable-userThomas Müller2016-05-033-19/+128
|\ \ \ | | | | | | | | Add occ commands to enable and disable a user + a disabled user can n…
| * | | Add provisioning api to enable and disable usersThomas Müller2016-05-023-19/+128
| | | |
* | | | Merge pull request #24389 from owncloud/login-by-emailLukas Reschke2016-05-033-0/+26
|\ \ \ \ | | | | | | | | | | Allow login by email address
| * | | | Fixing local event delivery for calendar events based on the email addressThomas Müller2016-05-023-0/+26
| | |/ / | |/| |
* | | | Merge pull request #24392 from owncloud/declare-cron-jobs-in-info.xmlThomas Müller2016-05-034-7/+3
|\ \ \ \ | | | | | | | | | | Declare cron jobs in info.xml
| * | | | Add background job declaration of dav app to info.xmlThomas Müller2016-05-034-7/+3
| | |_|/ | |/| |
* | | | Merge pull request #22989 from owncloud/lock_sharing_opsMorris Jobke2016-05-032-43/+222
|\ \ \ \ | |/ / / |/| | | Add locking to modifying operation of the OCS Share API
| * | | Unlock before all returnsRoeland Jago Douma2016-04-301-7/+50
| | | |
| * | | Add locking to modifying operation of the OCS Share APIRoeland Jago Douma2016-04-302-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 transifexJenkins for ownCloud2016-05-034-0/+4
| | | |
* | | | Merge pull request #24394 from owncloud/cleanup_share_classmapRoeland Douma2016-05-037-19/+11
|\ \ \ \ | | | | | | | | | | Cleanup Files_Sharing CLASSPATH
| * | | | Cleanup Files_Sharing CLASSPATHRoeland Jago Douma2016-05-027-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 namespaceJoas Schilling2016-05-021-2/+2
|/ / /
* | | Merge pull request #24238 from owncloud/caldav-test-event-in-far-futureJoas Schilling2016-05-023-4/+8
|\ \ \ | | | | | | | | Test an event in the far future
| * | | firstoccurence and lastoccurence have a length now - triggering BIGINT on ↵Thomas Müller2016-04-292-1/+3
| | | | | | | | | | | | | | | | postgres - refs #24221
| * | | Test an event in the far future - refs #24221Thomas Müller2016-04-291-3/+5
| | | |