Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 | 13 | -23/+147 |
|\ | |||||
| * | Merge remote-tracking branch 'upstream/master' into master-sync-upstream | Lukas Reschke | 2016-06-27 | 13 | -23/+147 |
| |\ | |||||
| | * | 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 #25250 from owncloud/linkshare-includedeletewithuploadperms | Vincent Petry | 2016-06-27 | 3 | -16/+98 |
| | |\ \ \ | | | |_|/ | | |/| | | |||||
| | | * | | Add explicit delete permission to link shares | Vincent Petry | 2016-06-24 | 3 | -16/+98 |
| | * | | | 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 |
| | * | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-06-27 | 6 | -0/+14 |
* | | | | | | Merge pull request #235 from nextcloud/fix-app-code | Marius Blüm | 2016-06-27 | 8 | -18/+0 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Add app:check-code for already compatible apps | Morris Jobke | 2016-06-27 | 8 | -18/+0 |
* | | | | | | | Merge pull request #59 from nextcloud/theming-app | Lukas Reschke | 2016-06-27 | 14 | -0/+4041 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | |||||
| * | | | | | | 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 |
| * | | | | | | Disable drop zone | Lukas Reschke | 2016-06-27 | 1 | -0/+2 |
| * | | | | | | Fix indentation | Lukas Reschke | 2016-06-27 | 1 | -3/+3 |
| * | | | | | | Migrate logic to dynamic controller | Lukas Reschke | 2016-06-27 | 11 | -224/+955 |
| * | | | | | | 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 | 12 | -8/+3082 |
| * | | | | | | basic information architecture for the theming app | Jan-Christoph Borchardt | 2016-06-27 | 2 | -3/+20 |
| * | | | | | | initial commit for the theming app | Bjoern Schiessle | 2016-06-27 | 6 | -0/+96 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #233 from nextcloud/allow-users-to-change-global-credentials | Morris Jobke | 2016-06-27 | 2 | -3/+216 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Allow regular users to specify global credentials password | Lukas Reschke | 2016-06-27 | 2 | -3/+216 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #190 from nextcloud/add-wnd-1 | Lukas Reschke | 2016-06-27 | 3 | -0/+182 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Add "Login credentials" and "User Provided" | Lukas Reschke | 2016-06-21 | 3 | -0/+182 |
* | | | | | | Merge remote-tracking branch 'upstream/master' into master-upstream-sync | Lukas Reschke | 2016-06-26 | 74 | -86/+1087 |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| * | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-06-26 | 12 | -0/+36 |
| * | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-06-25 | 6 | -2/+120 |
| * | | | | | Merge pull request #25259 from owncloud/search-fixsearchfromotherfilelists | Christoph Wurst | 2016-06-24 | 1 | -2/+9 |
| |\ \ \ \ \ | |||||
| | * | | | | | Hide search results after switching directory | Vincent Petry | 2016-06-24 | 1 | -0/+7 |
| | * | | | | | Fix search result link for file results outside default list | Vincent Petry | 2016-06-24 | 1 | -2/+2 |
| | | |_|_|/ | | |/| | | | |||||
| * | | | | | Merge pull request #25257 from owncloud/comments-showerroronsave | Christoph Wurst | 2016-06-24 | 3 | -8/+12 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| | * | | | | Show error message when posting an invalid comment | Vincent Petry | 2016-06-24 | 3 | -8/+12 |
| | | |_|/ | | |/| | | |||||
| * | | | | Merge pull request #25171 from owncloud/files_external-list-all | Vincent Petry | 2016-06-24 | 5 | -10/+81 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | Add option to `occ files_external:list` to show all configured mounts | Robin Appelman | 2016-06-23 | 5 | -10/+81 |
| | | |/ | | |/| | |||||
| * | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-06-24 | 6 | -4/+68 |
| * | | | Merge pull request #25238 from owncloud/files-trashlistnamecorruption | Vincent Petry | 2016-06-23 | 2 | -0/+24 |
| |\ \ \ | | |/ / | |/| | | |||||
| | * | | Fix trashed file name corruption when rerendering trashbin list | Vincent Petry | 2016-06-23 | 2 | -0/+24 |
| * | | | Merge pull request #25225 from owncloud/enc-revertversionsize | Vincent Petry | 2016-06-22 | 1 | -1/+8 |
| |\ \ \ | |||||
| | * | | | Rollback version must also adjust cached size | Vincent Petry | 2016-06-22 | 1 | -1/+8 |
| * | | | | Merge pull request #25223 from owncloud/external-list-default-options | Vincent Petry | 2016-06-22 | 1 | -1/+3 |
| |\ \ \ \ |