summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Create activities for (un)publishing calendar eventsThomas Citharel2017-12-115-0/+55
| | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr>
* Merge pull request #7342 from nextcloud/fix_carddav_converterblizzz2017-12-111-2/+5
|\ | | | | CardDAV convertor check should not be to wide
| * CardDAV convertor check should not be to wideRoeland Jago Douma2017-12-111-2/+5
| | | | | | | | | | | | | | | | Case: email is set to null, but the avatar is set. In the old case the email would set $emptyValue but $noImage would still be false. This we would set the empty string as email. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #7449 from nextcloud/fix-setupMorris Jobke2017-12-111-10/+15
|\ \ | | | | | | Fix 500 on setup page
| * | Fix 500 on setup pageMorris Jobke2017-12-111-10/+15
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #7249 from nextcloud/guest-flexMorris Jobke2017-12-111-10/+12
|\ \ \ | | | | | | | | Guest flex instead of absolute
| * | | Fixed topJohn Molakvoæ (skjnldsv)2017-11-231-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | Fixed heigh resizeJohn Molakvoæ (skjnldsv)2017-11-221-2/+3
| | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | Use flex for guest full screen alignmentJohn Molakvoæ (skjnldsv)2017-11-221-8/+9
| | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | Merge pull request #7418 from nextcloud/ldap-fix-cache-retrieved-userMorris Jobke2017-12-113-12/+143
|\ \ \ \ | | | | | | | | | | ensure that users are cached when they are retrieved
| * | | | don't cache user, if no internal user id was retrieved/assignedArthur Schiwon2017-12-072-7/+17
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | | ensure that users are cached when they are retrievedArthur Schiwon2017-12-073-7/+128
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | | Merge pull request #6651 from nextcloud/remote-cloud-clientRoeland Jago Douma2017-12-1129-1/+1706
|\ \ \ \ \ | | | | | | | | | | | | Add api clients for talking to remote clouds
| * | | | | Add some more tests for ocs remote apiRobin Appelman2017-12-085-59/+259
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | | refuse to use http if we know a remote has httpsRobin Appelman2017-12-082-0/+135
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | | validate user responseRobin Appelman2017-12-081-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | | add more typehintsRobin Appelman2017-12-086-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | | Add public api for remote apiRobin Appelman2017-12-0820-9/+623
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | | Some tests for the remote cloud apiRobin Appelman2017-12-087-4/+232
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | | Add api clients for talking to remote cloudsRobin Appelman2017-12-088-0/+505
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | | Merge pull request #6682 from nextcloud/dav-mimetype-fallbackRoeland Jago Douma2017-12-112-10/+29
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fallback to filename based detection if the remote dav server doesn't…
| * | | | | | Fallback to filename based detection if the remote dav server doesn't know ↵Robin Appelman2017-09-282-10/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the mimetype Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | | | Merge pull request #7324 from nextcloud/no-sorters-no-instancesRoeland Jago Douma2017-12-112-46/+106
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | don't create sorter instances when none was requested
| * | | | | | | don't create sorter instances when none was requestedArthur Schiwon2017-11-282-46/+106
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | | | | | Merge pull request #7427 from nextcloud/fix-white-color-in-emailsMorris Jobke2017-12-1111-22/+74
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix email buttons for white theme
| * | | | | | | | Fix email buttons for white themeMorris Jobke2017-12-1111-22/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | | | | Merge pull request #7313 from ↵Morris Jobke2017-12-112-18/+187
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/ensure-that-x-oc-mtime-header-is-an-integer-with-chunked-uploads Ensure that X-OC-MTime header is an integer with chunked uploads
| * | | | | | | | Reject X-OC-MTime header if given as a string with hexadecimal notationDaniel Calviño Sánchez2017-11-282-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In PHP 7.X hexadecimal notation support was removed from "is_numeric", so "sanitizeMtime" directly rejected those values; in PHP 5.X, on the other hand, "sanitizeMtime" returned 0 when a string with hexadecimal notation was given (as it was the behaviour of "intval"). To provide a consistent behaviour between PHP versions, and given that it does not make much sense to send X-OC-MTime in hexadecimal notation, now X-OC-MTime is always rejected if given as a string with hexadecimal notation. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | | | | | | Don't use runInSeparateProcessThomas Müller2017-11-272-7/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Directly calling "header" in the PHPUnit process causes the "Cannot modify header information - headers already sent by" error to be thrown. Instead of running the test in a separate process, which is slower, this commit wraps the call to "header" in a method that can be mocked in the tests. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | | | | | | Add tests for X-OC-MTime header handlingDaniel Calviño Sánchez2017-11-271-0/+133
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit is based on the commits from pull request 28066 (included in 018d45cad97e0) from ownCloud by Artur Neumann and Phil Davis. Unit tests are currently run only on systems that support negative mtimes, so no special handling of negative values was included in the tests to keep the test code more manageable. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | | | | | | Make possible to provide a specific HTTP request object to FileDaniel Calviño Sánchez2017-11-272-12/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will be used in a following commit to test how the X-OC-MTime header is handled. This commit is based on the "make File::put() more testable" commit (included in 018d45cad97e0) from ownCloud by Artur Neumann. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | | | | | | Ensure that X-OC-MTime header is an integer also with chunked uploadsDaniel Calviño Sánchez2017-11-271-6/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit extends the changes introduced in pull request #3793 also to chunked uploads. The "sanitizeMTime" method name is the same used in the equivalent pull request to this one from ownCloud (28066). Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | | | | | | | | Merge pull request #7244 from nextcloud/css-file-suffix-with-apps-versionsMorris Jobke2017-12-111-5/+46
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | Use apps versions to generate suffix when possible
| * | | | | | | | Fix syntax errorMorris Jobke2017-12-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | | | | | Fixed phpdoc and function typeJohn Molakvoæ (skjnldsv)2017-12-111-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | | | | | Fixed md5 generation and added fallback for scss requestsJohn Molakvoæ (skjnldsv)2017-12-111-6/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | | | | | Use apps versions to generate suffix when possibleJohn Molakvoæ (skjnldsv)2017-12-111-5/+14
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | | | | | [tx-robot] updated from transifexNextcloud bot2017-12-1120-162/+466
| | | | | | | |
* | | | | | | | [tx-robot] updated from transifexNextcloud bot2017-12-1034-112/+950
| | | | | | | |
* | | | | | | | [tx-robot] updated from transifexNextcloud bot2017-12-096-12/+344
| | | | | | | |
* | | | | | | | Merge pull request #6876 from nextcloud/always_img_avatarMorris Jobke2017-12-084-39/+241
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Always generate avatar
| * | | | | | | | Better center the letter and use semibold font typeMorris Jobke2017-12-081-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | | | | | Fix testsRoeland Jago Douma2017-11-292-13/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | | | | Since we update the avatar in the sync service remove the generated fileRoeland Jago Douma2017-11-291-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | | | | Sinc we use AppData the regex is not needed anymoreRoeland Jago Douma2017-11-291-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | | | | Move avatar code to Avatar ClassRoeland Jago Douma2017-11-292-169/+190
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | | | | Always generate avatarRoeland Jago Douma2017-11-291-5/+155
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Even if no avatar is set we should just generate the image. This to not duplicate the code on all the clients. And only server images from the avtar endpoint. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | | | | Merge pull request #7426 from nextcloud/Abijeet-masterMorris Jobke2017-12-084-31/+39
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Allows adding of hex color to the theme-color
| * | | | | | | | | Allows adding of hex color to the theme-colorAbijeet2017-12-084-31/+39
| | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #7158. Adds a # on the color if missing. Increased maxlength, added hash:true for jscolor, and adding a # if not present on the change event. Since the input element now allows a hex code, changed values to hexcode. In addition, added a function to get RGB array from hex or rgb values. Calling it in both methods and using it to perform comparison. Also changed the way we were determining whether the jscolor component had loaded. Changed the control to use data-jscolor rather than defining opts in the class. Signed-off-by: Abijeet <abijeetpatro@gmail.com>
* | | | | | | | | Merge pull request #7433 from ↵Morris Jobke2017-12-081-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/fix-constructor-spy-in-unit-test-with-sinon-4.1.3 Fix constructor spy in unit test with Sinon 4.1.3
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-08 05:11:47 +0000