Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Remove the icon for now | Joas Schilling | 2015-11-16 | 6 | -141/+0 |
| | |||||
* | Add "is primary action" to actions | Joas Schilling | 2015-11-16 | 4 | -0/+97 |
| | |||||
* | Merge pull request #20522 from owncloud/update-strengthify | Thomas Müller | 2015-11-16 | 5 | -36/+39 |
|\ | | | | | Update strengthify to 0.4.2 | ||||
| * | Update strengthify to 0.4.2 | Morris Jobke | 2015-11-16 | 5 | -36/+39 |
| | | | | | | | | | | | | * includes local changes (ported them to upstream - see #10625) * tipsy -> tooltip * re-renders the element on scroll of a parent - fixes #20454 | ||||
* | | Merge pull request #20505 from owncloud/fakelocking-for-mac | Thomas Müller | 2015-11-16 | 7 | -5/+386 |
|\ \ | | | | | | | Add fake locker plugin for WebDAVFS | ||||
| * | | Add fake locker plugin for WebDAVFS | Lukas Reschke | 2015-11-13 | 7 | -5/+386 |
| |/ | | | | | | | WebDAVFS as used by Finder requires a Class 2 compatible WebDAV server. This change introduces a fake locking provider which will simply advertise Locking support when a request originates from WebDAVFS. It will also return successful LOCK and UNLOCK responses. | ||||
* | | Merge pull request #20463 from ↵ | Thomas Müller | 2015-11-16 | 2 | -12/+256 |
|\ \ | | | | | | | | | | | | | owncloud/sharing-api-integration-tests-adding-cases Sharing api integration tests adding cases | ||||
| * | | 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 | ||||
| * | | | [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 | ||||
| * | | 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 | ||||
| * | | | 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 | ||||
| * | | | changed 1.000 to 1,000 | sylvain | 2015-11-12 | 1 | -1/+1 |
| | | | | | | | | | | | | The string "More than 1,000 directory entries available." would mean only 1 entry, in english it should be 1,000 . Found it while translating | ||||
* | | | | 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 | ||||
| * | | | | 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 possibility for alternative logins to force redirection of login page | ||||
| * | | | | 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 | ||||
| * | | | | | 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 | ||||
| * | | | | 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 l… | ||||
| * | | | | remove uselessly used parameter, read all user attributes also when looking ↵ | Arthur Schiwon | 2015-11-06 | 2 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | up users in groups | ||||
* | | | | | 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, fix #18954 | ||||
| * | | | | | move font back from Light to Regular for body text on normal-res screens, ↵ | Jan-Christoph Borchardt | 2015-11-10 | 7 | -12/+28 |
| | | | | | | | | | | | | | | | | | | | | | | | | fix #18954 | ||||
* | | | | | | 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 | ||||
| * | | | | | | Set "ie" CSS class for IE10, IE11 | Vincent Petry | 2015-11-10 | 2 | -1/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed border in file action menu | ||||
* | | | | | | | Merge pull request #20436 from owncloud/checkbox | Thomas Müller | 2015-11-10 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | use new checkbox style for Apps mgmt settings | ||||
| * | | | | | | | use new checkbox style for Apps mgmt settings | Jan-Christoph Borchardt | 2015-11-10 | 1 | -1/+1 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #20429 from ↵ | Thomas Müller | 2015-11-10 | 2 | -2/+54 |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | owncloud/sharing-api-integration-tests-get-share-by-id Added test to get info of a specific share id | ||||
| * | | | | | | | Added test to get info of a specific share id | Sergio Bertolin | 2015-11-10 | 2 | -2/+54 |
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check fields of the share response Added missing fields to check if their values are numbers | ||||
* | | | | | | | Merge pull request #20195 from owncloud/add-caldavtester | Thomas Müller | 2015-11-10 | 5 | -0/+1077 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Add CalDAVTester to travis | ||||
| * | | | | | | | 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 getOwner to FileInfo | ||||
| * | | | | | | | 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 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge pull request #20431 from owncloud/carddav-enforce-displayname | Thomas Müller | 2015-11-10 | 2 | -1/+8 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | When creating addressbooks, make sure the displayname is set | ||||
| * | | | | | | | When creating addressbooks, make sure the displayname is set | Arthur Schiwon | 2015-11-10 | 2 | -1/+8 |
| | | | | | | | |