Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Added function to load translations from JS | Vincent Petry | 2014-11-18 | 3 | -2/+111 |
| | | | | | | For apps that support async translation loading, a new function OC.L10N.load() can be used to asynchronously load the translations for a given app. | ||||
* | Merge pull request #11741 from owncloud/delete_all_children_preview_2 | Vincent Petry | 2014-11-17 | 1 | -16/+94 |
|\ | | | | | delete all children's previews when deleting a folder | ||||
| * | delete all children's previews when deleting a folder | Georg Ehrke | 2014-10-30 | 1 | -16/+94 |
| | | | | | | | | add phpdoc | ||||
* | | Merge pull request #12218 from owncloud/issue/10991-fixes | Morris Jobke | 2014-11-17 | 48 | -415/+784 |
|\ \ | | | | | | | Issue/10991 Make unit tests pass on windows | ||||
| * | | Correctly restore previous root mount point after testing | Joas Schilling | 2014-11-17 | 15 | -55/+203 |
| | | | |||||
| * | | Correctly refresh the apps list after removing the mock | Joas Schilling | 2014-11-17 | 1 | -0/+3 |
| | | | |||||
| * | | Fix Files\Storage\Home::testRoot() | Joas Schilling | 2014-11-17 | 1 | -1/+6 |
| | | | |||||
| * | | Make it possible to cleanPath() absolute Windows paths | Joas Schilling | 2014-11-17 | 1 | -2/+11 |
| | | | |||||
| * | | Correctly close handle of directory when listing certificates | Joas Schilling | 2014-11-17 | 2 | -3/+4 |
| | | | |||||
| * | | Fix single run of encryption tests and usages of uniqid() and fopen() | Joas Schilling | 2014-11-17 | 12 | -259/+376 |
| | | | |||||
| * | | Skip some more tests on Windows which just can not work at all | Joas Schilling | 2014-11-17 | 7 | -10/+37 |
| | | | |||||
| * | | Windows does not support CHMOD, therefor we can not test not writable folders | Joas Schilling | 2014-11-10 | 2 | -0/+12 |
| | | | |||||
| * | | Test LargeFileHelperGetFileSize also with ascii only characters | Joas Schilling | 2014-11-06 | 1 | -18/+37 |
| | | | | | | | | | | | | And skip the UTF8 names on Windows as they are not supported | ||||
| * | | Do not use uniqid in Group and User tests as it is not unique on windows | Joas Schilling | 2014-11-06 | 7 | -67/+62 |
| | | | |||||
| * | | Testcase base class | Joas Schilling | 2014-11-06 | 1 | -0/+33 |
| | | | |||||
* | | | Merge pull request #12031 from owncloud/app-manager | Robin Appelman | 2014-11-17 | 5 | -0/+406 |
|\ \ \ | | | | | | | | | Add \OC\App\Manager to handle enabling/disabling apps | ||||
| * | | | Add \OC\App\Manager to handle enabling/disabling apps | Robin Appelman | 2014-11-10 | 5 | -0/+406 |
| | | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-11-17 | 40 | -60/+126 |
| | | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-11-16 | 4 | -64/+64 |
| | | | | |||||
* | | | | Merge pull request #12186 from owncloud/fix-12182 | Morris Jobke | 2014-11-15 | 3 | -13/+31 |
|\ \ \ \ | | | | | | | | | | | eliminate OC_Template::printErrorPage in database classes, fixes #12182 | ||||
| * | | | | do not output DB information, and do not set header | Arthur Schiwon | 2014-11-14 | 3 | -7/+28 |
| | | | | | |||||
| * | | | | errors are already logged | Arthur Schiwon | 2014-11-14 | 2 | -3/+0 |
| | | | | | |||||
| * | | | | eliminate OC_Template::printErrorPage in database classes, fixes #12182 | Arthur Schiwon | 2014-11-14 | 3 | -7/+7 |
| | | | | | |||||
* | | | | | Merge pull request #12189 from owncloud/checkIfAppIsEnabled | Morris Jobke | 2014-11-15 | 2 | -2/+13 |
|\ \ \ \ \ | | | | | | | | | | | | | Check if app is enabled for user | ||||
| * | | | | | Check if app is enabled for user | Lukas Reschke | 2014-11-15 | 2 | -2/+13 |
| |/ / / / | | | | | | | | | | | | | | | | Fixes https://github.com/owncloud/core/issues/12188 for AppFramework apps | ||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-11-15 | 8 | -14/+22 |
| | | | | | |||||
* | | | | | Merge pull request #11029 from owncloud/fix-share-download | Clark Tomlinson | 2014-11-14 | 14 | -246/+751 |
|\ \ \ \ \ | |/ / / / |/| | | | | Fix share download | ||||
| * | | | | Added download size on public sharing | Vincent Cloutier | 2014-11-14 | 3 | -2/+4 |
| | | | | | |||||
| * | | | | Refactor file sharing public link handling | Lukas Reschke | 2014-11-14 | 14 | -245/+748 |
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | fixes download issue introduced by #10755 Conflicts: apps/files_sharing/public.php | ||||
* | | | | Merge pull request #12181 from owncloud/resubmit-second-fail | Thomas Müller | 2014-11-14 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | Fail... | ||||
| * | | | | Fail... | Lukas Reschke | 2014-11-14 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | Merge pull request #12177 from owncloud/skip-mail-test-for | Thomas Müller | 2014-11-14 | 1 | -0/+6 |
|\ \ \ \ | | | | | | | | | | | Mark skipped until #12085 is merged | ||||
| * | | | | Mark skipped until #12085 is merged | Lukas Reschke | 2014-11-14 | 1 | -0/+6 |
|/ / / / | | | | | | | | | See https://github.com/owncloud/core/pull/12175#issuecomment-63054620 | ||||
* | | | | Merge pull request #12162 from owncloud/ext-s3-missingfolderwithsamename | Jörn Friedrich Dreyer | 2014-11-14 | 1 | -4/+1 |
|\ \ \ \ | | | | | | | | | | | Do not remove dir entry if it has the same name as the parent | ||||
| * | | | | Do not remove dir entry if it has the same name as the parent | Vincent Petry | 2014-11-13 | 1 | -4/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | This fixes an issue when a subdir has the same name as its parent, it would get exluded from the list. | ||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-11-14 | 8 | -2/+16 |
| | | | | | |||||
* | | | | | Merge pull request #11479 from owncloud/cleanup-group-admin-on-deleteGroup | Morris Jobke | 2014-11-13 | 1 | -0/+4 |
|\ \ \ \ \ | | | | | | | | | | | | | cleanup group admin(s) on deleteGroup | ||||
| * | | | | | cleanup group admin(s) on deleteGroup | michag86 | 2014-10-08 | 1 | -0/+4 |
| | | | | | | |||||
* | | | | | | Merge pull request #12157 from owncloud/fix-autotest-condition | Vincent Petry | 2014-11-13 | 1 | -1/+1 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | this allows a non-existant config/config.php for starting the autotest.s... | ||||
| * | | | | | | this allows a non-existant config/config.php for starting the autotest.sh | Morris Jobke | 2014-11-13 | 1 | -1/+1 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #12158 from owncloud/drop-snapjs | Morris Jobke | 2014-11-13 | 1 | -785/+0 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | remove unneeded snap.js - followup to #11985 - ref #12156 | ||||
| * | | | | | | | remove unneeded snap.js - followup to #11985 - ref #12156 | Morris Jobke | 2014-11-13 | 1 | -785/+0 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #11956 from ↵ | Morris Jobke | 2014-11-13 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | owncloud/remove-check-for-allow_user_to_change_display_name removal of wrong/double implemented check | ||||
| * | | | | | | | removal of wrong/double implemented check | michag86 | 2014-11-13 | 1 | -1/+1 |
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | Check already implemented in core/settings/ajax/changedisplayname.php | ||||
* | | | | | | | Merge pull request #12005 from owncloud/bower-multiselect | blizzz | 2014-11-13 | 5 | -3/+23 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | Move multiselect to user_ldap | ||||
| * | | | | | | Migrate multiselect to user_ldap | Morris Jobke | 2014-11-13 | 5 | -3/+23 |
| | | | | | | | |||||
* | | | | | | | Run preupdate before an update | Lukas Reschke | 2014-11-13 | 2 | -5/+17 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The update routine tries to test the database migration before actually performing the update. However, this will fail hard if the schema has changed (for example an unique key has been added). App developers can convert the DB in preupdate.php, however it is not called before and therefore the update fails. This actually breaks ownCloud updates from ownCloud 6 to ownCloud 7 when the files_antivirus app is enabled. | ||||
* | | | | | | | Merge pull request #9177 from owncloud/jsdocexperiment | Vincent Petry | 2014-11-13 | 25 | -71/+446 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | Improved JS Docs + added build script for JS Docs | ||||
| * | | | | | | Improved Javascript docs for JSDoc | Vincent Petry | 2014-10-31 | 23 | -71/+403 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added namespaces so that JSDoc can find them. Fixed a few warnings. Improved some comments. | ||||
| * | | | | | | Added script to build the JS documentation | Vincent Petry | 2014-10-31 | 2 | -0/+43 |
| | | | | | | |