aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Regex fixJohn Molakvoæ (skjnldsv)2017-01-061-1/+1
| | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* Injection fix and log appname fixJohn Molakvoæ (skjnldsv)2017-01-064-14/+30
| | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* Since fixJohn Molakvoæ (skjnldsv)2017-01-061-0/+2
| | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* Url generator fixJohn Molakvoæ (skjnldsv)2017-01-061-1/+2
| | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* log app name fixJohn Molakvoæ (skjnldsv)2017-01-062-3/+3
| | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* Appdata integration 2John Molakvoæ (skjnldsv)2017-01-069-6/+248
| | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* Appdata integration 1 & log fix 2John Molakvoæ (skjnldsv)2017-01-064-21/+49
| | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* Debug log fixJohn Molakvoæ (skjnldsv)2017-01-061-1/+6
| | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* Cache and compile baseJohn Molakvoæ (skjnldsv)2017-01-063-0/+139
| | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* Merge pull request #2676 from nextcloud/smb-2.0.0Morris Jobke2017-01-0523-299/+431
|\ | | | | Update icewind/smb to 2.0.0
| * Update icewind/smb to 2.0.0Robin Appelman2017-01-0523-299/+431
| | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | Merge pull request #2817 from nextcloud/fix-invalid-share-permsMorris Jobke2017-01-055-2/+150
|\ \ | | | | | | Fix invalid share perms
| * | Use the new expressionJoas Schilling2017-01-051-10/+1
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Add bitwise AND and OR to the expression builderJoas Schilling2017-01-052-1/+58
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Adjust version to NextcloudLukas Reschke2017-01-052-2/+2
| | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | Add repair step to fix file share permissionsVincent Petry2017-01-052-0/+100
| | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | Merge pull request #2946 from nextcloud/kill-apcJoas Schilling2017-01-056-168/+3
|\ \ \ | | | | | | | | Kill APC because it requires PHP 5.4 or lower
| * | | Make sure old instances don't breakJoas Schilling2017-01-051-3/+3
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Kill APC because it requires PHP 5.4Joas Schilling2017-01-055-165/+0
| | |/ | |/| | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #2797 from nextcloud/issue-2734-sudo-password-with-ldapJoas Schilling2017-01-054-9/+18
|\ \ \ | | | | | | | | Use login name to fix password confirm with ldap users
| * | | Remove warningJoas Schilling2017-01-051-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Fix testsJoas Schilling2017-01-051-1/+13
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Make sure the loginname is set when logging in via cookieJoas Schilling2017-01-051-0/+1
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Use login name to fix password confirm with ldap usersJoas Schilling2017-01-051-7/+3
| |/ / | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #2922 from nextcloud/fopen-only-simple-modesRobin Appelman2017-01-051-14/+11
|\ \ \ | | | | | | | | log a warning when trying to use a non basic fopen mode
| * | | log a warning when trying to use a non basic fopen modeRobin Appelman2017-01-051-14/+11
| |/ / | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | Merge pull request #2535 from ↵Joas Schilling2017-01-051-7/+9
|\ \ \ | |_|/ |/| | | | | | | | nextcloud/allow-to-reuse-admin-as-install-name-like-on-mysql Allow to reuse the same name when installing a new instance on postgres
| * | Allow to reuse the same name when installing a new instanceJoas Schilling2016-12-121-7/+9
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | [tx-robot] updated from transifexNextcloud bot2017-01-0538-184/+464
| | |
* | | Merge pull request #2830 from ↵Roeland Jago Douma2017-01-052-18/+56
|\ \ \ | |_|/ |/| | | | | | | | nextcloud/downstream-fix-birthday-generation-incase-no-year-is-set Fix generation of birthday, deathdate and anniversary in case where n…
| * | Fix generation of birthday, deathdate and anniversary in case where no year ↵Thomas Müller2017-01-052-18/+56
|/ / | | | | | | | | | | | | is set - which is allowed as per https://tools.ietf.org/html/rfc6350#section-6.2.5 (#26756) Signed-off-by: Lukas Reschke <lukas@statuscode.ch> Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #2937 from nextcloud/remove-static-stream-wrapperRobin Appelman2017-01-048-250/+22
|\ \ | | | | | | remove static:// stream wrapper
| * | update autoloaderMorris Jobke2017-01-042-2/+0
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | remove static:// stream wrapperRobin Appelman2017-01-046-248/+22
|/ / | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | Merge pull request #2933 from nextcloud/dont-link-to-oc-forumMorris Jobke2017-01-041-1/+1
|\ \ | | | | | | Don't link to the oC forum
| * | Don't link to the oC forumJoas Schilling2017-01-041-1/+1
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | [tx-robot] updated from transifexNextcloud bot2017-01-0444-48/+838
|/ /
* | Merge pull request #2923 from nextcloud/remove-fakedir-streamRobin Appelman2017-01-035-82/+0
|\ \ | | | | | | remove no longer used fakedir stream wrapper
| * | update autoloaderMorris Jobke2017-01-033-7/+31
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | remove no longer used fakedir stream wrapperRobin Appelman2017-01-033-80/+0
| | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | Merge pull request #2921 from nextcloud/remove-unused-assetic-use-statementsLukas Reschke2017-01-031-8/+0
|\ \ \ | | | | | | | | remove unused Assetic use statements
| * | | remove unused Assetic use statementsChristoph Wurst2017-01-031-8/+0
|/ / / | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | Merge pull request #2913 from nextcloud/update-root-authoritiesChristoph Wurst2017-01-031-8/+38
|\ \ \ | | | | | | | | Update bundled CA Certificates
| * | | Update bundled CA CertificatesLukas Reschke2017-01-021-8/+38
| | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | [tx-robot] updated from transifexNextcloud bot2017-01-038-0/+82
| | | |
* | | | Merge pull request #2850 from nextcloud/downstream-26603Roeland Jago Douma2017-01-0212-62/+175
|\ \ \ \ | | | | | | | | | | Fixed size issues on main detail view and disappearing of share recipients (#26603)
| * | | | mention property to follow same styleArthur Schiwon2016-12-231-3/+4
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | | Fixed size issues on main detail view and disappearing of share recipients ↵Michael Jobst2016-12-2312-61/+173
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (#26603) * fixed size issues on main detail view and disappearing of share recipients * Changes due to code comments * Moved reloadProperties() to FileInfoModel * Solved Scrutinizer issues * Bugfix: undefined value used on error * check if options are set for FileInfoModel.initialize() Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | | Merge pull request #2872 from nextcloud/admin-settings-split-dbMorris Jobke2017-01-028-279/+459
|\ \ \ \ \ | | | | | | | | | | | | split db logic from settings manager and test them separately
| * | | | | phpdocRobin Appelman2017-01-021-4/+23
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>