wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
41672 commits 157 branches 562 tags 714 MiB
Commit graph

4387 commits

Author SHA1 Message Date
Roeland Jago Douma
e8acf448eb
Merge pull request #6651 from nextcloud/remote-cloud-client 
Add api clients for talking to remote clouds
 2017-12-11 15:28:39 +01:00
Roeland Jago Douma
c1fcd6fc98
Merge pull request #7324 from nextcloud/no-sorters-no-instances 
don't create sorter instances when none was requested
 2017-12-11 15:27:44 +01:00
Morris Jobke
7c39711798
Merge pull request #7427 from nextcloud/fix-white-color-in-emails 
Fix email buttons for white theme
 2017-12-11 15:16:28 +01:00
Morris Jobke
cce4c285db
Fix email buttons for white theme 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-12-11 14:33:54 +01:00
Morris Jobke
ed7beb929e
Merge pull request #6876 from nextcloud/always_img_avatar 
Always generate avatar
 2017-12-08 23:58:17 +01:00
Morris Jobke
79ed0d105d
Merge pull request #7426 from nextcloud/Abijeet-master 
Allows adding of hex color to the theme-color
 2017-12-08 23:49:52 +01:00
Robin Appelman
5ce69e7c42
Add some more tests for ocs remote api 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-12-08 16:37:14 +01:00
Robin Appelman
f1eb55fad7
refuse to use http if we know a remote has https 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-12-08 16:37:14 +01:00
Morris Jobke
6aac1ffa33
Merge pull request #7115 from nextcloud/fix-flow 
Fix flow
 2017-12-08 16:01:57 +01:00
Bjoern Schiessle
555fe7047f
fix tests 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-12-08 13:29:33 +01:00
Abijeet
81f34e224c
Allows adding of hex color to the theme-color 
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>
 2017-12-08 10:42:41 +01:00
Bjoern Schiessle
8b734347b1
use formal version of German if default_language is set to 'de_DE' 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-11-30 17:29:08 +01:00
Roeland Jago Douma
8e8fe6b8eb
Fix tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-11-29 14:23:15 +01:00
Joas Schilling
2a01c0f3f6
Fix current access list test and add one for $currentAccess === false 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-11-28 17:17:34 +01:00
Arthur Schiwon
96bc03a03a
don't create sorter instances when none was requested 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-11-28 13:30:51 +01:00
Morris Jobke
3e1860e3d6
Merge pull request #7305 from nextcloud/log-level-for-log-extending 
Pass log level to log reporters
 2017-11-27 17:49:46 +01:00
Morris Jobke
132764bff5
Pass log level to log reporters 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-11-27 16:46:47 +01:00
Morris Jobke
4a63727ed9
Merge pull request #7210 from nextcloud/pg10 
add postgresql 10 compatibility to dbal
 2017-11-27 16:40:58 +01:00
Lukas Reschke
fb1a92b07d
Merge pull request #7295 from nextcloud/remove-unused-method 
Remove unused mimetype detection method in OC_Image
 2017-11-27 11:55:20 +01:00
Lukas Reschke
8ccb486876
Merge pull request #7264 from nextcloud/cache-fetched-apps 
Cache fetched apps in update check
 2017-11-27 11:48:59 +01:00
Lukas Reschke
9ac878b6cb
Adjust tests for added lastCheck time 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-11-27 09:25:03 +01:00
Morris Jobke
dbb034f903
Remove unused mimetype detection method in OC_Image 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-11-27 07:46:32 +01:00
Morris Jobke
df61d43529
Make isUpdateAvailable non-static 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-11-25 12:01:02 +01:00
Morris Jobke
0e2f00ec59
Get the Installer via DI 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-11-25 12:00:57 +01:00
Morris Jobke
be4e921306
Use basename() instead of self implementation 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-11-23 12:35:47 +01:00
Robin Appelman
da3004b8f5
add postgresql10 compatibility to dbal 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-11-22 17:57:17 +01:00
Roeland Jago Douma
6bbda28881
Fix tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-11-17 20:41:58 +01:00
Morris Jobke
f32fbbca2e
Merge pull request #6840 from nextcloud/feature/5282/calendar_api 
Calendar API for apps
 2017-11-16 21:10:35 +01:00
Bjoern Schiessle
a923e755e6
check if the user still exists before we try to cleanup the previews 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-11-14 20:26:18 +01:00
Jan-Christoph Borchardt
381967f35e
Merge pull request #7013 from nextcloud/forgot-password 
Directly show "Forgot password?" link, fix #6808
 2017-11-14 15:32:27 +01:00
Morris Jobke
16549ae5fb
Merge pull request #7166 from nextcloud/enhancement/crash-report-context 
Pass the exception context to the crash reporter
 2017-11-14 15:07:33 +01:00
Christoph Wurst
ad757805ca Pass the exception context to the crash reporter 
This should allow better reports as often the app id is passed
as context. While this is not used right now, I'd like to have this
for NC13 as adding it later will break the interface for existing apps

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2017-11-14 14:28:04 +01:00
Morris Jobke
ab0a3fbbbc
Merge pull request #7061 from kyrofa/bugfix/6028/app_path_realpath 
{J,CS}SResourceLocator: account for symlinks in app path
 2017-11-14 13:58:02 +01:00
Christoph Wurst
4c5593998a Add a mechanism to register crach reporters 
This adds a crash reporter registry, which is meant for third party apps
to hook into the error logging/reporting chain. This way, external tools
like Sentry can be used to track and aggregate system crashes.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2017-11-14 12:20:05 +01:00
Georg Ehrke
556b2a2b6f
implement CalendarManager 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2017-11-09 15:14:50 +01:00
Morris Jobke
a0aef6ab1b
Fix welcome text for better grammar in themed instances 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-11-09 09:27:38 +01:00
Mario Danic
c2cd5fc5d3 Fix flow 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2017-11-09 00:29:34 +01:00
Lukas Reschke
989a8a3668
Merge pull request #6220 from nextcloud/cached-mount-info-filepath 
Allow getting the filepath when getting cached mounts by fileid
 2017-11-09 00:04:25 +01:00
Kyle Fazzari
9c24b7be2d
tests: change helper scope 
This seems to be the only way to have the same helpers used between
tests in a manner that works for both standalone phpunit and
autotest.sh.

Signed-off-by: Kyle Fazzari <kyrofa@ubuntu.com>
 2017-11-08 12:44:54 -08:00
Julius Härtl
cd1bfea8c4
Theming: theme flow redirection page 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-11-08 14:56:32 +01:00
John Molakvoæ (skjnldsv)
15762c103b
Fix acceptance test 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-11-08 09:19:33 +01:00
Kyle Fazzari
06ba1a8a02
JSResourceLocator: account for symlinks in app path 
Signed-off-by: Kyle Fazzari <kyrofa@ubuntu.com>
 2017-11-07 14:54:21 -08:00
Morris Jobke
6c29ce4e02
Merge pull request #6402 from nextcloud/dav-email-customization 
Enhance calendar invitation emails
 2017-11-06 15:14:49 +01:00
Georg Ehrke
e111da777a
Make L10N->l provide weekdayName 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2017-11-03 11:20:04 +01:00
Arthur Schiwon
e2805f02aa
Merge branch 'master' into autocomplete-gui 2017-11-01 15:37:29 +01:00
Arthur Schiwon
2b4b3b1986
adjust jsunit tests 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-11-01 11:44:01 +01:00
Joas Schilling
3e0789aa94
Merge pull request #6958 from nextcloud/improved-mimetype-detection-for-object-storage 
Improve mimetype detection for object storages
 2017-11-01 11:04:15 +01:00
blizzz
22ef95ca69
Merge pull request #7022 from nextcloud/acceptance-tests-7.1 
bump acceptance test suite to use php 7.1 image
 2017-10-31 16:35:38 +01:00
Arthur Schiwon
25aad121e6
meanwhile we can have exact matches. also show those. 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-10-31 14:58:48 +01:00
Joas Schilling
6ddda3d7d4
Merge pull request #6952 from nextcloud/correctly-search-for-results 
Correctly search for existing collaboration results
 2017-10-31 14:49:01 +01:00