summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #17024 from owncloud/master-verify-if-path-exists-in-uploadThomas Müller2015-06-191-0/+4
|\ | | | | [master] Verify if path exists
| * Verify if path existsLukas Reschke2015-06-181-0/+4
| | | | | | | | We need to check if the path exists and throw an error instead of handling this situation ungraciously.
* | [tx-robot] updated from transifexJenkins for ownCloud2015-06-1936-70/+36
|/
* Merge pull request #16692 from owncloud/add_social_media_buttonsBjörn Schießle2015-06-1811-6/+650
|\ | | | | Add social media buttons
| * add id to urlBjoern Schiessle2015-06-182-7/+7
| |
| * fix look of 'Share with me via ownCloud' button, fix wordingJan-Christoph Borchardt2015-06-173-51/+11
| |
| * fix path to owncloud logoBjoern Schiessle2015-06-172-2/+4
| |
| * make the click actions workBjoern Schiessle2015-06-172-7/+9
| |
| * federated cloud ID: add icons, fix HTML & layout, fix wordingJan-Christoph Borchardt2015-06-1710-39/+382
| |
| * add social media button for diaspora, twitter, facebook and google+Bjoern Schiessle2015-06-177-6/+343
| |
* | Merge pull request #16890 from owncloud/fix-16588Thomas Müller2015-06-182-6/+10
|\ \ | | | | | | the user is gone, userExists will not bring him back. But the user's …
| * | delete user test to take getHome into account to ensure it is also deleted ↵Arthur Schiwon2015-06-171-1/+4
| | | | | | | | | | | | subsequently
| * | the user is gone, userExists will not bring him back. But the user's folder ↵Arthur Schiwon2015-06-111-5/+6
| | | | | | | | | | | | needs to be deleted anyway
* | | Merge pull request #16993 from owncloud/verify-if-path-existsLukas Reschke2015-06-181-0/+7
|\ \ \ | | | | | | | | [master] Verify if path exists
| * | | Throw nicer error message instead 500Lukas Reschke2015-06-171-1/+3
| | | |
| * | | Verify if path existsLukas Reschke2015-06-171-0/+5
| | | | | | | | | | | | | | | | We need to verify if the specified path exists to gracefully prevent errors.
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-06-1820-14/+152
| | | |
* | | | Merge pull request #16893 from owncloud/fixSlideToggleMorris Jobke2015-06-171-1/+1
|\ \ \ \ | |/ / / |/| | | Fix childs of slideToggle not sliding the target
| * | | remove unneeded span around Settings text, fixes cursorJan-Christoph Borchardt2015-06-171-1/+1
| | | |
* | | | Merge pull request #16729 from owncloud/scanner-read-lockThomas Müller2015-06-171-0/+11
|\ \ \ \ | | | | | | | | | | keep a read lock while scanning a file or folder
| * | | | explain pre-hook scanRobin Appelman2015-06-151-0/+1
| | | | |
| * | | | ensure we dont have to scan a file in the trash wrapperRobin Appelman2015-06-151-0/+10
| | | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-06-178-4/+12
| | | | |
* | | | | Merge pull request #16938 from owncloud/ext-s3-opendirduplicateMorris Jobke2015-06-161-0/+4
|\ \ \ \ \ | | | | | | | | | | | | Skip directory entry in S3 opendir
| * | | | | Skip directory entry in S3 opendirVincent Petry2015-06-151-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The result set contains the directory itself, so skip it to avoid scanning a non-existing directory
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-06-166-4/+138
| |/ / / / |/| | | |
* | | | | Merge pull request #16911 from oparoz/prettier-public-thumbnailsThomas Müller2015-06-151-2/+4
|\ \ \ \ \ | | | | | | | | | | | | Determine the size we need before asking for a thumbnail
| * | | | | floats are not welcome when setting the size of a previewOlivier Paroz2015-06-121-4/+4
| | | | | |
| * | | | | Determine the size we need before asking for a thumbnailOlivier Paroz2015-06-121-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | We need to set the size of the preview using the devicePixelRatio and use that as arguments when using the preview endpoint or that endpoint will use the default 36x36 and thumbnails will be blurry on high DPI devices
* | | | | | Merge pull request #16885 from owncloud/files-previewurlresolutionroundingThomas Müller2015-06-151-1/+3
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Truncate preview resolution
| * | | | | Truncate preview resolutionVincent Petry2015-06-111-1/+3
| | |_|/ / | |/| | | | | | | | | | | | | This prevents having float numbers appear in the URL
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-06-158-10/+168
| | | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-06-1412-4/+30
| | | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-06-132-2/+98
| |/ / / |/| | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-06-126-6/+116
|/ / /
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-06-1110-18/+60
| | |
* | | Merge pull request #16736 from owncloud/utilize-member-ofThomas Müller2015-06-105-35/+110
|\ \ \ | | | | | | | | Utilize memberOf to boost loading time on users page (depending on LDAP server config)
| * | | if possible, getUserGroups should get memberships using memberOf virtual ↵Arthur Schiwon2015-06-034-2/+96
| | | | | | | | | | | | | | | | attribute
| * | | Implement a faster way for checking availability of memberOf. Users tab in ↵Arthur Schiwon2015-06-031-33/+14
| | | | | | | | | | | | | | | | the wizard benefits.
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-06-108-8/+172
| | | |
* | | | Merge pull request #16810 from owncloud/disable-search-if-not-implementedThomas Müller2015-06-091-0/+1
|\ \ \ \ | | | | | | | | | | Disable search field in case there is no search available to the curr…
| * | | | Search results have to explicitly be added to the content area of the appThomas Müller2015-06-091-0/+1
| | | | |
* | | | | Disable video preview if previews are disabledMorris Jobke2015-06-093-1/+3
| |_|/ / |/| | |
* | | | Merge pull request #16811 from espenfjo/masterMorris Jobke2015-06-091-1/+1
|\ \ \ \ | | | | | | | | | | Fix regression in preview height calculation
| * | | | Fix regression in preview height calculationEspen Fjellvær Olsen2015-06-081-1/+1
| |/ / / | | | | | | | | Fix regressions introduced in a672e9d regarding the image height calculation
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-06-096-16/+110
| | | |
* | | | add hint to exceptionBjoern Schiessle2015-06-081-5/+4
|/ / /
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-06-0814-32/+94
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-06-0742-24/+386
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-06-066-10/+10
| | |