summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Revert "occ web executor (#24957)"Morris Jobke2016-07-077-324/+6
| | | | This reverts commit 854352d9a064a1e469ede207493bce44fd41d96c.
* Revert "Bypass upgrade page when occ controller is requested"Morris Jobke2016-07-071-15/+3
| | | | This reverts commit 89e581acf8d30e11a27f1d23560d54306615ae7e.
* Merge branch 'master' into sync-masterMorris Jobke2016-07-07811-3207/+9572
|\
| * Merge pull request #323 from Faldon/database_portMorris Jobke2016-07-075-7/+26
| |\ | | | | | | Added occ install option for database-port
| | * Changed the input option for database-port to required when parameter was ↵Thomas Pulzer2016-07-063-5/+5
| | | | | | | | | | | | | | | | | | provided. Added casting database port to int for input sanitation in pgsql and oci connections.
| | * Added occ install option for database-port.Thomas Pulzer2016-07-065-7/+26
| | | | | | | | | | | | | | | Extended the database setup to store the database port. Changed the PostgreSQL connection error message for clarification.
| * | Merge pull request #327 from nextcloud/add-php-5.4-5.5Roeland Douma2016-07-061-0/+14
| |\ \ | | | | | | | | Add PHP 5.4 and 5.5 jobs to CI
| | * | Add PHP 5.4 and 5.5 jobs to CIMorris Jobke2016-07-061-0/+14
| | | |
| * | | [tx-robot] updated from transifexNextcloud bot2016-07-06458-1899/+1499
| |/ /
| * | Merge pull request #324 from nextcloud/fix-naming-issue-droneMorris Jobke2016-07-061-11/+12
| |\ \ | | | | | | | | Fix docker image naming issue for CI
| | * | Fix docker image naming issue for CIMorris Jobke2016-07-061-11/+12
| | | | | | | | | | | | | | | | | | | | * wrongly named PHP7 - it is PHP 5.6 * moved integration tests at the very end
| * | | Merge pull request #319 from nextcloud/config-sampleRoeland Douma2016-07-061-1/+1
| |\ \ \ | | |/ / | |/| | Fix config sample text
| | * | Fix config sample textMorris Jobke2016-07-061-1/+1
| |/ /
| * | Merge pull request #311 from Bugsbane/masterJoas Schilling2016-07-052-2/+2
| |\ \ | | | | | | | | Update system tags icon
| | * | Replace tag svg with optimized versionBugsbane2016-07-051-79/+3
| | | | | | | | | | | | Replace the system tags tag icon svg with a version that has been optimized by the optimization script (running scour)
| | * | Clean the svg with inkscapes clean document functionBugsbane2016-07-050-0/+0
| | | |
| | * | Update system tags iconBugsbane2016-07-052-3/+79
| |/ / | | | | | | Change system tags icon from a magnifying glass to a newly created tag icon. Updates both the png and it's original source SVG.
| * | Merge pull request #309 from Faldon/masterBjörn Schießle2016-07-051-1/+1
| |\| | | | | | | Changed the creation of the update notification link
| | * Added escaping html code when building link to documentation.Thomas Pulzer2016-07-051-1/+1
| | |
| | * Changed the creation of the update notification link to generate the js ↵Thomas Pulzer2016-07-041-1/+1
| | | | | | | | | | | | object from concated string.
| * | Merge pull request #306 from nextcloud/sidebar-preview-textMarius Blüm2016-07-045-87/+193
| |\ \ | | | | | | | | Add large sidebar previews for text files
| | * | for text use max-height to trim whitespaceMorris Jobke2016-07-041-1/+1
| | | |
| | * | adjust padding of text previewMorris Jobke2016-07-041-2/+3
| | | |
| | * | Add large sidebar previews for text filesRobin Appelman2016-07-044-10/+83
| | | |
| | * | Factor out handling sidebar previewsRobin Appelman2016-07-043-81/+113
| | | |
| * | | Merge pull request #296 from ayamshanov/add_fb2_mimetypeLukas Reschke2016-07-042-0/+2
| |\ \ \ | | |_|/ | |/| | Add mimetype for fb2-extension
| | * | Add mimetype for fb2-extensionAlexander Yamshanov2016-07-032-0/+2
| | | |
| * | | Merge pull request #305 from Faldon/masterLukas Reschke2016-07-0412-19/+19
| |\ \ \ | | | | | | | | | | Changing name of default logfile
| | * \ \ Merge branch 'master' of https://github.com/nextcloud/serverThomas Pulzer2016-07-042-5/+23
| | |\ \ \ | | | | |/ | | | |/|
| | * | | Changed name of default logfile from owncloud.log to nextcloud.log.Thomas Pulzer2016-07-0412-19/+19
| | | | |
| * | | | Merge pull request #284 from nextcloud/cleanup-after-syncMorris Jobke2016-07-041-4/+2
| |\ \ \ \ | | |_|/ / | |/| | | we don't need to check permissions twice
| | * | | we don't need to check permissions twiceBjoern Schiessle2016-07-041-4/+2
| | | |/ | | |/|
| * | | Merge pull request #303 from nextcloud/collapse-logs-in-github-issue-templateMorris Jobke2016-07-041-1/+22
| |\ \ \ | | | | | | | | | | Collapse logs and lists with HTML5 support of github
| | * | | Fix summaryMorris Jobke2016-07-041-2/+2
| | | | |
| | * | | Collapse logs and lists with HTML5 support of githubJoas Schilling2016-07-041-1/+22
| | | |/ | | |/|
| * | | Merge pull request #299 from nextcloud/master-use-parameterized-queryMorris Jobke2016-07-041-4/+1
| |\ \ \ | | |/ / | |/| | [master] Use paramterized parameter for \OC\SystemTag\SystemTagManager
| | * | [master] Use paramterized parameter for \OC\SystemTag\SystemTagManagerLukas Reschke2016-07-031-4/+1
| | |/ | | | | | | | | | $nameSearchPattern was passed in and directly appended to the SQL query. Luckily the code path isn't reached anywhere in Nextcloud or the included apps.
| * | Merge pull request #290 from nextcloud/update-transifex-linkMorris Jobke2016-07-041-1/+1
| |\ \ | | |/ | |/| We have our own Transifex org now ;)
| | * We have our own Transifex org now ;)Marius Blüm2016-07-021-1/+1
| |/
| * Merge pull request #275 from nextcloud/master-sync-upstreamBjörn Schießle2016-07-01202-227/+3213
| |\ | | | | | | [Master] Sync upstream
| | * Merge remote-tracking branch 'upstream/master' into master-sync-upstreamLukas Reschke2016-07-01202-227/+3213
| | |\
| * | \ Merge pull request #281 from nextcloud/update-3rdparty-masterBjörn Schießle2016-07-011-0/+0
| |\ \ \ | | | | | | | | | | update to 3rdparty master
| | * | | update to 3rdparty masterMorris Jobke2016-07-011-0/+0
| | |/ /
| * | | Merge pull request #278 from nextcloud/master-traversal-directory-jsBjörn Schießle2016-07-012-2/+15
| |\ \ \ | | |/ / | |/| | Do not allow directory traversal using "../"
| | * | Match on 405Lukas Reschke2016-07-012-1/+6
| | | |
| | * | Match for /../Lukas Reschke2016-07-012-1/+5
| | | |
| | * | Do not allow directory traversal using "../"Lukas Reschke2016-07-012-1/+5
| |/ / | | | | | | | | | | | | | | | | | | | | | We should not allow directory traversals using "../" here. To test access the following URL once with and then without this patch: http://localhost/server/index.php/apps/files/?dir=../../This+Should+Not+Be+Here
| * | Merge pull request #255 from nextcloud/dav-permission-checkBjörn Schießle2016-06-304-3/+96
| |\ \ | | | | | | | | add some additonal permission checks to the webdav backend
| | * | fix error messageBjoern Schiessle2016-06-301-1/+1
| | | |
| | * | Fix testsLukas Reschke2016-06-301-0/+20
| | | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-13 07:58:28 +0000