summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1007 from nextcloud/shared-storage-non-recursiveLukas Reschke2016-08-236-125/+125
|\
| * prevent infinite recursion while getting storage from mountRobin Appelman2016-08-233-12/+18
| * handle failed sharesRobin Appelman2016-08-221-1/+3
| * Lazy init shared storageRobin Appelman2016-08-221-17/+9
| * reuse existing root idRobin Appelman2016-08-221-1/+1
| * Allow jail wrappers to lazily initialize the source storageRobin Appelman2016-08-221-41/+41
| * Allow storage wrappers to lazily initialize the source storageRobin Appelman2016-08-221-55/+55
* | Merge pull request #995 from nextcloud/workflow-sectionLukas Reschke2016-08-238-13/+92
|\ \
| * | Save the container with the app's namespace so we can resolve itJoas Schilling2016-08-221-1/+2
| * | fix wrong var nameArthur Schiwon2016-08-221-1/+1
| * | Move admin settings to workflow sectionJoas Schilling2016-08-223-3/+3
| * | adjust testArthur Schiwon2016-08-221-11/+6
| * | enlist only registered sections that also have settings registered toArthur Schiwon2016-08-222-7/+29
| * | add section to worklfowengineArthur Schiwon2016-08-222-1/+62
* | | Merge pull request #1005 from nextcloud/fix_994Lukas Reschke2016-08-235-10/+103
|\ \ \
| * | | put file handling into a section againArthur Schiwon2016-08-221-16/+18
| * | | Do not error on maxUploadChangeRoeland Jago Douma2016-08-225-23/+114
* | | | Merge pull request #1017 from nextcloud/cache-registered-autoloadersRoeland Jago Douma2016-08-231-0/+6
|\ \ \ \
| * | | | Cache registered autoloadersLukas Reschke2016-08-221-0/+6
* | | | | Merge pull request #956 from nextcloud/fix_952Lukas Reschke2016-08-233-79/+42
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | When requesting a permalink to an invalid file redirectRoeland Jago Douma2016-08-192-7/+10
| * | | | When using permalinks don't error out if file id can't be foundRoeland Jago Douma2016-08-193-75/+35
* | | | | Merge pull request #1015 from nextcloud/1012-masterLukas Reschke2016-08-222-0/+19
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | add testArthur Schiwon2016-08-221-0/+16
| * | | | hide parameters of tryLogin when loggingArthur Schiwon2016-08-221-0/+3
|/ / / /
* | | | Merge pull request #1006 from nextcloud/fix_theming_admin_diblizzz2016-08-221-2/+3
|\ \ \ \ | |_|_|/ |/| | |
| * | | fixes registering of theming settings where server return OC_Defaults instead...Arthur Schiwon2016-08-221-2/+3
|/ / /
* | | Merge pull request #965 from nextcloud/master-files-render-hidden-files-hiddenJoas Schilling2016-08-224-31/+82
|\ \ \
| * | | Fix hidden files handlingVincent Petry2016-08-194-31/+82
* | | | Merge pull request #1000 from nextcloud/mail_icon_shareRoeland Jago Douma2016-08-223-5/+5
|\ \ \ \ | |_|_|/ |/| | |
| * | | Make e-mail icon visibleRoeland Jago Douma2016-08-213-5/+5
* | | | Merge pull request #969 from nextcloud/allow-to-validate-operationsLukas Reschke2016-08-217-8/+87
|\ \ \ \
| * | | | update composer listJoas Schilling2016-08-192-0/+2
| * | | | Validate the operationJoas Schilling2016-08-192-5/+82
| * | | | System tags are not sharing but workflowJoas Schilling2016-08-193-3/+3
* | | | | Merge pull request #989 from nextcloud/share_js_fixesLukas Reschke2016-08-217-11/+19
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Fix some jshint issues in core/js/share*Roeland Jago Douma2016-08-197-11/+19
* | | | | Merge pull request #984 from nextcloud/dont-read-server-variableRoeland Jago Douma2016-08-202-20/+0
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Remove reading PATH_INFO from server variableLukas Reschke2016-08-192-20/+0
* | | | | Merge pull request #982 from nextcloud/uninterpreted-phpJulius Härtl2016-08-191-1/+1
|\ \ \ \ \
| * | | | | Remove uninterpreted PHPLukas Reschke2016-08-191-1/+1
| |/ / / /
* | | | | Merge pull request #978 from nextcloud/add-feedback-for-password-changeMarius Blüm2016-08-192-3/+16
|\ \ \ \ \
| * | | | | Show hint if password policy disallows password changeMorris Jobke2016-08-191-2/+13
| * | | | | 25532_issue_password_update_notification_updated (#25756)Jack Davis2016-08-191-1/+3
* | | | | | Merge pull request #980 from nextcloud/update-iconMarius Blüm2016-08-192-2/+6
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | use simple bell as update notification iconMorris Jobke2016-08-191-0/+4
| * | | | | Change federation icon to the share iconMorris Jobke2016-08-191-2/+2
|/ / / / /
* | | | | Merge pull request #971 from nextcloud/theming-fix-service-registrationJulius Härtl2016-08-192-1/+2
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix loading of ThemingDefaultsJulius Haertl2016-08-192-1/+2
| | |/ / | |/| |
* | | | Merge pull request #967 from nextcloud/settings_users_js_definesRoeland Jago Douma2016-08-193-5/+12
|\ \ \ \