Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | Moving encryption_dummy to the apps repo - fixes #15950 | Thomas Müller | 2015-04-30 | 5 | -218/+0 | |
* | | | | | | | Merge pull request #15972 from owncloud/enable-scrutinizer-code-coverage | Thomas Müller | 2015-04-30 | 1 | -0/+4 | |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | ||||||
| * | | | | | | Enable code coverage on scrutinizer | Thomas Müller | 2015-04-30 | 1 | -0/+4 | |
| |/ / / / / | ||||||
* | | | | | | Merge pull request #15964 from owncloud/fix-l10n-string-warn | Thomas Müller | 2015-04-30 | 1 | -2/+0 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | fix #15962 | Bernhard Posselt | 2015-04-30 | 1 | -2/+0 | |
| | |/ / / / | |/| | | | | ||||||
* | | | | | | Merge pull request #15968 from owncloud/enc-wrapper-presetup | Thomas Müller | 2015-04-30 | 1 | -1/+1 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | use the preSetup hook to ensure the encryption wrapper is applied correctly | Robin Appelman | 2015-04-30 | 1 | -1/+1 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #15949 from owncloud/l10n-string-json | Thomas Müller | 2015-04-30 | 1 | -1/+9 | |
|\ \ \ \ \ | ||||||
| * | | | | | implement json serialize for l10n string | Bernhard Posselt | 2015-04-29 | 1 | -1/+9 | |
* | | | | | | Merge pull request #15951 from owncloud/fix-install-again | Morris Jobke | 2015-04-30 | 1 | -1/+1 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | make command optional | Bernhard Posselt | 2015-04-29 | 1 | -1/+1 | |
* | | | | | | | Merge pull request #15946 from owncloud/auto-controller-resolve | Thomas Müller | 2015-04-30 | 1 | -0/+11 | |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | ||||||
| * | | | | | | add aliases to pascal case constructor paramters to make it possible to auto ... | Bernhard Posselt | 2015-04-29 | 1 | -0/+11 | |
| |/ / / / / | ||||||
* | | | | | | Merge pull request #15947 from owncloud/add-title-to-multiselect | Morris Jobke | 2015-04-30 | 1 | -5/+6 | |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | ||||||
| * | | | | | add title to multiselect list items so longer group names are visible, fix #1... | Jan-Christoph Borchardt | 2015-04-29 | 1 | -5/+6 | |
| | |/ / / | |/| | | | ||||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-04-30 | 50 | -108/+116 | |
* | | | | | Merge pull request #15942 from owncloud/revert-15875-multiline-buttons | Joas Schilling | 2015-04-30 | 1 | -4/+1 | |
|\ \ \ \ \ | ||||||
| * | | | | | Revert "fix layout for multiline buttons which are <a class='button'>" | Jan-Christoph Borchardt | 2015-04-29 | 1 | -4/+1 | |
| |/ / / / | ||||||
* | | | | | Merge pull request #15919 from owncloud/enc_handle_empty_files | Clark Tomlinson | 2015-04-29 | 4 | -34/+118 | |
|\ \ \ \ \ | |_|/ / / |/| | | | | ||||||
| * | | | | method shouldn't be static | Bjoern Schiessle | 2015-04-28 | 1 | -1/+1 | |
| * | | | | also create encryption keys for empty files | Bjoern Schiessle | 2015-04-28 | 2 | -23/+42 | |
| * | | | | skip update of encryption keys if file is not encrypted | Bjoern Schiessle | 2015-04-28 | 3 | -13/+78 | |
* | | | | | Merge pull request #15926 from owncloud/install-empty-pw | Thomas Müller | 2015-04-29 | 1 | -1/+4 | |
|\ \ \ \ \ | |_|/ / / |/| | | | | ||||||
| * | | | | default to an empty string for database password if ommited | Bernhard Posselt | 2015-04-29 | 1 | -1/+4 | |
* | | | | | Merge pull request #15908 from owncloud/fix-replace-with-sed | Vincent Petry | 2015-04-29 | 11 | -17/+12 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| * | | | | Replace `replace` with `sed` statement | Morris Jobke | 2015-04-29 | 11 | -17/+12 | |
* | | | | | Merge pull request #15596 from owncloud/issue/15589 | Morris Jobke | 2015-04-29 | 4 | -17/+96 | |
|\ \ \ \ \ | ||||||
| * | | | | | Add tests for the correct share id on the call aswell | Joas Schilling | 2015-04-28 | 2 | -8/+23 | |
| * | | | | | Correctly send Federate-Cloud Share Feedback against the remote share ID | Joas Schilling | 2015-04-28 | 1 | -6/+6 | |
| * | | | | | Fix scrutinizer complains and return type doc | Joas Schilling | 2015-04-28 | 1 | -4/+6 | |
| * | | | | | make scrutinizer happy | Joas Schilling | 2015-04-28 | 1 | -1/+1 | |
| * | | | | | Correctly remove the protocol before prepeding it | Joas Schilling | 2015-04-28 | 1 | -0/+1 | |
| * | | | | | Add tests for the remote sharing url | Joas Schilling | 2015-04-28 | 1 | -2/+53 | |
| * | | | | | check the called URL | Joas Schilling | 2015-04-28 | 1 | -3/+13 | |
| * | | | | | Correctly generate the feedback URL for remote share | Joas Schilling | 2015-04-28 | 2 | -3/+3 | |
| |/ / / / | ||||||
* | | | | | Merge pull request #15906 from rullzer/fix_15777 | Morris Jobke | 2015-04-29 | 2 | -1/+47 | |
|\ \ \ \ \ | ||||||
| * | | | | | Added unit test | Roeland Jago Douma | 2015-04-28 | 1 | -0/+46 | |
| * | | | | | Password set via OCS API should not be double escaped | Roeland Jago Douma | 2015-04-28 | 1 | -1/+1 | |
* | | | | | | Merge pull request #15911 from owncloud/enc_create_header_for_new_key | Björn Schießle | 2015-04-29 | 2 | -3/+14 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | make sure that we create a header for the encrypted private key | Bjoern Schiessle | 2015-04-28 | 2 | -3/+14 | |
| | |_|/ / / | |/| | | | | ||||||
* | | | | | | Merge pull request #15706 from owncloud/fix-15705-master | Lukas Reschke | 2015-04-29 | 2 | -3/+6 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | move creation of shared key to the login handler - fixes #15705 | Thomas Müller | 2015-04-17 | 2 | -3/+6 | |
* | | | | | | | Merge pull request #15922 from JostBaron/patch-1 | Thomas Müller | 2015-04-29 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Fix error message when wrong user on console | Jost Baron | 2015-04-28 | 1 | -2/+2 | |
* | | | | | | | | Merge pull request #15921 from cmeh/patch-4 | Thomas Müller | 2015-04-29 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Update wizardTabElementary.js | cmeh | 2015-04-28 | 1 | -1/+1 | |
| |/ / / / / / / | ||||||
* | | | | | | | | Merge pull request #15918 from owncloud/harden-avatar | Joas Schilling | 2015-04-29 | 3 | -4/+34 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Filter potential dangerous filenames for avatars | Lukas Reschke | 2015-04-28 | 3 | -4/+34 | |
| |/ / / / / / / | ||||||
* / / / / / / / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-04-29 | 8 | -112/+116 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #15915 from owncloud/fix-sharing | Thomas Müller | 2015-04-28 | 1 | -4/+4 | |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | |