aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #2123 from nextcloud/downstream-26522Joas Schilling2016-11-162-2/+34
|\ | | | | Skip hidden files when counting visible files in list
| * Skip hidden files when counting visible files in list (#26522)Vincent Petry2016-11-142-2/+34
| | | | | | | | | | | | The file list UI logic that renders the next page doesn't properly exclude hidden files when not shown. This fix makes sure that only rows that are actually visible are counted when rendering a page, this makes sure that the page will always have enough elements displayed.
* | Merge pull request #2160 from nextcloud/its-nextcloudRoeland Jago Douma2016-11-161-1/+1
|\ \ | | | | | | It's Nextcloud
| * | It's NextcloudMarius Blüm2016-11-161-1/+1
| | | | | | | | | | | | Signed-off-by: Marius Blüm <marius@lineone.io>
* | | Merge pull request #2166 from nextcloud/logreader-shippedRoeland Jago Douma2016-11-161-0/+1
|\ \ \ | | | | | | | | set logreader as shipped
| * | | set logreader as shippedRobin Appelman2016-11-161-0/+1
| | | |
* | | | Merge pull request #2146 from nextcloud/add_copy_tooltip_to_clipboardRoeland Jago Douma2016-11-164-30/+59
|\ \ \ \ | |/ / / |/| | | Adds copy tooltip to clipboards
| * | | Fix tooltips - they now properly change on clickMorris Jobke2016-11-166-35/+63
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | Adds copy tooltip to clipboardsRoeland Jago Douma2016-11-153-4/+5
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Merge pull request #719 from nextcloud/lockdownRoeland Jago Douma2016-11-1628-41/+1336
|\ \ \ \ | | | | | | | | | | Allow restricting of app password permissions
| * | | | add testRobin Appelman2016-11-161-0/+7
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | Add test for setting up fake fsRobin Appelman2016-11-163-2/+65
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | dropdown uiRobin Appelman2016-11-163-24/+40
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | Adds tests for the AuthSettingsControllerRoeland Jago Douma2016-11-161-0/+23
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | Adds NullCache ans NullStorage tests for LockdownRoeland Jago Douma2016-11-162-0/+402
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | Adds TokenProvider and Mapper testsRoeland Jago Douma2016-11-163-7/+60
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | add testsRobin Appelman2016-11-162-0/+98
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | update autoloaderRobin Appelman2016-11-162-0/+8
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | explicit typesRobin Appelman2016-11-162-6/+11
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | cast to intRobin Appelman2016-11-162-6/+6
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | update testsRobin Appelman2016-11-161-1/+7
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | phpdocRobin Appelman2016-11-165-22/+22
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | fix setscopeRobin Appelman2016-11-161-2/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <icewind@owncloud.com>
| * | | | enable deleting/configuring new tokensRobin Appelman2016-11-163-4/+12
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <icewind@owncloud.com>
| * | | | allow configuring filesystem accessRobin Appelman2016-11-169-13/+145
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <icewind@owncloud.com>
| * | | | app password scope wipRobin Appelman2016-11-166-9/+40
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <icewind@owncloud.com>
| * | | | read lockdown scope from tokenRobin Appelman2016-11-167-11/+46
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <icewind@owncloud.com>
| * | | | basic lockdown logicRobin Appelman2016-11-1610-16/+424
| | |/ / | |/| | | | | | | | | | Signed-off-by: Robin Appelman <icewind@owncloud.com>
* | | | Merge pull request #2150 from nextcloud/move_buttons_to_bottomRoeland Jago Douma2016-11-165-2/+68
|\ \ \ \ | | | | | | | | | | Move social buttons to bottom on admin page
| * | | | left-align social media buttons correctly on Personal page tooJan-Christoph Borchardt2016-11-161-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * | | | Move social buttons to bottom on admin pageRoeland Jago Douma2016-11-164-1/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For #2134 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | Merge pull request #2156 from nextcloud/fix-autoloader-for-new-appsRoeland Jago Douma2016-11-161-0/+2
|\ \ \ \ \ | |_|/ / / |/| | | | Add autoloader path for newly installed apps too
| * | | | Add autoloader path for newly installed apps tooMorris Jobke2016-11-161-0/+2
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | * followup to https://github.com/nextcloud/server/pull/2148 * problem noticed in https://github.com/nextcloud/files_antivirus/pull/11 Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | Merge pull request #2148 from nextcloud/add_autoloader_before_enablingRoeland Jago Douma2016-11-161-0/+2
|\ \ \ \ | | | | | | | | | | Add autoloader before enabling apps
| * | | | Add autoloader before enabling appsRoeland Jago Douma2016-11-151-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Else apps that require already autoloading in the installer (files_antivius) die hard! Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | Merge pull request #2092 from nextcloud/activity-filter-apiJoas Schilling2016-11-1632-1076/+2410
|\ \ \ \ \ | |_|/ / / |/| | | | Better API for activity filters, settings and providers + Rich Object support
| * | | | Update the since version to 11.0.0Joas Schilling2016-11-1618-136/+136
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | Fix integration testsJoas Schilling2016-11-163-14/+9
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | Make sure they are always arraysJoas Schilling2016-11-161-6/+6
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | Remove the old activity extensionJoas Schilling2016-11-163-720/+0
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | Add back the support for the short translationsJoas Schilling2016-11-161-4/+68
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | Fix InfoParser empty testsJoas Schilling2016-11-161-1/+6
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | Fix activity manager testsJoas Schilling2016-11-164-53/+56
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | Don't even try to combine when the subject is differentJoas Schilling2016-11-161-0/+5
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | Allow combining eventsJoas Schilling2016-11-162-0/+30
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | Provider for the files appJoas Schilling2016-11-165-0/+226
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | Allow to register ProvidersJoas Schilling2016-11-166-6/+104
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | Add ROS and icon support to the eventsJoas Schilling2016-11-163-24/+278
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | Validate the input into Event alreadyJoas Schilling2016-11-162-91/+215
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | Register the settings of the files app via info.xmlJoas Schilling2016-11-167-20/+499
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>