summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
...
* | | Fix update notification textMorris Jobke2016-06-291-1/+3
* | | get only vcard which match both the address book id and the vcard uriBjoern Schiessle2016-06-282-1/+6
* | | Merge pull request #236 from nextcloud/master-sync-upstreamMorris Jobke2016-06-2813-23/+147
|\ \ \
| * | | Merge remote-tracking branch 'upstream/master' into master-sync-upstreamLukas Reschke2016-06-2713-23/+147
| |\| |
| | * | Merge pull request #25273 from owncloud/ext-fixsessioncredentialsnolazyloadVincent Petry2016-06-271-0/+4
| | |\ \
| | | * | Quickfix: do not lazy load auth mechanisms for ext storagesVincent Petry2016-06-271-0/+4
| | * | | Merge pull request #25237 from owncloud/search-filelistnextpageresultsVincent Petry2016-06-272-4/+29
| | |\ \ \
| | | * | | Prerender file list pages to include search resultsVincent Petry2016-06-242-4/+29
| | | | |/ | | | |/|
| | * | | Merge pull request #25250 from owncloud/linkshare-includedeletewithuploadpermsVincent Petry2016-06-273-16/+98
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | Add explicit delete permission to link sharesVincent Petry2016-06-243-16/+98
| | * | | Merge pull request #25247 from owncloud/fed-unshare-failVincent Petry2016-06-271-2/+2
| | |\ \ \
| | | * | | Remove a fed share from the local table before trying to notify the remote se...Robin Appelman2016-06-231-2/+2
| | * | | | [tx-robot] updated from transifexJenkins for ownCloud2016-06-276-0/+14
* | | | | | Merge pull request #235 from nextcloud/fix-app-codeMarius Blüm2016-06-278-18/+0
|\ \ \ \ \ \
| * | | | | | Add app:check-code for already compatible appsMorris Jobke2016-06-278-18/+0
* | | | | | | Merge pull request #59 from nextcloud/theming-appLukas Reschke2016-06-2714-0/+4041
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Only save when value changed or enter is pressedLukas Reschke2016-06-271-9/+15
| * | | | | | Add tooltipLukas Reschke2016-06-272-6/+7
| * | | | | | Add comment to "getMailHeaderColor"Lukas Reschke2016-06-271-0/+5
| * | | | | | Use stream instead of renameLukas Reschke2016-06-272-14/+45
| * | | | | | Replace OC_Defaults with \OC::$server->getThemingDefaults()Lukas Reschke2016-06-271-6/+1
| * | | | | | design and layout fixes for Theming appJan-Christoph Borchardt2016-06-272-15/+29
| * | | | | | make sure that the preview gets updated every time a new image gets uploadedBjoern Schiessle2016-06-271-2/+3
| * | | | | | scale preview imageBjoern Schiessle2016-06-271-3/+5
| * | | | | | Disable drop zoneLukas Reschke2016-06-271-0/+2
| * | | | | | Fix indentationLukas Reschke2016-06-271-3/+3
| * | | | | | Migrate logic to dynamic controllerLukas Reschke2016-06-2711-224/+955
| * | | | | | add some visual feedback if the operation was succesful or notBjoern Schiessle2016-06-274-16/+82
| * | | | | | write theme settings to databaseBjoern Schiessle2016-06-2712-8/+3082
| * | | | | | basic information architecture for the theming appJan-Christoph Borchardt2016-06-272-3/+20
| * | | | | | initial commit for the theming appBjoern Schiessle2016-06-276-0/+96
| |/ / / / /
* | | | | | Merge pull request #233 from nextcloud/allow-users-to-change-global-credentialsMorris Jobke2016-06-272-3/+216
|\ \ \ \ \ \
| * | | | | | Allow regular users to specify global credentials passwordLukas Reschke2016-06-272-3/+216
| |/ / / / /
* | | | | | Merge pull request #190 from nextcloud/add-wnd-1Lukas Reschke2016-06-273-0/+182
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Add "Login credentials" and "User Provided"Lukas Reschke2016-06-213-0/+182
* | | | | | Merge remote-tracking branch 'upstream/master' into master-upstream-syncLukas Reschke2016-06-2674-86/+1087
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-06-2612-0/+36
| * | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-06-256-2/+120
| * | | | | Merge pull request #25259 from owncloud/search-fixsearchfromotherfilelistsChristoph Wurst2016-06-241-2/+9
| |\ \ \ \ \
| | * | | | | Hide search results after switching directoryVincent Petry2016-06-241-0/+7
| | * | | | | Fix search result link for file results outside default listVincent Petry2016-06-241-2/+2
| | | |_|_|/ | | |/| | |
| * | | | | Merge pull request #25257 from owncloud/comments-showerroronsaveChristoph Wurst2016-06-243-8/+12
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Show error message when posting an invalid commentVincent Petry2016-06-243-8/+12
| | | |_|/ | | |/| |
| * | | | Merge pull request #25171 from owncloud/files_external-list-allVincent Petry2016-06-245-10/+81
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Add option to `occ files_external:list` to show all configured mountsRobin Appelman2016-06-235-10/+81
| | | |/ | | |/|
| * | | [tx-robot] updated from transifexJenkins for ownCloud2016-06-246-4/+68
| * | | Merge pull request #25238 from owncloud/files-trashlistnamecorruptionVincent Petry2016-06-232-0/+24
| |\ \ \ | | |/ / | |/| |
| | * | Fix trashed file name corruption when rerendering trashbin listVincent Petry2016-06-232-0/+24
| * | | Merge pull request #25225 from owncloud/enc-revertversionsizeVincent Petry2016-06-221-1/+8
| |\ \ \
| | * | | Rollback version must also adjust cached sizeVincent Petry2016-06-221-1/+8