summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2017-07-21350-1080/+460
|
* Merge pull request #5629 from nextcloud/add-recovery-key-on-public-uploadBjörn Schießle2017-07-201-2/+21
|\ | | | | Add recovery key on public upload
| * make sure that we always have a ownerBjoern Schiessle2017-07-201-4/+17
| | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * Add recovery key on public uploadBjoern Schiessle2017-07-201-2/+8
| | | | | | | | | | | | | | | | In order to decide if a recovery key needs to be added we always need to check the files owner settings and not the settings of the currently logged in user. Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | Merge pull request #5801 from nextcloud/activity-description-copy-pasteMorris Jobke2017-07-202-2/+2
|\ \ | | | | | | Fix copy and paste error on activity descriptions
| * | Fix copy and paste error on activity descriptionsJoas Schilling2017-07-202-2/+2
| |/ | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #5790 from nextcloud/fix-documentationMorris Jobke2017-07-201-5/+1
|\ \ | | | | | | Fix config.sample.php documentation
| * | Fix config.sample.php documentationMorris Jobke2017-07-191-5/+1
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #5800 from ↵Morris Jobke2017-07-204-17/+110
|\ \ \ | |_|/ |/| | | | | | | | nextcloud/enable-acceptance-tests-again-on-drone-0.7 Enable acceptance tests again on Drone 0.7
| * | Enable acceptance tests again on Drone 0.7Daniel Calviño Sánchez2017-07-201-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Running the acceptance tests on Drone relied on the pod-style networking used by services (service containers were available at 127.0.0.1 from the build containers). However, in Drone 0.7 service and build containers must be accessed from each other using their domain name instead. Thus, acceptance tests had to be disabled on Drone. Now that the acceptance test system supports setting a different domain for the Selenium server and for the Nextcloud test server the acceptance tests can be enabled again on Drone. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | Add option to acceptance test runner to set the Selenium serverDaniel Calviño Sánchez2017-07-201-1/+40
| | | | | | | | | | | | | | | | | | | | | | | | By default "127.0.0.1:4444" is used, so nothing needs to be set when the acceptance tests and the Selenium server share the same network (like when called by "run.sh"). Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | Add option to acceptance test runner to set the Nextcloud server domainDaniel Calviño Sánchez2017-07-202-1/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By default "127.0.0.1" is used, so nothing needs to be set when the Selenium server and the Nextcloud test server share the same network (like when called by "run.sh"). Besides passing the domain to the acceptance tests the Nextcloud test server configuration must be modified to see the given domain as a trusted domain; otherwise the access would be forbidden. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | Make possible to configure the domain for the Nextcloud test serverDaniel Calviño Sánchez2017-07-201-6/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The NextcloudTestServerLocalHelper started the PHP built-in web server for the Nextcloud test server at 127.0.0.1; as the Selenium server has to access the Nextcloud test server they were forced to share the same network. Now, the domain at which the PHP built-in web server is started can be specified when the NextcloudTestServerLocalHelper is created, which removes the need of sharing the same network, as the Selenium server now can access the Nextcloud test server at an arbitrary domain. However, by default "127.0.0.1" is still used if no domain is given. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | | Merge pull request #5794 from nextcloud/update-php7.1-containerRoeland Jago Douma2017-07-201-6/+6
|\ \ \ | | | | | | | | Update PHP 7.1 containers
| * | | Update PHP 7.1 containersLukas Reschke2017-07-191-6/+6
| |/ / | | | | | | | | | | | | | | | Previously this container used a very old CentOS version. It has been migrated to Debian Jessie now using the deb.sury.org repositories. Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* / / [tx-robot] updated from transifexNextcloud bot2017-07-2042-0/+144
|/ /
* | Merge pull request #5734 from nextcloud/only-readable-chars-in-share-tokensJoas Schilling2017-07-194-11/+5
|\ \ | | | | | | Only use readable chars in Share Tokens
| * | Only use readable chars in Share TokensJoas Schilling2017-07-184-11/+5
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #5719 from nextcloud/improve-jscombinerMorris Jobke2017-07-193-3/+40
|\ \ \ | | | | | | | | Properly handle if the deps file if for some reason empty
| * | | Properly handle if the deps file if for some reason emptyMorris Jobke2017-07-193-3/+40
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | Merge pull request #5776 from nextcloud/install-phanRoeland Jago Douma2017-07-1922-25/+2390
|\ \ \ \ | |_|_|/ |/| | | Run phan over code base
| * | | Add workaround for https://github.com/etsy/phan/issues/1033Lukas Reschke2017-07-193-1/+9
| | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | Update third-party refLukas Reschke2017-07-191-0/+0
| | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | Remove unused functionsLukas Reschke2017-07-192-17/+0
| | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | Install phan manuallyLukas Reschke2017-07-192-2/+3
| | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | Use new Drone imageLukas Reschke2017-07-191-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | Exclude phan from scrutinizerLukas Reschke2017-07-191-0/+5
| | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | Run phan over code baseLukas Reschke2017-07-1918-8/+2376
| | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | Merge pull request #5781 from nextcloud/fix_5780Morris Jobke2017-07-192-1/+91
|\ \ \ \ | | | | | | | | | | Allow overwriting of IOS theming values
| * | | | Add Android and iOS URLs to theming appMorris Jobke2017-07-192-0/+71
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | Allow overwriting of IOS theming valuesRoeland Jago Douma2017-07-191-1/+20
| |/ / / | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Merge pull request #5778 from nextcloud/changelogMorris Jobke2017-07-191-18/+2
|\ \ \ \ | |/ / / |/| | | Add link to real changelog
| * | | Add link to real changelogMorris Jobke2017-07-191-18/+2
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | [tx-robot] updated from transifexNextcloud bot2017-07-19248-784/+800
| | | |
* | | | Merge pull request #5744 from 1manprojects/patch-1Morris Jobke2017-07-181-1/+1
|\ \ \ \ | | | | | | | | | | Removed cast to integer in getSize
| * | | | changed direct cast to integer to numerical value1 Man Projects2017-07-171-1/+1
| | | | |
| * | | | Removed cast to integer in getSize1 Man Projects2017-07-151-1/+1
| | | | | | | | | | | | | | | Fixes - Wrong or no sizes of files/folders #5031
* | | | | Merge pull request #5775 from nextcloud/fix-postgresMorris Jobke2017-07-181-3/+3
|\ \ \ \ \ | | | | | | | | | | | | Disable postgres temporarily
| * | | | | Disable postgres temporarilyMorris Jobke2017-07-181-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | Merge pull request #5764 from nextcloud/update-3rdpartyMorris Jobke2017-07-181-0/+0
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Update 3rdparty for "Fix infinite propfinds reporting files as direct…
| * | | | | Update 3rdparty for "Fix infinite propfinds reporting files as directories"Joas Schilling2017-07-181-0/+0
| |/ / / / | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | Merge pull request #5770 from nextcloud/path-repair-steps-loopRoeland Jago Douma2017-07-181-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Fix invalid path repair step not getting all invalid entries
| * | | | | Fix invalid path repair step not getting all invalid entriesRobin Appelman2017-07-181-1/+1
| |/ / / / | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | Merge pull request #5733 from nextcloud/app-menu-ellipsisMorris Jobke2017-07-181-0/+1
|\ \ \ \ \ | | | | | | | | | | | | Long app names will have ellipsis in the app menu popover.
| * | | | | Long app names will have ellipsis in the app menu popover.Marin Treselj2017-07-141-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #5021 Signed-off-by: Marin Treselj <marin@pixelipo.com>
* | | | | | Merge pull request #5709 from nextcloud/null-user-existJoas Schilling2017-07-181-0/+3
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | null users dont exist
| * | | | | null users dont existRobin Appelman2017-07-131-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | | Merge pull request #5739 from nextcloud/comradekingu-patch-4Roeland Jago Douma2017-07-181-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Spelling: Bigversal and LDAP
| * | | | | | : Bigversal and LDAPAllan Nordhøy2017-07-141-2/+2
| | | | | | |
* | | | | | | Merge pull request #5745 from paulijar/masterMorris Jobke2017-07-182-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix emitting of legacy hook post_unshare
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-28 15:03:57 +0000