summaryrefslogtreecommitdiffstats
path: root/apps/files_sharing
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2014-03-192-0/+2
* Merge pull request #7649 from owncloud/routing-publicThomas Müller2014-03-171-1/+1
|\
| * Move the router classes to a namespace and expose it with a public interfaceRobin Appelman2014-03-101-1/+1
* | Merge pull request #7734 from owncloud/icon-class-removeMorris Jobke2014-03-162-2/+2
|\ \
| * | remove unneeded icon classJan-Christoph Borchardt2014-03-142-2/+2
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-03-161-0/+1
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-03-152-1/+3
|/ /
* | [tx-robot] updated from transifexJenkins for ownCloud2014-03-132-0/+18
* | finally fix the paths for the OCS Share APIBjoern Schiessle2014-03-132-5/+128
* | [tx-robot] updated from transifexJenkins for ownCloud2014-03-132-0/+2
* | [tx-robot] updated from transifexJenkins for ownCloud2014-03-1247-3/+89
* | Merge pull request #7665 from owncloud/fix_ocs_share_api_pathsBjörn Schießle2014-03-112-8/+201
|\ \
| * | add 'received_from' info to the share, so that every share can have a differe...Bjoern Schiessle2014-03-111-2/+4
| * | fix path creation for re-shares, issue #7662Bjoern Schiessle2014-03-111-6/+197
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-03-1170-396/+60
|/ /
* / we need the file_source to delete a share successfullyBjoern Schiessle2014-03-102-7/+40
|/
* Merge branch 'master' into fix-7307Thomas Müller2014-03-063-7/+20
|\
| * Merge branch 'master' into display-share-owner-masterThomas Müller2014-02-287-27/+211
| |\
| * | Improve jQuery element selectorMorris Jobke2014-02-201-1/+1
| * | uppercase text and fix dialog popupThomas Müller2014-02-201-4/+4
| * | show share owner within shared folders as wellThomas Müller2014-02-201-0/+3
| * | remove duplicate selectors and declarationThomas Müller2014-02-201-7/+6
| * | update share ownerThomas Müller2014-02-201-0/+8
| * | adding share owner information to the file listThomas Müller2014-02-201-0/+3
* | | Replace OC.Router.generate() with OC.generateUrl()Thomas Müller2014-03-021-0/+1
| |/ |/|
* | Merge pull request #7421 from owncloud/password-inputThomas Müller2014-02-261-1/+4
|\ \
| * | disable autocomplete for shared link password input, fix #7419Jan-Christoph Borchardt2014-02-261-1/+4
* | | Merge pull request #7393 from owncloud/fix_path_in_sharing_resultsBjörn Schießle2014-02-262-0/+69
|\ \ \
| * | | fix path in sharing results if it is a file in the Shared folderBjoern Schiessle2014-02-252-0/+69
| |/ /
* / / only add "received_from" if a share was foundBjoern Schiessle2014-02-261-6/+6
|/ /
* | Merge pull request #7285 from owncloud/mimeicons-svgMorris Jobke2014-02-241-1/+2
|\ \
| * | Merge branch 'master' into mimeicons-svgRobin Appelman2014-02-201-5/+25
| |\|
| * | Fix svg icons for public shares and external/shared filesRobin Appelman2014-02-191-1/+2
* | | fix test so that it doesn't depend on the array orderBjoern Schiessle2014-02-211-14/+25
* | | fix usersPath and add unit testsBjoern Schiessle2014-02-212-10/+110
| |/ |/|
* | Merge pull request #7195 from owncloud/files-selectallVincent Petry2014-02-191-5/+25
|\ \ | |/ |/|
| * Do not send file list for select all on Download/deleteVincent Petry2014-02-131-5/+25
* | Scrutinizer Auto-FixesScrutinizer Auto-Fixer2014-02-192-1/+2
* | 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
|\ \