summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #19511 from owncloud/etag-share-permissions-updateRobin Appelman2015-10-064-4/+28
|\
| * fix phpdocRobin Appelman2015-10-061-1/+1
| * use microtimeRobin Appelman2015-10-061-1/+1
| * clear hooks for testsRobin Appelman2015-10-061-0/+1
| * Mark shares as dirty when changing permissionsRobin Appelman2015-10-063-3/+26
* | Propagate shares etag when group membership changedVincent Petry2015-10-064-0/+336
* | Merge pull request #19595 from owncloud/fix-versions-log-entryThomas Müller2015-10-061-1/+1
|\ \ | |/ |/|
| * Reset to auto if not setVictor Dubiniuk2015-10-051-1/+1
* | Merge pull request #19597 from owncloud/update-license-headersThomas Müller2015-10-06204-134/+274
|\ \
| * | deduplicate @xenopathicMorris Jobke2015-10-0685-85/+77
| * | update licence headers via scriptMorris Jobke2015-10-05168-96/+244
| |/
* | Merge pull request #18484 from owncloud/fix-17964Thomas Müller2015-10-062-7/+152
|\ \
| * | trim by default, add unit testsArthur Schiwon2015-10-052-16/+140
| * | Spaces -> Tabs, Update PHP-Doc and function logicLennart Rosam2015-10-051-12/+27
| * | Remove whitespace from base-DNsLennart Rosam2015-10-051-6/+12
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-10-0626-16/+164
| |/ |/|
* | Fix tooltip placement on rename errorVincent Petry2015-10-051-2/+2
* | add some output to explain the pre-conditions for decrypt-allBjoern Schiessle2015-10-051-0/+6
|/
* Merge pull request #19487 from owncloud/split_share_middlewareThomas Müller2015-10-058-86/+229
|\
| * sharingcheckmiddleware now handles externalshares as wellRoeland Jago Douma2015-10-028-66/+195
| * Split files_sharing middelwareRoeland Jago Douma2015-10-022-29/+43
* | Merge pull request #19552 from owncloud/inline_fileactions_alttextThomas Müller2015-10-052-1/+58
|\ \
| * | If an inline files action provides an alt text show itRoeland Jago Douma2015-10-032-1/+58
* | | Merge pull request #19539 from owncloud/fix-multiselect-overlap-shorterThomas Müller2015-10-051-0/+4
|\ \ \
| * | | Fix filelist size issues, breadcrumb, multiselectVincent Petry2015-10-021-0/+4
| | |/ | |/|
* | | Merge pull request #19547 from owncloud/fix-16154Thomas Müller2015-10-051-4/+5
|\ \ \
| * | | LDAP Wizard: do not be picky about credentials when only looking for the portArthur Schiwon2015-10-031-4/+5
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-10-052-0/+10
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-10-0428-0/+172
| |_|/ |/| |
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-10-0338-26/+362
|/ /
* | Merge pull request #19534 from owncloud/fix_19532Thomas Müller2015-10-021-0/+5
|\ \
| * | if mountpoint is applicable to all users the old API expects a array with 'all'Bjoern Schiessle2015-10-021-0/+5
* | | Lock files when rolling back versionRobin Appelman2015-10-021-0/+9
* | | Merge pull request #19514 from owncloud/list_remote_shares_in_shared_with_youThomas Müller2015-10-022-17/+171
|\ \ \ | |/ / |/| |
| * | Fix and extend unit testsRoeland Jago Douma2015-10-022-14/+111
| * | More fileinfoRoeland Jago Douma2015-10-021-4/+8
| * | Start to show remote shares in shared with you sectionRoeland Jago Douma2015-10-021-6/+59
* | | Merge pull request #19523 from owncloud/fix-seconds-agoThomas Müller2015-10-022-2/+2
|\ \ \ | |/ / |/| |
| * | Fix moment.js "a few seconds ago" with "seconds ago"Morris Jobke2015-10-022-2/+2
| |/
* | Merge pull request #19497 from owncloud/ie8-multiselect-delete-action-pukeThomas Müller2015-10-021-0/+4
|\ \
| * | [IE8] Fix dangling Delete action when multiselect is enabledVincent Petry2015-10-011-0/+4
* | | Merge pull request #19499 from owncloud/files-versions-properlyreloadafterrevertThomas Müller2015-10-022-2/+13
|\ \ \
| * | | Reload versions list after revertVincent Petry2015-10-012-2/+13
| |/ /
* | | Merge pull request #19500 from owncloud/fix_trash_with_encryption2Thomas Müller2015-10-022-18/+26
|\ \ \
| * | | first copy to owner and then move to current user because the encryptionBjoern Schiessle2015-10-012-18/+26
* | | | Merge pull request #19521 from owncloud/files-conflictdialog-loadpromiseThomas Müller2015-10-021-2/+5
|\ \ \ \
| * | | | Make sure the conflict dialog is loaded before adding conflictsVincent Petry2015-10-021-2/+5
| | |_|/ | |/| |
* | | | Merge pull request #19522 from owncloud/activity-395-less-sidebar-textThomas Müller2015-10-024-37/+139
|\ \ \ \
| * | | | Fix intendationJoas Schilling2015-10-021-34/+34
| * | | | Use shorter text on the sidebar for files_sharing activitiesJoas Schilling2015-10-023-5/+69