summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* fix escapingMorris Jobke2013-10-081-1/+1
* make sure that we only remove file/folder sharesBjoern Schiessle2013-10-082-3/+3
* Merge pull request #5194 from owncloud/fixing-5172-masterThomas Müller2013-10-082-13/+22
|\
| * adding check isDeletable() on $sourcePathThomas Müller2013-10-082-13/+22
* | Merge pull request #5193 from owncloud/fix_5126_2Björn Schießle2013-10-082-2/+27
|\ \
| * | part file needs to have .part extensionBjoern Schiessle2013-10-081-1/+1
| * | updating a existing large file creates new file chunks. Therefore createFile(...Bjoern Schiessle2013-10-081-2/+16
| * | If a existing file in Shared/ with update permissions gets updated we need to...Bjoern Schiessle2013-10-081-0/+11
| |/
* / [tx-robot] updated from transifexJenkins for ownCloud2013-10-0834-113/+176
|/
* Merge pull request #5181 from owncloud/fixing-chunked-upload-masterMorris Jobke2013-10-071-2/+2
|\
| * the path for reassembling was created the wrong wayThomas Müller2013-10-071-2/+2
* | Merge pull request #4796 from owncloud/config-no-catchBart Visscher2013-10-071-10/+2
|\ \
| * | Remove the exception catch, this should be handled by a higher layerBart Visscher2013-10-071-10/+2
* | | Merge pull request #5184 from owncloud/fix-trash-bin-buttonVicDeo2013-10-071-2/+4
|\ \ \
| * | | Fix trash bin buttonMorris Jobke2013-10-071-2/+4
| | |/ | |/|
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-10-07121-1456/+5189
* | | Merge pull request #5179 from owncloud/userlist-avatarMorris Jobke2013-10-071-0/+6
|\ \ \ | |/ / |/| |
| * | Fix new user avatar. Ref#5166Victor Dubiniuk2013-10-071-0/+6
* | | Merge pull request #5178 from owncloud/sharing-ispublicflagintemplateVincent Petry2013-10-071-0/+1
|\ \ \
| * | | Added isPublic flag in files_sharing templateVincent Petry2013-10-071-0/+1
* | | | Merge pull request #4921 from owncloud/file_conflicts_dialog_fixesVicDeo2013-10-076-42/+7
|\ \ \ \ | |_|/ / |/| | |
| * | | remove double uri encodingJörn Friedrich Dreyer2013-10-071-4/+4
| * | | canceling individual uploads is currently impossible because there is no plac...Jörn Friedrich Dreyer2013-10-072-34/+1
| * | | use correct property for mimetype of existing filesJörn Friedrich Dreyer2013-10-071-1/+1
| * | | remove obsolete commentJörn Friedrich Dreyer2013-10-071-2/+0
| * | | use !== comparisonJörn Friedrich Dreyer2013-10-071-1/+1
* | | | Merge pull request #5072 from owncloud/apache-auth-masterThomas Müller2013-10-076-4/+170
|\ \ \ \ | |_|/ / |/| | |
| * | | Move backend finding into its own method.Andreas Fischer2013-10-071-16/+26
| * | | move call to print_unescaped() to templateThomas Müller2013-10-072-2/+2
| * | | Also replace ApacheBackend with Authentication\IApacheBackend in user.Andreas Fischer2013-10-021-4/+4
| * | | fixing various PHPDoc commentsThomas Müller2013-10-022-6/+12
| * | | fixing namespace of ApacheBackend - now know as OCP\Authentication\IApacheBac...Thomas Müller2013-10-021-5/+5
| * | | remove obsolete function login()Thomas Müller2013-10-021-8/+0
| * | | adding PHPDoc commentThomas Müller2013-10-021-1/+3
| * | | adding warning about failed apache module authThomas Müller2013-10-021-0/+6
| * | | code cleanup - remove special case for webdav in handleApacheAuth()Thomas Müller2013-10-023-20/+23
| * | | $defaults is not necessary here - merge artifactThomas Müller2013-10-021-2/+0
| * | | Revert "use $defaults instead of $theme"Thomas Müller2013-10-021-3/+3
| * | | Merge branch 'master' into apache-auth-masterThomas Müller2013-10-02314-17/+78
| |\ \ \
| * | | | adding getCurrentUserId() to ApacheBackendThomas Müller2013-10-012-6/+11
| * | | | use $defaults instead of $themeThomas Müller2013-10-011-3/+3
| * | | | Squashed commit of the following:Thomas Müller2013-10-015-2/+146
* | | | | Merge pull request #5169 from owncloud/sharingdropdown-uxbugfixesMorris Jobke2013-10-071-2/+4
|\ \ \ \ \
| * | | | | Prevent share dropdown to close too early with autocompleteVincent Petry2013-10-071-1/+1
| * | | | | Fixed label for sharing notification to be clickableVincent Petry2013-10-071-1/+1
| * | | | | Prevent scroll up when click on links in sharing dropdownVincent Petry2013-10-071-0/+2
* | | | | | Merge pull request #5162 from owncloud/fixing-l10n-master-2Morris Jobke2013-10-0787-3388/+1
|\ \ \ \ \ \
| * | | | | | update version to 6.0.0 and adding comment optionThomas Müller2013-10-071-1/+1
| * | | | | | move l10n factory into privateThomas Müller2013-10-071-0/+0
| * | | | | | remove outdated translation filesThomas Müller2013-10-0785-3387/+0
| |/ / / / /