aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #15993 from owncloud/admin-documentationMorris Jobke2015-05-012-1/+17
|\
| * fix layout for documentation link hintsJan-Christoph Borchardt2015-04-301-0/+7
| * add admin documentation links for Sharing, Encryption and Email serverJan-Christoph Borchardt2015-04-301-1/+10
|/
* Merge pull request #15955 from owncloud/move-dummy-encryptionThomas Müller2015-04-305-218/+0
|\
| * Moving encryption_dummy to the apps repo - fixes #15950Thomas Müller2015-04-305-218/+0
* | Merge pull request #15972 from owncloud/enable-scrutinizer-code-coverageThomas Müller2015-04-301-0/+4
|\ \
| * | Enable code coverage on scrutinizerThomas Müller2015-04-301-0/+4
| |/
* | Merge pull request #15964 from owncloud/fix-l10n-string-warnThomas Müller2015-04-301-2/+0
|\ \
| * | fix #15962Bernhard Posselt2015-04-301-2/+0
* | | Merge pull request #15968 from owncloud/enc-wrapper-presetupThomas Müller2015-04-301-1/+1
|\ \ \ | |/ / |/| |
| * | use the preSetup hook to ensure the encryption wrapper is applied correctlyRobin Appelman2015-04-301-1/+1
|/ /
* | Merge pull request #15949 from owncloud/l10n-string-jsonThomas Müller2015-04-301-1/+9
|\ \
| * | implement json serialize for l10n stringBernhard Posselt2015-04-291-1/+9
* | | Merge pull request #15951 from owncloud/fix-install-againMorris Jobke2015-04-301-1/+1
|\ \ \
| * | | make command optionalBernhard Posselt2015-04-291-1/+1
* | | | Merge pull request #15946 from owncloud/auto-controller-resolveThomas Müller2015-04-301-0/+11
|\ \ \ \ | |_|_|/ |/| | |
| * | | add aliases to pascal case constructor paramters to make it possible to auto ...Bernhard Posselt2015-04-291-0/+11
| |/ /
* | | 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
| |/ / / / /
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-19 23:06:09 +0000