Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | [Share2.0] OCS Share API getShare uses new code | Roeland Jago Douma | 2015-11-16 | 7 | -44/+418 | |
| | |_|/ / / / | |/| | | | | | ||||||
* | | | | | | | Merge pull request #18605 from owncloud/api-adduser-for-subadmins | Thomas Müller | 2015-11-16 | 3 | -8/+420 | |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | ||||||
| * | | | | | | Added unit test for new functionality | Roeland Jago Douma | 2015-11-12 | 2 | -7/+347 | |
| * | | | | | | enable api addUser for subadmins | michag86 | 2015-11-12 | 3 | -8/+80 | |
* | | | | | | | Merge pull request #20522 from owncloud/update-strengthify | Thomas Müller | 2015-11-16 | 5 | -36/+39 | |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | ||||||
| * | | | | | | Update strengthify to 0.4.2 | Morris Jobke | 2015-11-16 | 5 | -36/+39 | |
| | |_|/ / / | |/| | | | | ||||||
* | | | | | | Merge pull request #20505 from owncloud/fakelocking-for-mac | Thomas Müller | 2015-11-16 | 7 | -5/+386 | |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | ||||||
| * | | | | | Add fake locker plugin for WebDAVFS | Lukas Reschke | 2015-11-13 | 7 | -5/+386 | |
| |/ / / / | ||||||
* | | | | | Merge pull request #20463 from owncloud/sharing-api-integration-tests-adding-... | Thomas Müller | 2015-11-16 | 2 | -12/+256 | |
|\ \ \ \ \ | ||||||
| * | | | | | Modified test to PUT only 1 parameter with each update | Sergio Bertolin | 2015-11-12 | 1 | -4/+86 | |
| * | | | | | Added a test including all the fields of the share update and checking output | Sergio Bertolin | 2015-11-11 | 2 | -3/+86 | |
| * | | | | | Added a test and logic for checking answer of public shares | Sergio Bertolin | 2015-11-11 | 2 | -9/+88 | |
* | | | | | | Merge pull request #20510 from owncloud/avatar_unittest_fix | Thomas Müller | 2015-11-16 | 1 | -59/+40 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | [Avatar] No need to setup FS for avatar tests | Roeland Jago Douma | 2015-11-14 | 1 | -59/+40 | |
| | |_|/ / / | |/| | | | | ||||||
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-11-16 | 2 | -0/+2 | |
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-11-15 | 20 | -14/+38 | |
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-11-14 | 30 | -0/+44 | |
| |_|/ / / |/| | | | | ||||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-11-13 | 284 | -594/+312 | |
|/ / / / | ||||||
* | | | | Merge pull request #20472 from owncloud/switch-ch-log_with_ms_precision | Thomas Müller | 2015-11-12 | 2 | -1/+68 | |
|\ \ \ \ | ||||||
| * | | | | enable microseconds in log timestamps | Christian Schnidrig | 2015-11-12 | 2 | -1/+68 | |
* | | | | | Merge pull request #20478 from owncloud/jnweiger-patch-1 | Thomas Müller | 2015-11-12 | 1 | -1/+1 | |
|\ \ \ \ \ | ||||||
| * | | | | | Update untrustedDomain.php | Jürgen Weigert | 2015-11-12 | 1 | -1/+1 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #20469 from seal20/seal20-fix-one-string-in-user_ldap | Thomas Müller | 2015-11-12 | 1 | -1/+1 | |
|\ \ \ \ \ | ||||||
| * | | | | | changed 1.000 to 1,000 | sylvain | 2015-11-12 | 1 | -1/+1 | |
| | |_|/ / | |/| | | | ||||||
* | | | | | Merge pull request #20460 from owncloud/file-handling-wording | Thomas Müller | 2015-11-12 | 1 | -4/+2 | |
|\ \ \ \ \ | ||||||
| * | | | | | fix layout and wording for file handling admin setting | Jan-Christoph Borchardt | 2015-11-11 | 1 | -4/+2 | |
* | | | | | | Merge pull request #17920 from andyboeh/master | Thomas Müller | 2015-11-12 | 1 | -0/+1 | |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | ||||||
| * | | | | | Add hook 'pre_displayLoginPage' | Andreas Böhler | 2015-07-28 | 1 | -8/+1 | |
| * | | | | | Add possibility for alternative logins to force redirection of login page | Andreas Böhler | 2015-07-28 | 1 | -0/+8 | |
* | | | | | | Merge pull request #20461 from owncloud/assetpipeline-on-upgrade | Thomas Müller | 2015-11-12 | 1 | -0/+11 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Do not use the asset pipeline when doing updates | Joas Schilling | 2015-11-11 | 1 | -0/+11 | |
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-11-12 | 8 | -0/+30 | |
| |_|_|/ / / |/| | | | | | ||||||
* | | | | | | Merge pull request #20148 from owncloud/checkbox-accessibility | Thomas Müller | 2015-11-11 | 1 | -5/+6 | |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | ||||||
| * | | | | | make new checkbox style accessible for screenreaders | Hendrik Leppelsack | 2015-10-29 | 1 | -5/+6 | |
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-11-11 | 124 | -124/+406 | |
* | | | | | | Merge pull request #20124 from owncloud/postscriptum-20093 | C. Montero Luque | 2015-11-10 | 2 | -4/+4 | |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | ||||||
| * | | | | | remove uselessly used parameter, read all user attributes also when looking u... | Arthur Schiwon | 2015-11-06 | 2 | -4/+4 | |
* | | | | | | Merge pull request #20176 from owncloud/font-style | Thomas Müller | 2015-11-10 | 7 | -12/+28 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | move font back from Light to Regular for body text on normal-res screens, fix... | Jan-Christoph Borchardt | 2015-11-10 | 7 | -12/+28 | |
* | | | | | | | Merge pull request #20434 from owncloud/set-ie-class-for-ie10plus | Thomas Müller | 2015-11-10 | 2 | -1/+14 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Set "ie" CSS class for IE10, IE11 | Vincent Petry | 2015-11-10 | 2 | -1/+14 | |
* | | | | | | | | Merge pull request #20436 from owncloud/checkbox | Thomas Müller | 2015-11-10 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | use new checkbox style for Apps mgmt settings | Jan-Christoph Borchardt | 2015-11-10 | 1 | -1/+1 | |
* | | | | | | | | | Merge pull request #20429 from owncloud/sharing-api-integration-tests-get-sha... | Thomas Müller | 2015-11-10 | 2 | -2/+54 | |
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Added test to get info of a specific share id | Sergio Bertolin | 2015-11-10 | 2 | -2/+54 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge pull request #20195 from owncloud/add-caldavtester | Thomas Müller | 2015-11-10 | 5 | -0/+1077 | |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | ||||||
| * | | | | | | | Add CalDAVTester to travis | Thomas Müller | 2015-11-10 | 5 | -0/+1077 | |
| | |_|_|_|/ / | |/| | | | | | ||||||
* | | | | | | | Merge pull request #20224 from owncloud/fileinfo-owner | Robin Appelman | 2015-11-10 | 6 | -17/+104 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Add tests for FileInfo owner | Robin Appelman | 2015-11-10 | 2 | -10/+60 | |
| * | | | | | | | Add getOwner to FileInfo | Robin Appelman | 2015-11-10 | 4 | -7/+44 | |
| | |/ / / / / | |/| | | | | |