summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Don't show users which e-mail address match if they belong to a group we may ↵Tobia De Koninck2017-12-151-1/+29
| | | | | | share with Signed-off-by: Tobia De Koninck <tobia@ledfan.be>
* Merge pull request #7527 from ↵Morris Jobke2017-12-153-1/+6
|\ | | | | | | | | nextcloud/fix-drag-shadow-not-visible-when-dragging-a-file-on-a-narrow-screen Fix drag shadow not visible when dragging a file on a narrow screen
| * Fix drag shadow not visible when dragging a file on a narrow screenDaniel Calviño Sánchez2017-12-143-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a file from the file list is dragged a drag shadow (a copy of the file row that follows the cursor position) is created. The drag shadow element is created as a direct child of the body element, so it needs a higher "z-index" than the one used for the file list to be visible. In narrow screens the "#app-content" uses a "z-index" of 1000 in order to be visible over the "#navigation-bar" when they overlap, so the "z-index" of the drag shadow must be at least 1000 to be visible over the file list. Instead of updating the hardcoded "z-index" it was removed and replaced by CSS rules for ".dragshadow" elements to ease theming. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | Merge pull request #7523 from nextcloud/check_empty_content_lengthMorris Jobke2017-12-151-0/+1
|\ \ | | | | | | Also check for empty content length
| * | Also check for empty content lenthRoeland Jago Douma2017-12-141-0/+1
|/ / | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #7504 from nextcloud/shorter-css-prefixesMorris Jobke2017-12-142-7/+7
|\ \ | | | | | | Reduce length of md5 in scss caching
| * | Test fixes 2John Molakvoæ (skjnldsv)2017-12-141-3/+3
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | Test fixesJohn Molakvoæ (skjnldsv)2017-12-141-2/+2
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | Reduce length of md5 in scss cachingJohn Molakvoæ (skjnldsv)2017-12-141-2/+2
|/ / | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | Merge pull request #7506 from nextcloud/fix-app-cacheMorris Jobke2017-12-142-2/+3
|\ \ | | | | | | Use cached app list
| * | Use cached app listMorris Jobke2017-12-142-2/+3
| | | | | | | | | | | | | | | | | | Followup to #7264 Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #7502 from nextcloud/authorative_classmaps_for_appsRoeland Jago Douma2017-12-1438-209/+38
|\ \ \ | |/ / |/| | Use proper authorative-autoloader for app autoloaders
| * | Use proper authorative-autoloader for app autoloadersRoeland Jago Douma2017-12-1438-209/+38
|/ / | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #7485 from nextcloud/fix_7001Roeland Jago Douma2017-12-142-3/+2
|\ \ | | | | | | Also cache invalid DiscoveryService response
| * | Also cache invalid DiscoveryService responseRoeland Jago Douma2017-12-132-3/+2
| |/ | | | | | | | | | | | | | | * 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>
* | Merge pull request #7480 from nextcloud/fix_7454Morris Jobke2017-12-134-10/+73
|\ \ | | | | | | Check for FreeType functions required for avatars
| * | Add testsRoeland Jago Douma2017-12-132-10/+55
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Add warning regarding freetype supportRoeland Jago Douma2017-12-132-0/+18
| |/ | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #7475 from nextcloud/13beta3v13.0.0beta3Morris Jobke2017-12-131-2/+2
|\ \ | | | | | | 13.0.0 beta3
| * | 13.0.0 beta3Morris Jobke2017-12-131-2/+2
|/ / | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #7479 from nextcloud/fix-7400Morris Jobke2017-12-131-5/+7
|\ \ | | | | | | Fixes bin2hex() in LDAP
| * | 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>
* | Merge pull request #7476 from nextcloud/fix-copy-share-link-designJohn Molakvoæ2017-12-131-2/+0
|\ \ | | | | | | Show tha copy share link button properly inline
| * | Show tha copy share link button properly inlineMorris Jobke2017-12-131-2/+0
|/ / | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #7470 from nextcloud/guest-flex-fixRoeland Jago Douma2017-12-122-4/+2
|\ \ | | | | | | Fixed firefox guest header height
| * | Removed unwanted and unused spacerJohn Molakvoæ (skjnldsv)2017-12-122-3/+1
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | Fixed firefox guest header heightJohn Molakvoæ (skjnldsv)2017-12-121-1/+1
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | Merge pull request #7472 from ↵Roeland Jago Douma2017-12-122-12/+15
|\ \ \ | |_|/ |/| | | | | | | | nextcloud/move-comment-user-displaynameresolver-to-server The user displayNameResolver is specific to users, not the comments app
| * | The user displayNameResolver is specific to users, not the comments appArthur Schiwon2017-12-122-12/+15
|/ / | | | | | | | | | | | | 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>
* | Merge pull request #7466 from nextcloud/fix-php7.2-session-initMorris Jobke2017-12-121-3/+4
|\ \ | |/ |/| Fix error log on PHP 7.2
| * Fix error log on PHP 7.2Morris Jobke2017-12-121-3/+4
| | | | | | | | | | | | Fixes following error in the logs: "ini_set(): A session is active. You cannot change the session module's ini settings at this time" Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #7465 from nextcloud/filename-typoMorris Jobke2017-12-123-2/+2
|\ \ | | | | | | Fix filename typo
| * | Fix filename typoRobin Appelman2017-12-123-2/+2
| |/ | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | Merge pull request #7462 from nextcloud/update-user-agent-regexBjörn Schießle2017-12-123-4/+18
|\ \ | |/ |/| allow 'Nextcloud' in the user agent string of Android
| * fix dav unit testsBjoern Schiessle2017-12-121-3/+3
| | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * allow 'Nextcloud' in the user agent string of AndroidBjoern Schiessle2017-12-122-1/+15
| | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | Merge pull request #7425 from nextcloud/13.0.0beta2-prepv13.0.0beta2Morris Jobke2017-12-121-2/+2
|\ \ | | | | | | 13.0.0 beta 2
| * | 13.0.0 beta 2Morris Jobke2017-12-121-2/+2
| |/ | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #7461 from nextcloud/fix_6821Morris Jobke2017-12-121-2/+2
|\ \ | |/ |/| Set autocomplete on share password input
| * Set autocomplete on share password inputRoeland Jago Douma2017-12-121-2/+2
| | | | | | | | | | | | Fixes #6821 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #6830 from nextcloud/nc13_no_later_72Morris Jobke2017-12-129-21/+31
|\ \ | |/ |/| Nextcloud 13 is not compatible with newer than php 7.2
| * Nextcloud 13 is not compatible with newer than php 7.2Roeland Jago Douma2017-12-129-21/+31
|/ | | | | | | | | | | Just to avoid users from trying this with a to new (untested) php version * Moved the check logic to 1 place * All directly callable scripts just require this on top * exit hard (-1) so we know scripts won't continue * Return status 500 so no sync clients will try fancy stuff Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Merge pull request #7458 from nextcloud/fix-calendar-manager-unit-testsblizzz2017-12-122-3/+14
|\ | | | | Fix unit tests for CalendarManager
| * 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>
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-16 13:13:53 +0000