summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #2178 from nextcloud/federation_sharing_changesMorris Jobke2016-11-182-2/+2
|\ | | | | don't add server automatically to trusted server
| * don't add server automatically to trusted serverBjoern Schiessle2016-11-172-2/+2
| | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | Merge pull request #2136 from nextcloud/sharing-layoutJan-Christoph Borchardt2016-11-189-33/+47
|\ \ | | | | | | Sharing layout fixes
| * | use copy icon for local link rather than link icon to prevent confusion with ↵Jan-Christoph Borchardt2016-11-173-5/+5
| | | | | | | | | | | | | | | | | | sharing Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * | resize and pixel-perfectly align copy iconJan-Christoph Borchardt2016-11-172-5/+8
| | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * | fix spacing in sidebar tabsJan-Christoph Borchardt2016-11-171-1/+1
| | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * | properly align input box items in share tab viewJan-Christoph Borchardt2016-11-171-9/+14
| | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * | fix layout of sharing listJan-Christoph Borchardt2016-11-173-13/+20
| | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * | remove Unshare icon in listJan-Christoph Borchardt2016-11-171-1/+0
| | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | Merge pull request #2177 from nextcloud/appmanager-getapppathMorris Jobke2016-11-174-0/+67
|\ \ \ | | | | | | | | Expose getAppPath to public API
| * | | Expose getAppPath to public APIJulius Haertl2016-11-174-0/+67
| | |/ | |/| | | | | | | Signed-off-by: Julius Haertl <jus@bitgrid.net>
* | | Merge pull request #2188 from nextcloud/remove-settings-pane-in-apps-managementMorris Jobke2016-11-171-5/+0
|\ \ \ | | | | | | | | Remove settings pane in app management
| * | | Remove settings pane in app managementMorris Jobke2016-11-171-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * experimental apps where removed with 32cf661215fb3926789054a3953b465fc2665330 (#1940) * fixes #2183 Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | Merge pull request #2187 from nextcloud/select2-adjustmentsMorris Jobke2016-11-171-1/+13
|\ \ \ \ | | | | | | | | | | Select2 adjustments: ellipsize, and adjust height
| * | | | select2: show cursor pointer on hovering entriesJan-Christoph Borchardt2016-11-171-0/+9
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * | | | select2: make sure dropdown always shows a last half entry to hint at moreJan-Christoph Borchardt2016-11-171-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * | | | select2: ellipsize long namesJan-Christoph Borchardt2016-11-171-0/+3
| | |_|/ | |/| | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | | Merge pull request #2176 from nextcloud/share-cache-root-infoMorris Jobke2016-11-174-3/+37
|\ \ \ \ | | | | | | | | | | reuse the known rootinfo in the shared cache when possible
| * | | | reuse the known rootinfo in the shared cache when possibleRobin Appelman2016-11-174-3/+37
| | |_|/ | |/| | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | Merge pull request #2173 from nextcloud/bugfix/2171/birthday-12-31-too-youngRobin Appelman2016-11-172-1/+6
|\ \ \ \ | | | | | | | | | | BirthdayCalendar: fix issue with birthyear to high when birthday on Dec 31st
| * | | | BirthdayCalendar: fix issue with birthyear to high when birthday on Dec 31stGeorg Ehrke2016-11-172-1/+6
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* | | | | Merge pull request #2163 from nextcloud/app-password-scope-warngingsMorris Jobke2016-11-172-5/+3
|\ \ \ \ \ | |_|_|_|/ |/| | | | fix warnings when updating app password
| * | | | fix warnings when updating app passwordRobin Appelman2016-11-162-5/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | Merge pull request #2167 from nextcloud/mountmanager-lockdownMorris Jobke2016-11-171-2/+2
|\ \ \ \ \ | |_|_|_|/ |/| | | | ensure we setup the mount manager when in lockdown
| * | | | ensure we setup the mount manager when in lockdownRobin Appelman2016-11-161-2/+2
| |/ / / | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | Merge pull request #2153 from nextcloud/version-hintMorris Jobke2016-11-171-4/+9
|\ \ \ \ | | | | | | | | | | add explanatory text of what to do on app version error
| * | | | Show all in one messageJoas Schilling2016-11-161-4/+9
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | add explanatory text of what to do on app version errorJan-Christoph Borchardt2016-11-161-2/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | | | Merge pull request #2124 from nextcloud/oc_26591Lukas Reschke2016-11-171-2/+7
|\ \ \ \ \ | | | | | | | | | | | | Cache js, css and woff files for a week
| * | | | | Cache js, css and woff files for a week (#26591)Jörn Friedrich Dreyer2016-11-141-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | increases the cache duration for css and js files from 2 hours to half a year. Should they change the versionhash changes as well and a new file is fetched. Half a year should be long enough for oc updates. Also allows caching woff files for 7 days. Currently, there is no versionhash available, but pressing F5 will also refresh the woff files.
* | | | | | Merge pull request #2175 from nextcloud/token-invalidate-debugChristoph Wurst2016-11-171-2/+2
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | use lower loglevel for token cleanup messages
| * | | | | use lower loglevel for token cleanup messagesRobin Appelman2016-11-171-2/+2
|/ / / / / | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | Merge pull request #2170 from nextcloud/ocs_person_to_controllerJoas Schilling2016-11-175-57/+248
|\ \ \ \ \ | | | | | | | | | | | | OCS person to controller
| * | | | | Add OCSControllerTestsRoeland Jago Douma2016-11-161-0/+209
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | Move OC\OCS\Person to OCSControllerRoeland Jago Douma2016-11-164-57/+39
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | Merge pull request #2174 from nextcloud/icons-audio-video-offJoas Schilling2016-11-177-2/+42
|\ \ \ \ \ \ | | | | | | | | | | | | | | add icons for audio mute and video off
| * | | | | | add icons for audio mute and video offJan-Christoph Borchardt2016-11-177-2/+42
|/ / / / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | | | | Merge pull request #2164 from nextcloud/token-login-wanringLukas Reschke2016-11-171-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | fix warning with token login
| * | | | | | fix warning with token loginRobin Appelman2016-11-161-1/+1
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | | [tx-robot] updated from transifexNextcloud bot2016-11-17118-460/+832
| | | | | |
* | | | | | Merge pull request #2122 from nextcloud/downstream-26520Morris Jobke2016-11-173-7/+11
|\ \ \ \ \ \ | | | | | | | | | | | | | | Hack to prevent warning for read-only wrapper in public links
| * | | | | | only use one kind of hack for the storage wrappers of the sharing codeMorris Jobke2016-11-162-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | | | Hack to prevent warning for read-only wrapper in public linksVincent Petry2016-11-162-6/+7
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Storage wrappers should normally always be registered inside a presetup hook. However in the public link scenario this is not possible and there is currently no good alternative with the current architecture. Instead of logging a warning every time, this fix prevents the warning to be shown but also adds a FIXME in the code for the future. This is ok because this app is already using private/internal APIs at the moment and should be reworked properly in the future.
* | | | | | Merge pull request #2141 from nextcloud/icon-backgroundRoeland Jago Douma2016-11-175-7/+31
|\ \ \ \ \ \ | | | | | | | | | | | | | | add dark background fade to icons to make them visible on light backgrounds
| * | | | | | add dark background fade to icons to make them visible on light backgroundsJan-Christoph Borchardt2016-11-155-7/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | | | | | Merge pull request #2151 from nextcloud/theming-fixesMorris Jobke2016-11-162-30/+53
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | theming: move reset button into field and only show when focused
| * | | | | | | theming: move reset button into field and only show when focusedJan-Christoph Borchardt2016-11-162-30/+53
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | | | | | Merge pull request #2131 from nextcloud/fix-tabs-in-translationRoeland Jago Douma2016-11-161-6/+10
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | convert text to single line so tabs in translation issue is fixed
| * | | | | | No HTML in stringRoeland Jago Douma2016-11-161-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | | convert text to single line so tabs in translation issue is fixedJan-Christoph Borchardt2016-11-161-6/+1
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-10 09:54:00 +0000