summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* backport server2server stringsVolkan Gezer2014-09-2133-33/+179
|
* Merge pull request #11195 from owncloud/stable_l10n_backportMorris Jobke2014-09-2123-23/+68
|\ | | | | backport stable translations
| * backport stable translationsVolkan Gezer2014-09-2023-23/+68
| |
* | adding 'smallint unsigned' to type mapping for sqliteThomas Müller2014-09-211-0/+1
|/
* Merge pull request #11190 from owncloud/fix-unit-test-sort-order-stable7Robin McCorkell2014-09-202-5/+12
|\ | | | | Don't rely on the sorting the database gives us for tests
| * Don't rely on the sorting the database gives us for testsRobin Appelman2014-09-202-5/+12
|/
* Prevent updates between multiple major versionsLukas Reschke2014-09-192-1/+57
| | | | Ref https://github.com/owncloud/core/issues/11078
* Move BasicAuth check to "isLoggedIn()"Lukas Reschke2014-09-192-34/+9
| | | | Ensures that Basic Auth works properly for APIs and removes the need for some even uglier lines of code.
* update encryption doc linkVolkan Gezer2014-09-182-3/+3
| | | | | | I don't know how we missed to update this :/ update ldap doc link
* Move basic auth checkLukas Reschke2014-09-181-12/+4
| | | | | | At the previous point not all apps were initialized. Now the basic auth check happens together at the same location as all others. Fixes https://github.com/owncloud/core/issues/11129
* Add timeout to user and group deletion notificationVincent Petry2014-09-183-5/+237
| | | | | | | | | | | | | | | | | | | | Added timeout in DeleteHandler to auto-delete after a delay. Fixed issue where OC.Notification.hide() was called twice in a row when deleting multiple entries, causing the second notification to disappear. Fixed issue where "undo" click event handler was registered multiple times when calling setNotifications() twice. Added JS unit tests for the DeleteHandler class. Refix undo users, groups feature Timeout is now cleared in cancel(). Fixed click handler name for "undo" to be able to work with multiple DeleteHandler instances (in our case one for users and one for groups) so that there is no conflict. Backport of 0d9f24a0efef20b9041e40817b10822a4700532d from master
* Make 404 page easier to understandLukas Reschke2014-09-182-3/+5
| | | | Fixes https://github.com/owncloud/core/issues/11133
* version bumpFrank Karlitschek2014-09-131-1/+1
|
* adding unit test to truncate the tableThomas Müller2014-09-172-1/+32
|
* Use Doctrine Platform to generate SQL query for table truncation.Andreas Fischer2014-09-171-8/+3
|
* Merge pull request #11053 from owncloud/baskport-11041-stable7Vincent Petry2014-09-162-5/+9
|\ | | | | content size checks are not valid for LOCK
| * content size checks are not valid for LOCKThomas Müller2014-09-121-0/+2
| |
| * content size checks are not valid for LOCKThomas Müller2014-09-121-5/+7
| |
* | Reword the descriptionLukas Reschke2014-09-161-1/+1
| | | | | | | | The old one was just horrible wrong.
* | Disable database migrations for MSSQL - scripts have to be applied manuallyThomas Müller2014-09-162-0/+26
| |
* | also expire file if timestamp = limit, happens if ↵Bjoern Schiessle2014-09-161-1/+1
| | | | | | | | trashbin_retention_obligation is set to zero
* | Preserve transparency when loading from a filekondou2014-09-162-0/+9
| | | | | | | | Fix #7148 - again :)
* | Use secure mimetype for content deliveryLukas Reschke2014-09-152-2/+2
| | | | | | | | Adds some hardening against potential CSP bypassed.
* | Remove passing by reference to allow for proper GCVincent Petry2014-09-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | The garbage collector in PHP 5.3.10 does not properly release the file handle when calling fclose() due to the fact that it is passed by reference. This has the side-effect of preventing file locks to be released as well when the files_locking app is enabled. This fix removes the useless passing by reference and now the file handle and file lock are freed properly.
* | Set overwritewebroot when installing owncloud to avoid problemsJoas Schilling2014-09-151-0/+1
| | | | | | | | Backport of 249558966e6a144cf0fb873a3fac5a3664cfdd9d to stable7
* | if only one attribute is requested, the returned array has 0 as key instead ↵Arthur Schiwon2014-09-151-1/+1
| | | | | | | | of attribute name. fixes #10888
* | Do not double decode valuesLukas Reschke2014-09-151-1/+1
|/ | | | Fixes https://github.com/owncloud/core/issues/11012
* fix nojavascript message alignmentJan-Christoph Borchardt2014-09-111-1/+2
|
* Converted an array to PHP5.3 compatible versionJohan Björk2014-09-111-2/+2
|
* Fixes #8326: deletion of directories on S3Johan Björk2014-09-111-17/+12
|
* fix folder icon alignment, fix #10866Jan-Christoph Borchardt2014-09-1110-112/+102
|
* fix svg of calendar filetype iconJan-Christoph Borchardt2014-09-112-34/+32
|
* fix size of toggle icon, make container squareJan-Christoph Borchardt2014-09-112-4/+1
|
* improve style of checkmark icon, less bold, fitting ownCloud styleJan-Christoph Borchardt2014-09-112-3/+1
|
* repair search lucene before installingJörn Friedrich Dreyer2014-09-113-2/+66
|
* Add X-UA-Compatible to all templatesLukas Reschke2014-09-113-1/+3
| | | | Replaces https://github.com/owncloud/core/pull/10850
* Merge pull request #10998 from owncloud/use-section-in-formVincent Petry2014-09-111-2/+2
|\ | | | | Use section in first element in user_ldap
| * Use section in first elementLukas Reschke2014-09-101-2/+2
|/
* Merge pull request #10973 from owncloud/stable7-issue/10847Vincent Petry2014-09-102-2/+2
|\ | | | | [Stable7] Use correct language package so the subject is correctly translated
| * Use correct language package so the subject is correctly translatedJoas Schilling2014-09-091-1/+1
| | | | | | | | | | | | | | Fix #10847 Conflicts: lib/private/share/mailnotifications.php
| * Fix broken new lines in plain text mail templateJoas Schilling2014-09-091-1/+1
| |
* | Do not load extra user backends when an upgrade is dueVincent Petry2014-09-101-1/+3
| | | | | | | | | | | | Whenever an upgrade is due, do not load extra user backends Backport of d6bfd90bf804f6d8bb4c651e6bcf8374dc6b94b4 from master
* | Merge pull request #10884 from owncloud/stable7_backport_issue_10674Lukas Reschke2014-09-101-1/+7
|\ \ | |/ |/| Backport issue 10764
| * Backport issue 10764Jesus Macias2014-09-051-1/+7
| |
* | more sugar for including lists of templatesBernhard Posselt2014-09-091-7/+29
| |
* | append .html since componets always use html filesBernhard Posselt2014-09-091-1/+1
| |
* | add template functions for html importsBernhard Posselt2014-09-091-0/+10
| |
* | add shortcut functions for style and scriptBernhard Posselt2014-09-091-0/+18
| |
* | make objectstore tests check fileid on renameJörn Friedrich Dreyer2014-09-091-0/+83
| |
* | Keep fileid on move in objectstore, fixes #10848Jörn Friedrich Dreyer2014-09-091-33/+5
| |