summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #7485 from nextcloud/fix_7001Roeland Jago Douma2017-12-141-1/+1
|\ | | | | Also cache invalid DiscoveryService response
| * Also cache invalid DiscoveryService responseRoeland Jago Douma2017-12-131-1/+1
| | | | | | | | | | | | | | | | * Cache it for a day so we will retry eventually * Cache the status.php response as well so we will try it once a day as well Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Fixes hex2bin() in LDAPMorris Jobke2017-12-131-5/+7
| | | | | | | | | | | | Untangles the two if-else clauses into a more readable format. Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Show tha copy share link button properly inlineMorris Jobke2017-12-131-2/+0
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | The user displayNameResolver is specific to users, not the comments appArthur Schiwon2017-12-121-11/+0
|/ | | | | | | Other apps like spreed rely on it, and only can resolver per type can be registered anyhow. Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* fix dav unit testsBjoern Schiessle2017-12-121-3/+3
| | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* Fix unit tests for CalendarManagerMorris Jobke2017-12-122-3/+14
| | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* Merge pull request #6884 from ↵Morris Jobke2017-12-1226-35/+1204
|\ | | | | | | | | nextcloud/feature/3003/opt_out_of_birthday_calendar Opt out of birthday calendar
| * generate birthday calendars in a background job after admin enabled themGeorg Ehrke2017-11-117-4/+277
| | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
| * create a user's birthday calendar right after they requested itGeorg Ehrke2017-11-113-4/+30
| | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
| * update autoloadersGeorg Ehrke2017-11-112-0/+4
| | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
| * respect admin / user choice about birthday calendars in corresponding hooksGeorg Ehrke2017-11-112-7/+160
| | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
| * disallow users to create calendars with reserved namesGeorg Ehrke2017-11-112-0/+96
| | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
| * adapt occ 'dav:sync-birthday-calendar commandGeorg Ehrke2017-11-111-1/+33
| | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
| * add CalDAV interface that allows users to re-enable their birthday calendarGeorg Ehrke2017-11-113-0/+304
| | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
| * remember when a user deleted their contact birthdays calendarGeorg Ehrke2017-11-108-27/+104
| | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
| * Add admin checkbox to disable birthday calendarsGeorg Ehrke2017-11-096-0/+204
| | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* | Merge pull request #6637 from nextcloud/contactsstore_public_apiRoeland Jago Douma2017-12-113-0/+20
|\ \ | | | | | | Make ContactsStore a public API
| * | Make ContactsStore a public APITobia De Koninck2017-12-113-0/+20
| | | | | | | | | | | | Signed-off-by: Tobia De Koninck <tobia@ledfan.be>
* | | Catch the errors related to untrusted self signed certificates for federationRoeland Jago Douma2017-12-114-2/+88
|/ / | | | | | | | | | | * Added tests Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #6590 from nextcloud/dav-create-activities-for-publishingMorris Jobke2017-12-115-0/+57
|\ \ | | | | | | Create activities for (un)publishing calendar events
| * | Fix testsRoeland Jago Douma2017-12-111-0/+2
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Update wordingMorris Jobke2017-12-111-2/+2
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | Create activities for (un)publishing calendar eventsThomas Citharel2017-12-115-0/+55
| | | | | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr>
* | | Merge pull request #6079 from nextcloud/fix-antivirusblizzz2017-12-111-6/+29
|\ \ \ | | | | | | | | Parse Sabre Exception in OC.Files.Client and file-upload
| * | | Parse Sabre Exception in OC.Files.Client and file-uploadVincent Petry2017-11-131-6/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In case of error, instead of a generic error message, an upload will display whichever message is returned in the Sabre Exception, if applicable. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | | | updated autoloaders for davGeorg Ehrke2017-12-112-0/+4
| | | | | | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* | | | Principal search: Take sharing settings into accountGeorg Ehrke2017-12-116-35/+275
| | | | | | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* | | | exclude shared calendars from freeBusyGeorg Ehrke2017-12-111-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* | | | Fix functions to search for principals in the backend.Christoph Seitz2017-12-114-6/+157
| |/ / |/| | | | | | | | | | | | | | | | | Add a "searchPrincipals" function to the NC principal backend. Fix the "findByUri" function to respect the prefixPath. Signed-off-by: Christoph Seitz <christoph.seitz@posteo.de>
* | | 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 #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 #6682 from nextcloud/dav-mimetype-fallbackRoeland Jago Douma2017-12-111-1/+12
|\ \ \ \ \ | | | | | | | | | | | | 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-281-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the mimetype Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | | Merge pull request #7427 from nextcloud/fix-white-color-in-emailsMorris Jobke2017-12-113-13/+21
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix email buttons for white theme
| * | | | | | Fix email buttons for white themeMorris Jobke2017-12-113-13/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | | | [tx-robot] updated from transifexNextcloud bot2017-12-118-8/+92
| | | | | | |
* | | | | | | [tx-robot] updated from transifexNextcloud bot2017-12-1016-58/+448
| | | | | | |
* | | | | | | [tx-robot] updated from transifexNextcloud bot2017-12-094-2/+116
| | | | | | |
* | | | | | | Merge pull request #7426 from nextcloud/Abijeet-masterMorris Jobke2017-12-082-2/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Allows adding of hex color to the theme-color
| * | | | | | | Allows adding of hex color to the theme-colorAbijeet2017-12-082-2/+6
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>