summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [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
| |/ / / /
* | | | | Merge pull request #5165 from owncloud/files-dropontobreadcrumbfixMorris Jobke2013-10-071-6/+8
|\ \ \ \ \
| * | | | | Fix breadcrumb to reinit dnd after ajax nav #5064Vincent Petry2013-10-071-6/+8
| |/ / / /
* | | | | Merge pull request #5142 from owncloud/fix_version_cache_expireFrank Karlitschek2013-10-071-1/+4
|\ \ \ \ \
| * | | | | a few styleguide fixesFrank Karlitschek2013-10-071-2/+2
| * | | | | correctly expire cache if version file changed. Fixes problem that ownCloud o...Frank Karlitschek2013-10-051-1/+4
* | | | | | Merge pull request #4974 from owncloud/fixing-4011-masterThomas Müller2013-10-074-70/+99
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Merge branch 'master' into fixing-4011-masterThomas Müller2013-10-04484-2132/+10456
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into fixing-4011-masterThomas Müller2013-09-305-14/+201
| |\ \ \ \ \ \
| * | | | | | | adding test testSimplePutFailsOnRename()Thomas Müller2013-09-301-0/+14
| * | | | | | | remove commented codeThomas Müller2013-09-301-56/+0
| * | | | | | | Merge branch 'master' into fixing-4011-masterThomas Müller2013-09-3097-573/+1100
| |\ \ \ \ \ \ \
| * | | | | | | | remove unused setUp()Thomas Müller2013-09-271-3/+0
| * | | | | | | | catching NotPermittedException and throw it to the dav client as 403Thomas Müller2013-09-261-5/+10
| * | | | | | | | adding basic unit test for failing file_put_content operationThomas Müller2013-09-241-0/+27
| * | | | | | | | creating non static getETagPropertyForPath()Thomas Müller2013-09-243-16/+28