summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* let admin specify timezone for log file entriesBjoern Schiessle2013-10-072-3/+8
|
* Merge pull request #5169 from owncloud/sharingdropdown-uxbugfixesMorris Jobke2013-10-071-2/+4
|\ | | | | Sharing dropdown bug fixes
| * Prevent share dropdown to close too early with autocompleteVincent Petry2013-10-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | When clicking on an autocomplete result in the sharing dropdown, it will mistakenly be detected as being clicked outside and would trigger the sharing dropdown closing. This fix adds a check to detect clicks inside the autocomplete and prevent closing the dropdown in that case. This fixes #4142
| * Fixed label for sharing notification to be clickableVincent Petry2013-10-071-1/+1
| | | | | | | | | | Fixed the sharing notification checkbox label in the file sharing dropdown, which makes it possible to click on the label directly.
| * Prevent scroll up when click on links in sharing dropdownVincent Petry2013-10-071-0/+2
| | | | | | | | | | | | | | | | | | When clicking on a link that points to "#" in the sharing dropdown, and the current view is scrolled down, the browser will scroll the page up to the top (anchor behavior). This fix cancels the click event when clicking on "unshare" link or "show crud" link.
* | Merge pull request #5162 from owncloud/fixing-l10n-master-2Morris Jobke2013-10-0787-3388/+1
|\ \ | | | | | | Fixing l10n master 2
| * | 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 #5064
| * | Fix breadcrumb to reinit dnd after ajax nav #5064Vincent Petry2013-10-071-6/+8
| |/ | | | | | | | | | | | | Now correctly reinitializing the breadcrumb drop zone after ajax navigation. This also fixes dropping onto the "files" app icon.
* | Merge pull request #5142 from owncloud/fix_version_cache_expireFrank Karlitschek2013-10-071-1/+4
|\ \ | | | | | | correctly expire cache if version file changed.
| * | a few styleguide fixesFrank Karlitschek2013-10-071-2/+2
| | |
| * | correctly expire cache if version file changed. Fixes problem that ownCloud ↵Frank Karlitschek2013-10-051-1/+4
| | | | | | | | | | | | only starts upgrading during login
* | | Merge pull request #4974 from owncloud/fixing-4011-masterThomas Müller2013-10-074-70/+99
|\ \ \ | | | | | | | | error handling added in case file_put_contents is failing
| * \ \ 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
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/connector/sabre/directory.php
| * | | | | 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
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/connector/sabre/directory.php lib/connector/sabre/file.php
| * | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | adding public $fileView to Node to allow unit testing
| * | | | | | unify duplicate codeThomas Müller2013-09-242-59/+29
| | | | | | |
| * | | | | | adding error handling on file_put_contents within the web dav implementationThomas Müller2013-09-242-2/+12
| | | | | | |
* | | | | | | Merge pull request #5129 from owncloud/remove_deleted_shares_from_dbBjörn Schießle2013-10-073-7/+36
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | remove deleted files from oc_share
| * | | | | | catch exception if db query execution failsBjoern Schiessle2013-10-071-1/+5
| | | | | | |
| * | | | | | Merge branch 'master' into remove_deleted_shares_from_dbBjoern Schiessle2013-10-0784-553/+3175
| |\ \ \ \ \ \
| * | | | | | | clean up oc_share table from files which are no longer existsBjoern Schiessle2013-10-072-7/+17
| | | | | | | |
| * | | | | | | add commentsBjoern Schiessle2013-10-041-0/+5
| | | | | | | |
| * | | | | | | remove deleted shares from the database table oc_shareBjoern Schiessle2013-10-021-0/+10
| | | | | | | |
* | | | | | | | Merge pull request #4662 from owncloud/fix-4129Frank Karlitschek2013-10-061-47/+78
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix 4129
| * | | | | | | | Update file to meet coding standartsLennart Rosam2013-10-071-47/+77
| | | | | | | | |
| * | | | | | | | Actually test the connectionLennart Rosam2013-10-071-1/+1
| | | | | | | | |
| * | | | | | | | Fixes #4129Lennart Rosam2013-10-071-2/+3
| | | | | | | | |
* | | | | | | | | Merge pull request #5148 from owncloud/cache-gc-legacyMorris Jobke2013-10-061-0/+4
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix loading legacy global filecache gc backgroundjobs
| * | | | | | | | | Fix loading legacy global filecache gc backgroundjobsRobin Appelman2013-10-051-0/+4
| | | | | | | | | |
* | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-10-06808-17775/+27358
| | | | | | | | | |
* | | | | | | | | | Merge pull request #5088 from owncloud/fix_trashbin_buttonMorris Jobke2013-10-061-3/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | trash bin button needs to be an input field
| * | | | | | | | | | trash bin button needs to be an input fieldBjoern Schiessle2013-10-021-3/+1
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #5144 from owncloud/public_middlewareBernhard Posselt2013-10-066-96/+8
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | Make abstract Middleware class public
| * | | | | | | | | Remove misleading IMiddleware interfaceThomas Tanghus2013-10-053-91/+3
| | | | | | | | | |
| * | | | | | | | | Make abstract Middleware class publicThomas Tanghus2013-10-055-10/+10
| | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It doesn't make sense for subclasses to have to implement all methods.
* | | | | | | | | Merge pull request #5154 from owncloud/fix-appimagesMorris Jobke2013-10-064-4/+3
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | fix mobile and desktop app images looking different
| * | | | | | | | | Optimize images with optipngkondou2013-10-063-0/+0
| | | | | | | | | |
| * | | | | | | | | fix mobile and desktop app images looking differentJan-Christoph Borchardt2013-10-054-4/+3
| |/ / / / / / / /
* | | | | | | | | Merge pull request #4982 from syncloud/masterOwen Winkler2013-10-052-4/+24
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | Automatic config can set some of parameters or all of them
| * | | | | | | | Moving Advanced button out of datadirField fieldsetvsapronov2013-10-041-1/+6
| | | | | | | | |
| * | | | | | | | Fixed review issuesvsapronov2013-09-292-14/+14
| | | | | | | | |