summaryrefslogtreecommitdiffstats
path: root/apps/files_sharing
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into scrutinizer_documentation_patchesThomas Müller2014-02-183-6/+11
|\
| * Merge pull request #7190 from owncloud/appconfig-legacy-appsThomas Müller2014-02-182-5/+7
| |\
| | * Remove usage of legacy OC_AppconfigRobin Appelman2014-02-132-5/+7
| * | Consolidate two sections, per code review. Issue #1648Matthew Caron2014-02-171-6/+2
| * | Fit shared videos to viewer, just like images. Issue #1648Matthew Caron2014-02-141-0/+7
* | | Merge branch 'master' into scrutinizer_documentation_patchesThomas Müller2014-02-144-5/+23
|\| |
| * | Merge pull request #6726 from owncloud/fix_6630Vincent Petry2014-02-142-2/+2
| |\ \ | | |/ | |/|
| | * Fixed double file encoding for previewsVincent Petry2014-01-301-1/+1
| | * don't urldecode get var, php does this automaticallyGeorg Ehrke2014-01-301-1/+1
| * | replace 'size' with 'unencrypted_size' if encryption is enabledBjoern Schiessle2014-02-072-3/+21
* | | polish documentation based on scrutinizer patchesJörn Friedrich Dreyer2014-02-064-0/+9
|/ /
* | Merge pull request #7089 from owncloud/sharing-searchbymimeVincent Petry2014-02-062-9/+164
|\ \
| * | Fixed searchByMime in shared cacheVincent Petry2014-02-052-9/+164
* | | Remove unused template variable assignment of files_sharing/template/public.phpPellaeon Lin2014-02-061-5/+0
* | | Move template variable assignment to correct placePellaeon Lin2014-02-061-4/+5
* | | Merge pull request #6235 from NCTU-NBA/pr-exceed_upload_limit_msgJan-Christoph Borchardt2014-02-041-0/+4
|\ \ \ | |/ / |/| |
| * | Merge branch 'master' into pr-exceed_upload_limit_msgPellaeon Lin2014-01-3026-269/+363
| |\|
| * | Add $freeSpace and $uploadLimit to files_sharingPellaeon Lin2014-01-172-0/+6
* | | remove needless element tagBjoern Schiessle2014-01-301-2/+1
| |/ |/|
* | Merge pull request #6777 from owncloud/mobile-styleJan-Christoph Borchardt2014-01-295-130/+101
|\ \
| * | make header scroll up for single shares, more view of content on small screensJan-Christoph Borchardt2014-01-291-0/+4
| * | - adding class to header div: share-folder or share-fileThomas Müller2014-01-291-2/+3
| * | adjust file type icon placement for when no preview can be generatedJan-Christoph Borchardt2014-01-293-1/+10
| * | permanently show download action on mobile, only iconJan-Christoph Borchardt2014-01-291-6/+17
| * | fix horizontal scrollbar appearing when footer is too long, footer wraps nowJan-Christoph Borchardt2014-01-291-2/+1
| * | merge master into mobile-styleJan-Christoph Borchardt2014-01-297-32/+38
| |\ \
| * | | Instead of 'No preview available for ...' we simple display the mieme-type iconThomas Müller2014-01-232-20/+9
| * | | remove background and width from multiselect bar, fix Download button not sho...Jan-Christoph Borchardt2014-01-231-3/+2
| * | | fix conflicts and add missing closing tagMorris Jobke2014-01-232-9/+1
| * | | focus link text only on click in the input field - closes #6817Thomas Müller2014-01-231-1/+4
| * | | Merge branch 'master' into mobile-styleThomas Müller2014-01-2311-42/+38
| |\ \ \
| * | | | remove unused variableThomas Müller2014-01-201-1/+0
| * | | | on mobile, show single shared image at full width without marginJan-Christoph Borchardt2014-01-162-3/+12
| * | | | show publicly shared image on full width, without marginJan-Christoph Borchardt2014-01-161-5/+3
| * | | | fix public share download button widthJan-Christoph Borchardt2014-01-162-4/+11
| * | | | tweak color and position of username in public shareJan-Christoph Borchardt2014-01-151-9/+8
| * | | | improvements to public files mobile viewJan-Christoph Borchardt2014-01-151-5/+10
| * | | | add download button on single file share pageThomas Müller2014-01-151-4/+10
| * | | | remove unused js code and css rulesThomas Müller2014-01-152-60/+0
| * | | | reuse file upload as used within files app - remove public upload buttonThomas Müller2014-01-152-53/+4
| * | | | first mobile style rules, hide extra columns in files view and scroll headerJan-Christoph Borchardt2014-01-142-0/+19
* | | | | Merge pull request #6987 from owncloud/share_api_and_encryptionBjörn Schießle2014-01-291-10/+4
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | public upload is also possible with encryption enabled, since OC6Bjoern Schiessle2014-01-281-10/+4
* | | | | Merge pull request #6929 from owncloud/sharing-fixfiledownloadlinkMorris Jobke2014-01-291-9/+7
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fixed download URL in public pageVincent Petry2014-01-241-9/+7
* | | | | use more accurate error codesBjoern Schiessle2014-01-281-5/+5
* | | | | Merge pull request #6912 from owncloud/replace-webroot-in-cssMorris Jobke2014-01-274-25/+5
|\ \ \ \ \
| * | | | | remove %webroot from files_sharing appJan-Christoph Borchardt2014-01-234-25/+5
* | | | | | Merge pull request #5153 from owncloud/core-em-to-pxJan-Christoph Borchardt2014-01-271-8/+8
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Fixes typos, adds ; wherever not present.raghunayyar2014-01-161-1/+1