aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Enable code coverage on scrutinizerThomas Müller2015-04-301-0/+4
* Merge pull request #15947 from owncloud/add-title-to-multiselectMorris Jobke2015-04-301-5/+6
|\
| * add title to multiselect list items so longer group names are visible, fix #1...Jan-Christoph Borchardt2015-04-291-5/+6
* | [tx-robot] updated from transifexJenkins for ownCloud2015-04-3050-108/+116
* | Merge pull request #15942 from owncloud/revert-15875-multiline-buttonsJoas Schilling2015-04-301-4/+1
|\ \
| * | Revert "fix layout for multiline buttons which are <a class='button'>"Jan-Christoph Borchardt2015-04-291-4/+1
| |/
* | Merge pull request #15919 from owncloud/enc_handle_empty_filesClark Tomlinson2015-04-294-34/+118
|\ \
| * | method shouldn't be staticBjoern Schiessle2015-04-281-1/+1
| * | also create encryption keys for empty filesBjoern Schiessle2015-04-282-23/+42
| * | skip update of encryption keys if file is not encryptedBjoern Schiessle2015-04-283-13/+78
* | | Merge pull request #15926 from owncloud/install-empty-pwThomas Müller2015-04-291-1/+4
|\ \ \ | |_|/ |/| |
| * | default to an empty string for database password if ommitedBernhard Posselt2015-04-291-1/+4
* | | Merge pull request #15908 from owncloud/fix-replace-with-sedVincent Petry2015-04-2911-17/+12
|\ \ \ | |/ / |/| |
| * | Replace `replace` with `sed` statementMorris Jobke2015-04-2911-17/+12
* | | Merge pull request #15596 from owncloud/issue/15589Morris Jobke2015-04-294-17/+96
|\ \ \
| * | | Add tests for the correct share id on the call aswellJoas Schilling2015-04-282-8/+23
| * | | Correctly send Federate-Cloud Share Feedback against the remote share IDJoas Schilling2015-04-281-6/+6
| * | | Fix scrutinizer complains and return type docJoas Schilling2015-04-281-4/+6
| * | | make scrutinizer happyJoas Schilling2015-04-281-1/+1
| * | | Correctly remove the protocol before prepeding itJoas Schilling2015-04-281-0/+1
| * | | Add tests for the remote sharing urlJoas Schilling2015-04-281-2/+53
| * | | check the called URLJoas Schilling2015-04-281-3/+13
| * | | Correctly generate the feedback URL for remote shareJoas Schilling2015-04-282-3/+3
| |/ /
* | | Merge pull request #15906 from rullzer/fix_15777Morris Jobke2015-04-292-1/+47
|\ \ \
| * | | Added unit testRoeland Jago Douma2015-04-281-0/+46
| * | | Password set via OCS API should not be double escapedRoeland Jago Douma2015-04-281-1/+1
* | | | Merge pull request #15911 from owncloud/enc_create_header_for_new_keyBjörn Schießle2015-04-292-3/+14
|\ \ \ \
| * | | | make sure that we create a header for the encrypted private keyBjoern Schiessle2015-04-282-3/+14
| | |_|/ | |/| |
* | | | Merge pull request #15706 from owncloud/fix-15705-masterLukas Reschke2015-04-292-3/+6
|\ \ \ \
| * | | | move creation of shared key to the login handler - fixes #15705Thomas Müller2015-04-172-3/+6
* | | | | Merge pull request #15922 from JostBaron/patch-1Thomas Müller2015-04-291-2/+2
|\ \ \ \ \
| * | | | | Fix error message when wrong user on consoleJost Baron2015-04-281-2/+2
* | | | | | Merge pull request #15921 from cmeh/patch-4Thomas Müller2015-04-291-1/+1
|\ \ \ \ \ \
| * | | | | | Update wizardTabElementary.jscmeh2015-04-281-1/+1
| |/ / / / /
* | | | | | Merge pull request #15918 from owncloud/harden-avatarJoas Schilling2015-04-293-4/+34
|\ \ \ \ \ \
| * | | | | | Filter potential dangerous filenames for avatarsLukas Reschke2015-04-283-4/+34
| |/ / / / /
* / / / / / [tx-robot] updated from transifexJenkins for ownCloud2015-04-298-112/+116
|/ / / / /
* | | | | Merge pull request #15915 from owncloud/fix-sharingThomas Müller2015-04-281-4/+4
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Fix routesLukas Reschke2015-04-281-4/+4
|/ / / /
* | | | Merge pull request #15892 from owncloud/fix-failed-require-in-l10n-createjsThomas Müller2015-04-281-0/+4
|\ \ \ \ | |_|_|/ |/| | |
| * | | fix typoThomas Müller2015-04-271-1/+1
| * | | handle case where the given language is unknown - refs #15794Thomas Müller2015-04-271-0/+4
* | | | Merge pull request #14764 from owncloud/shared-etag-propagateMorris Jobke2015-04-2829-219/+976
|\ \ \ \
| * | | | dont pass floats as timestamp to the changepropagatorRobin Appelman2015-04-271-1/+1
| * | | | safer teardownRobin Appelman2015-04-271-1/+3
| * | | | use microtime to prevent race conditionsRobin Appelman2015-04-271-3/+3
| * | | | cleanup hooksRobin Appelman2015-04-271-0/+7
| * | | | fix testRobin Appelman2015-04-271-1/+0
| * | | | triger propagation for webdav uploadsRobin Appelman2015-04-272-3/+4
| * | | | fix mergeRobin Appelman2015-04-274-116/+76