summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update JS unit test libsVincent Petry2015-07-104-4311/+5971
| | | | | | | | Update sinon to 1.15.4. Update karma-jasmine to 0.3.0 Update jasmine to 2.3.4 This brings a bunch of new useful functions for unit testing.
* [tx-robot] updated from transifexJenkins for ownCloud2015-07-1028-42/+78
|
* Merge pull request #17546 from owncloud/forwardport-16917Morris Jobke2015-07-101-1/+1
|\ | | | | Fix the config.php owner check for console.php
| * Fix the config.php owner check for console.phpPhilippe Le Brouster2015-07-091-1/+1
| | | | | | | | | | | | | | | | The config directory must be taken from OC::$configDir Minor fix - Remove uneeded slash in the configdir path.
* | Merge pull request #17517 from RealRancor/fix_failed_login_syntaxMorris Jobke2015-07-101-1/+1
|\ \ | |/ |/| Fixed "Remote IP:" syntax on failed logins
| * Fixed "Remote IP:" syntax on failed loginsRealRancor2015-07-091-1/+1
| |
* | Merge pull request #15586 from Egari/addThemeSupportToMimeIconMorris Jobke2015-07-091-15/+20
|\ \ | | | | | | Add theme support to mimetypeIcon through imagePath integration
| * | Add theme support to mimetypeIcon through imagePath integrationstolter2015-07-071-15/+20
| | |
* | | Merge pull request #17473 from owncloud/enc_fix_migrationMorris Jobke2015-07-092-14/+82
|\ \ \ | | | | | | | | more secure way to update the database
| * | | more secure way to update the databaseBjoern Schiessle2015-07-082-14/+82
| | | |
* | | | Merge pull request #17530 from owncloud/proper-config-for-singleuser-commandMorris Jobke2015-07-093-4/+146
|\ \ \ \ | | | | | | | | | | [command] single user mode - use config object & add tests
| * | | | [command] single user mode - use config object & add testsMorris Jobke2015-07-093-4/+146
|/ / / /
* | | | Merge pull request #16965 from owncloud/getUserFolder-in-IRootFolderMorris Jobke2015-07-095-24/+42
|\ \ \ \ | |_|_|/ |/| | | Add getUserFolder to IRootFolder
| * | | Add getUserFolder to IRootFolderMorris Jobke2015-07-035-24/+42
| | | | | | | | | | | | | | | | | | | | * untangle DI of user specific folders * allows to autodetect the dependency
* | | | Merge pull request #14341 from rullzer/public_share_do_not_leak_mounttypeMorris Jobke2015-07-091-0/+3
|\ \ \ \ | | | | | | | | | | No more leaking of mounttype via metadata or icon in public shares.
| * | | | Do not leak mounttype of a public shareRoeland Jago Douma2015-07-041-0/+3
| | | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-07-0932-10/+76
| | | | |
* | | | | Merge pull request #17498 from owncloud/add-db-indexesThomas Müller2015-07-082-1/+16
|\ \ \ \ \ | | | | | | | | | | | | Add indexes to speedup DB queries
| * | | | | Add indexes to speedup DB queriesMorris Jobke2015-07-082-1/+16
| | |_|/ / | |/| | | | | | | | | | | | | * file_target is often used in the sharing code in JOIN statements for retrieval of shares
* | | | | Merge pull request #17472 from RealRancor/add_is_dirMorris Jobke2015-07-081-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | Add is_dir check to getAllApps() function
| * | | | Add is_dir check to getAllApps() functionRealRancor2015-07-081-1/+1
| | | | |
* | | | | Merge pull request #17330 from owncloud/fix-share-path-for-group-exceptionsMorris Jobke2015-07-082-19/+167
|\ \ \ \ \ | |/ / / / |/| | | | Fix the path for users which have an exception for a group share
| * | | | Make sure the owner always has the right pathJoas Schilling2015-07-071-3/+6
| | | | |
| * | | | Add visibility to test methodsJoas Schilling2015-07-071-11/+11
| | | | |
| * | | | Add test case when owner renames shared folderVincent Petry2015-07-071-5/+8
| | | | |
| * | | | Add unit test for getUsersSharingFileVincent Petry2015-07-071-0/+127
| | | | | | | | | | | | | | | | | | | | | | | | | This is to test if the user list and paths are correct, even when a recipient renamed the received shared folder
| * | | | Fix the path for users which have an exception for a group shareJoas Schilling2015-07-021-7/+22
| | | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-07-0880-68/+20
| | | | |
* | | | | Merge pull request #17432 from owncloud/enhance-config-sampleMorris Jobke2015-07-071-16/+26
|\ \ \ \ \ | | | | | | | | | | | | [config sample] improve RST markup and wording
| * | | | | [config sample] improve RST markup and wordingMorris Jobke2015-07-071-16/+26
| | | | | |
* | | | | | Merge pull request #17439 from owncloud/update-3rdpartytextMorris Jobke2015-07-071-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Remove 3rd party text for disabled apps on update
| * | | | | | Remove 3rd party text for disabled apps on updateVincent Petry2015-07-071-1/+1
| |/ / / / /
* | | | | | Merge pull request #17436 from owncloud/update-keeppageifwarningsMorris Jobke2015-07-071-8/+20
|\ \ \ \ \ \ | | | | | | | | | | | | | | Keep update page when there are warnings
| * | | | | | Keep update page when there are warningsVincent Petry2015-07-071-8/+20
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | Whenever there were warnings during an update, the page will not be redirected any more.
* | | | | | Merge pull request #15579 from owncloud/autotest-docker-postgresThomas Müller2015-07-071-1/+20
|\ \ \ \ \ \ | | | | | | | | | | | | | | autotest.sh with docker support for postgres
| * | | | | | autotest.sh with docker support for postgresMorris Jobke2015-07-061-1/+20
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | * waits until the docker container is started * export USEDOCKER=1 to run the docker version of postgres
* | | | | | Merge pull request #16368 from owncloud/occ-config-commandsVincent Petry2015-07-0720-19/+2203
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add "occ config:*" to manage config values
| * | | | | | Invert the "public" to a "private" methodJoas Schilling2015-07-072-12/+12
| | | | | | |
| * | | | | | Make it possible to import exportet app/system configsJoas Schilling2015-07-072-7/+25
| | | | | | |
| * | | | | | Fix typo in command descriptionJoas Schilling2015-07-072-2/+2
| | | | | | |
| * | | | | | Add example command to the issue_template.mdJoas Schilling2015-07-071-0/+6
| | | | | | |
| * | | | | | Replace deprecated method callsJoas Schilling2015-07-078-13/+13
| | | | | | |
| * | | | | | Add commands to get, set and delete app config valuesJoas Schilling2015-07-0710-3/+673
| | | | | | |
| * | | | | | Allow reading from stdinJoas Schilling2015-07-071-5/+36
| | | | | | |
| * | | | | | Add a command to import an json array into the configJoas Schilling2015-07-074-1/+350
| | | | | | |
| * | | | | | Add a command to delete a system configJoas Schilling2015-07-077-6/+200
| | | | | | |
| * | | | | | Add a command to get a config valueJoas Schilling2015-07-074-2/+275
| | | | | | |
| * | | | | | Add a command to set a system config valueJoas Schilling2015-07-073-0/+199
| | | | | | |
| * | | | | | Split the system from the app configJoas Schilling2015-07-072-18/+23
| | | | | | |
| * | | | | | Add tests for list configJoas Schilling2015-07-071-0/+286
| | | | | | |