summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
...
* | Yo-ho-oh - Murder all band 'o pirates - backport of #24550Thomas Müller2016-05-118-42/+0
|/
* Disable pastezone for jquery.fileuploadLukas Reschke2016-04-261-0/+1
* Merge pull request #24259 from owncloud/stable9-mount-uniqueThomas Müller2016-04-262-2/+22
|\
| * add testRobin Appelman2016-04-251-0/+11
| * don't get the config for the same mount multiple timesRobin Appelman2016-04-251-2/+11
* | Merge pull request #24242 from owncloud/stable9-backport-24052Thomas Müller2016-04-266-48/+32
|\ \
| * | Fix LDAP race conditionsMorris Jobke2016-04-256-48/+32
* | | Merge pull request #24236 from owncloud/backport-24214-stable9Thomas Müller2016-04-252-11/+3
|\ \ \ | |_|/ |/| |
| * | on clone Connection, do not take over the existing LDAP resourceArthur Schiwon2016-04-252-11/+3
| |/
* / Add missing use statementJoas Schilling2016-04-251-0/+1
|/
* Merge pull request #24158 from owncloud/encryped-size-progation-9Thomas Müller2016-04-222-14/+68
|\
| * Add unit tests for shared size propagation with encryptionRobin Appelman2016-04-212-14/+68
* | Personal calendar should be generated even if the birthday calendar already e...Thomas Müller2016-04-222-16/+169
* | Merge pull request #24131 from owncloud/dont-transfer-files-to-not-ready-user...Thomas Müller2016-04-223-0/+20
|\ \
| * | Introduce isReadyForUser and verify in file transfer ownership - fixes #23786Thomas Müller2016-04-203-0/+20
* | | Merge pull request #24163 from owncloud/fix-birthday_calendar-acl-stable9Thomas Müller2016-04-213-15/+19
|\ \ \
| * | | Birthday calendar should never have write acl - fixes #24154Thomas Müller2016-04-213-15/+19
| |/ /
* | | Merge pull request #24112 from owncloud/backport-24111-chunking-users-in-back...Thomas Müller2016-04-213-56/+24
|\ \ \ | |_|/ |/| |
| * | Chunk the users correctly in the trashbin and versions background jobJoas Schilling2016-04-203-56/+24
| |/
* | Merge pull request #24099 from owncloud/fix_23632_9.0Thomas Müller2016-04-202-10/+48
|\ \
| * | we need to initialize the mount points of the given user before we recoverBjörn Schießle2016-04-192-10/+48
| |/
* | Merge pull request #23831 from owncloud/backport-23511Thomas Müller2016-04-202-4/+19
|\ \ | |/ |/|
| * sidebar click modificationErik Pellikka2016-04-072-4/+19
* | Adding VCFExportPluginThomas Müller2016-04-101-0/+2
* | Merge pull request #23801 from owncloud/fix-23496-master-stable9Thomas Müller2016-04-081-2/+4
|\ \ | |/ |/|
| * fixes #23496Thomas Müller2016-04-051-2/+4
* | Merge pull request #23574 from owncloud/sabre-plugin-browser-error-page-stable9Thomas Müller2016-04-066-2/+217
|\ \ | |/ |/|
| * Add magical regex to catch browsersLukas Reschke2016-03-241-1/+7
| * In case of exception we return an html page in case the client is a browserThomas Müller2016-03-246-2/+211
* | Inject the Mount ManagerJoas Schilling2016-04-042-6/+10
* | Unmount the share before deleting it, so we don't try to use it later onJoas Schilling2016-04-041-0/+6
* | Merge pull request #23518 from owncloud/stable9-gdrive-stream-downloadThomas Müller2016-03-311-4/+5
|\ \
| * | GDrive stream download with RetryWrapperVincent Petry2016-03-301-4/+5
* | | Merge pull request #23522 from owncloud/stable9-dropbox-stream-downloadFrank Karlitschek2016-03-312-8/+32
|\ \ \
| * | | Dropbox stream download with RetryWrapperVincent Petry2016-03-231-4/+6
| * | | Fix dropbox storage to not store the whole file in memoryVincent Petry2016-03-232-7/+29
* | | | Revert "Explicitly add the current principal to the acl in case of group shar...Thomas Müller2016-03-3114-137/+65
* | | | Merge pull request #23673 from owncloud/stable9-fix-sftp-retry-wrapperThomas Müller2016-03-311-1/+3
|\ \ \ \
| * | | | Use RetryWrapper for SFTP storageLukas Reschke2016-03-301-1/+3
* | | | | Handle group shares of addressbooks on v1 as well ... now FINALLY ....Thomas Müller2016-03-311-1/+2
* | | | | Fix acls for calendar objects and cards - fixes #23273Thomas Müller2016-03-319-84/+193
* | | | | Return proper current-user-principal on v1 endpoints - fixes #23306Thomas Müller2016-03-311-0/+15
* | | | | Fix group shares on v1 caldav and carddav - fixes #23328Thomas Müller2016-03-313-4/+5
* | | | | Merge pull request #23629 from owncloud/fix-group-sharing-access-stable9Thomas Müller2016-03-3114-67/+139
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Fix unit testThomas Müller2016-03-301-1/+1
| * | | | Explicitly add the current principal to the acl in case of group sharingThomas Müller2016-03-2914-66/+138
| |/ / /
* | | | Merge pull request #23664 from owncloud/stable9-share-displayownerfixThomas Müller2016-03-302-3/+4
|\ \ \ \
| * | | | Fix displaying owner before share icon in file listVincent Petry2016-03-302-3/+4
| |/ / /
* / / / Use the shipped cacerts.pem instead of the global oneLukas Reschke2016-03-301-0/+1
|/ / /
* | / Return remote shares in oc:share-types Webdav propertyVincent Petry2016-03-244-2/+8
| |/ |/|