summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Add OCSControllerTestsRoeland Jago Douma2016-11-161-0/+209
* Move OC\OCS\Person to OCSControllerRoeland Jago Douma2016-11-164-57/+39
* Merge pull request #2160 from nextcloud/its-nextcloudRoeland Jago Douma2016-11-161-1/+1
|\
| * It's NextcloudMarius Blüm2016-11-161-1/+1
* | Merge pull request #2166 from nextcloud/logreader-shippedRoeland Jago Douma2016-11-161-0/+1
|\ \
| * | 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
|\ \ \ | |/ / |/| |
| * | Fix tooltips - they now properly change on clickMorris Jobke2016-11-166-35/+63
| * | Adds copy tooltip to clipboardsRoeland Jago Douma2016-11-153-4/+5
* | | Merge pull request #719 from nextcloud/lockdownRoeland Jago Douma2016-11-1628-41/+1336
|\ \ \
| * | | add testRobin Appelman2016-11-161-0/+7
| * | | Add test for setting up fake fsRobin Appelman2016-11-163-2/+65
| * | | dropdown uiRobin Appelman2016-11-163-24/+40
| * | | Adds tests for the AuthSettingsControllerRoeland Jago Douma2016-11-161-0/+23
| * | | Adds NullCache ans NullStorage tests for LockdownRoeland Jago Douma2016-11-162-0/+402
| * | | Adds TokenProvider and Mapper testsRoeland Jago Douma2016-11-163-7/+60
| * | | add testsRobin Appelman2016-11-162-0/+98
| * | | update autoloaderRobin Appelman2016-11-162-0/+8
| * | | explicit typesRobin Appelman2016-11-162-6/+11
| * | | cast to intRobin Appelman2016-11-162-6/+6
| * | | update testsRobin Appelman2016-11-161-1/+7
| * | | phpdocRobin Appelman2016-11-165-22/+22
| * | | fix setscopeRobin Appelman2016-11-161-2/+2
| * | | enable deleting/configuring new tokensRobin Appelman2016-11-163-4/+12
| * | | allow configuring filesystem accessRobin Appelman2016-11-169-13/+145
| * | | app password scope wipRobin Appelman2016-11-166-9/+40
| * | | read lockdown scope from tokenRobin Appelman2016-11-167-11/+46
| * | | basic lockdown logicRobin Appelman2016-11-1610-16/+424
| | |/ | |/|
* | | Merge pull request #2150 from nextcloud/move_buttons_to_bottomRoeland Jago Douma2016-11-165-2/+68
|\ \ \
| * | | left-align social media buttons correctly on Personal page tooJan-Christoph Borchardt2016-11-161-1/+1
| * | | Move social buttons to bottom on admin pageRoeland Jago Douma2016-11-164-1/+67
* | | | Merge pull request #2156 from nextcloud/fix-autoloader-for-new-appsRoeland Jago Douma2016-11-161-0/+2
|\ \ \ \ | |_|/ / |/| | |
| * | | Add autoloader path for newly installed apps tooMorris Jobke2016-11-161-0/+2
|/ / /
* | | Merge pull request #2148 from nextcloud/add_autoloader_before_enablingRoeland Jago Douma2016-11-161-0/+2
|\ \ \
| * | | Add autoloader before enabling appsRoeland Jago Douma2016-11-151-0/+2
* | | | Merge pull request #2092 from nextcloud/activity-filter-apiJoas Schilling2016-11-1632-1076/+2410
|\ \ \ \ | |_|/ / |/| | |
| * | | Update the since version to 11.0.0Joas Schilling2016-11-1618-136/+136
| * | | Fix integration testsJoas Schilling2016-11-163-14/+9
| * | | Make sure they are always arraysJoas Schilling2016-11-161-6/+6
| * | | Remove the old activity extensionJoas Schilling2016-11-163-720/+0
| * | | Add back the support for the short translationsJoas Schilling2016-11-161-4/+68
| * | | Fix InfoParser empty testsJoas Schilling2016-11-161-1/+6
| * | | Fix activity manager testsJoas Schilling2016-11-164-53/+56
| * | | Don't even try to combine when the subject is differentJoas Schilling2016-11-161-0/+5
| * | | Allow combining eventsJoas Schilling2016-11-162-0/+30
| * | | Provider for the files appJoas Schilling2016-11-165-0/+226
| * | | Allow to register ProvidersJoas Schilling2016-11-166-6/+104
| * | | Add ROS and icon support to the eventsJoas Schilling2016-11-163-24/+278
| * | | Validate the input into Event alreadyJoas Schilling2016-11-162-91/+215
| * | | Register the settings of the files app via info.xmlJoas Schilling2016-11-167-20/+499