Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | Merge pull request #242 from nextcloud/fix-229 | Morris Jobke | 2016-06-29 | 2 | -1/+6 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| * | | | | get only vcard which match both the address book id and the vcard uri | Bjoern Schiessle | 2016-06-28 | 2 | -1/+6 | |
|/ / / / | ||||||
* | | | | Merge pull request #236 from nextcloud/master-sync-upstream | Morris Jobke | 2016-06-28 | 42 | -252/+387 | |
|\ \ \ \ | ||||||
| * \ \ \ | Merge remote-tracking branch 'upstream/master' into master-sync-upstream | Lukas Reschke | 2016-06-27 | 42 | -252/+387 | |
| |\ \ \ \ | | | |/ / | | |/| | | ||||||
| | * | | | Merge pull request #25273 from owncloud/ext-fixsessioncredentialsnolazyload | Vincent Petry | 2016-06-27 | 1 | -0/+4 | |
| | |\ \ \ | ||||||
| | | * | | | Quickfix: do not lazy load auth mechanisms for ext storages | Vincent Petry | 2016-06-27 | 1 | -0/+4 | |
| | * | | | | Merge pull request #25237 from owncloud/search-filelistnextpageresults | Vincent Petry | 2016-06-27 | 2 | -4/+29 | |
| | |\ \ \ \ | ||||||
| | | * | | | | Prerender file list pages to include search results | Vincent Petry | 2016-06-24 | 2 | -4/+29 | |
| | * | | | | | Merge pull request #25261 from owncloud/app-password-login-name | Vincent Petry | 2016-06-27 | 4 | -2/+28 | |
| | |\ \ \ \ \ | ||||||
| | | * | | | | | fix layout | Christoph Wurst | 2016-06-24 | 3 | -6/+24 | |
| | | * | | | | | show which login name to use for the new app password | Christoph Wurst | 2016-06-24 | 3 | -0/+8 | |
| | | |/ / / / | ||||||
| | * | | | | | Merge pull request #25263 from owncloud/decryptall-keepencryptionenabledforsi... | Christoph Wurst | 2016-06-27 | 1 | -0/+3 | |
| | |\ \ \ \ \ | ||||||
| | | * | | | | | Keep encryption enabled if decrypting for single user | Vincent Petry | 2016-06-24 | 1 | -0/+3 | |
| | | |/ / / / | ||||||
| | * | | | | | Merge pull request #25250 from owncloud/linkshare-includedeletewithuploadperms | Vincent Petry | 2016-06-27 | 10 | -45/+214 | |
| | |\ \ \ \ \ | ||||||
| | | * | | | | | Repair step to adjust link share delete permissions | Vincent Petry | 2016-06-24 | 3 | -1/+111 | |
| | | * | | | | | Add explicit delete permission to link shares | Vincent Petry | 2016-06-24 | 7 | -44/+103 | |
| | * | | | | | | Merge pull request #25258 from owncloud/integritycheck-whennotinstalled | Vincent Petry | 2016-06-27 | 1 | -3/+12 | |
| | |\ \ \ \ \ \ | ||||||
| | | * | | | | | | Make code integrity check work when OC is not installed yet | Vincent Petry | 2016-06-24 | 1 | -3/+12 | |
| | * | | | | | | | Merge pull request #25252 from owncloud/authtoken-removetooltipondisconnect | Morris Jobke | 2016-06-27 | 1 | -0/+2 | |
| | |\ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | Remove tooltip when disconnecting token | Vincent Petry | 2016-06-23 | 1 | -0/+2 | |
| | * | | | | | | | | Merge pull request #25129 from owncloud/remove-ie | Vincent Petry | 2016-06-27 | 10 | -203/+11 | |
| | |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / | | |/| | | | | | | | ||||||
| | | * | | | | | | | remove ie8+9 support | Hendrik Leppelsack | 2016-06-23 | 10 | -203/+11 | |
| | | | |_|_|_|_|/ | | | |/| | | | | | ||||||
| | * | | | | | | | Merge pull request #25247 from owncloud/fed-unshare-fail | Vincent Petry | 2016-06-27 | 1 | -2/+2 | |
| | |\ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | Remove a fed share from the local table before trying to notify the remote se... | Robin Appelman | 2016-06-23 | 1 | -2/+2 | |
| | | |/ / / / / / | ||||||
| | * | | | | | | | Merge pull request #25251 from owncloud/authtoken-assetpipelinefix | Vincent Petry | 2016-06-27 | 3 | -11/+11 | |
| | |\ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | Use OC.Backbone instead of Backbone directly in authtoken JS code | Vincent Petry | 2016-06-23 | 3 | -11/+11 | |
| | | | |/ / / / / | | | |/| | | | | | ||||||
| | * | | | | | | | Merge pull request #25154 from owncloud/token-login-check-loginname | Vincent Petry | 2016-06-27 | 2 | -2/+41 | |
| | |\ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | check login name when authenticating with client token | Christoph Wurst | 2016-06-24 | 2 | -2/+41 | |
| | | | |_|_|_|/ / | | | |/| | | | | | ||||||
| | * | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-06-27 | 10 | -0/+32 | |
* | | | | | | | | | Merge pull request #238 from nextcloud/lgtm-self-approval-fix | Morris Jobke | 2016-06-28 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Get rid of LGTM self approvals | Marius Blüm | 2016-06-27 | 1 | -1/+1 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #235 from nextcloud/fix-app-code | Marius Blüm | 2016-06-27 | 9 | -18/+3 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Add app:check-code for already compatible apps | Morris Jobke | 2016-06-27 | 9 | -18/+3 | |
* | | | | | | | | | | Merge pull request #59 from nextcloud/theming-app | Lukas Reschke | 2016-06-27 | 20 | -2/+4066 | |
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | Only save when value changed or enter is pressed | Lukas Reschke | 2016-06-27 | 1 | -9/+15 | |
| * | | | | | | | | | Add tooltip | Lukas Reschke | 2016-06-27 | 2 | -6/+7 | |
| * | | | | | | | | | Add comment to "getMailHeaderColor" | Lukas Reschke | 2016-06-27 | 1 | -0/+5 | |
| * | | | | | | | | | Use stream instead of rename | Lukas Reschke | 2016-06-27 | 2 | -14/+45 | |
| * | | | | | | | | | Replace OC_Defaults with \OC::$server->getThemingDefaults() | Lukas Reschke | 2016-06-27 | 1 | -6/+1 | |
| * | | | | | | | | | design and layout fixes for Theming app | Jan-Christoph Borchardt | 2016-06-27 | 2 | -15/+29 | |
| * | | | | | | | | | make sure that the preview gets updated every time a new image gets uploaded | Bjoern Schiessle | 2016-06-27 | 1 | -2/+3 | |
| * | | | | | | | | | scale preview image | Bjoern Schiessle | 2016-06-27 | 1 | -3/+5 | |
| * | | | | | | | | | Adjust integration test | Lukas Reschke | 2016-06-27 | 1 | -0/+1 | |
| * | | | | | | | | | Disable drop zone | Lukas Reschke | 2016-06-27 | 1 | -0/+2 | |
| * | | | | | | | | | Fix indentation | Lukas Reschke | 2016-06-27 | 1 | -3/+3 | |
| * | | | | | | | | | Check if server is installed | Lukas Reschke | 2016-06-27 | 1 | -1/+1 | |
| * | | | | | | | | | Migrate logic to dynamic controller | Lukas Reschke | 2016-06-27 | 16 | -259/+982 | |
| * | | | | | | | | | add some visual feedback if the operation was succesful or not | Bjoern Schiessle | 2016-06-27 | 4 | -16/+82 | |
| * | | | | | | | | | write theme settings to database | Bjoern Schiessle | 2016-06-27 | 13 | -12/+3115 | |
| * | | | | | | | | | basic information architecture for the theming app | Jan-Christoph Borchardt | 2016-06-27 | 2 | -3/+20 |