Commit Graph

17305 Commits

Author SHA1 Message Date
Arthur Schiwon 9d95391ff1
adjust tests and apply sorting
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-11-23 13:32:13 +01:00
Arthur Schiwon 4247936dd6
Fix avatars in file rows of incoming shares
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-11-23 13:32:13 +01:00
Arthur Schiwon dcfd7bf7ff
fix avatars in file rows of outgoing shares
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-11-23 13:32:09 +01:00
John Molakvoæ (skjnldsv) 5591ea6e8b Fixed alignment of items in comments
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-23 12:26:22 +01:00
Morris Jobke 106d932e8f
Merge pull request #7137 from nextcloud/shared-jailed-source-root
Use the correct root for shared jail when the source storage is also a jail
2017-11-23 12:03:36 +01:00
Daniel Calviño Sánchez 60a73bab1c Submit comments with Enter and use Shift+Enter for new lines
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-11-23 03:27:16 +01:00
Daniel Calviño Sánchez 4eb9c0142d Fix contacts menu vertical position for comment authors
The contacts menu was being shown as "inline-block", which caused the
top of the menu to be aligned to the top of the author row.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-11-23 02:12:09 +01:00
Nextcloud bot b6a39b7927
[tx-robot] updated from transifex 2017-11-23 01:09:47 +00:00
William Pain beac223fa6 Add HTML5 audio player in public view
Signed-off-by: William Pain <pain.william@gmail.com>
2017-11-22 16:07:17 +01:00
Marin Treselj 7f36c2090a Make close icon fill more space
Signed-off-by: Marin Treselj <marin@pixelipo.com>
2017-11-21 15:33:23 +01:00
Nextcloud bot a8ec62dcc2
[tx-robot] updated from transifex 2017-11-21 01:10:07 +00:00
Bjoern Schiessle 7bc28f14de show e2e folder icon on encrypted folders
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-11-20 21:00:26 +01:00
Daniel Calviño Sánchez 37d8d3d858 Add data attribute to file list rows telling if the file is encrypted
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-11-20 21:00:04 +01:00
Bjoern Schiessle 670ac48eb7 adjust permissions in web view for encrypted folders
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-11-20 18:24:50 +01:00
Björn Schießle f347e2e4a6
Merge pull request #7047 from nextcloud/add-support-for-files-with-no-permissions
Add support for files with no permissions
2017-11-20 16:15:52 +01:00
Nextcloud bot 96b15cec83
[tx-robot] updated from transifex 2017-11-20 01:09:40 +00:00
Nextcloud bot dd5373795f
[tx-robot] updated from transifex 2017-11-19 01:09:52 +00:00
Nextcloud bot 39ec541b23
[tx-robot] updated from transifex 2017-11-18 01:10:43 +00:00
Jan-Christoph Borchardt 059be95d6c
Merge pull request #7163 from nextcloud/force-breaks-on-extremely-long-words-in-comments
Force breaks on extremely long words in comments
2017-11-17 19:02:36 +01:00
Daniel Calviño Sánchez 5d85af79b6 Force breaks on extremely long words
If not broken extremely long words overflow their container.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-11-17 15:10:50 +01:00
Morris Jobke eeb0cfdaf5
Merge pull request #7152 from nextcloud/bugfix/noid/adjust_calendarobject_size_after_applying_class
remove cached size from shared calendar objects
2017-11-17 08:28:34 +01:00
Nextcloud bot 6c2c129fce
[tx-robot] updated from transifex 2017-11-17 01:09:51 +00:00
Morris Jobke 20868e17e8
Merge pull request #7193 from nextcloud/bugfix/noid/invitation-email-refinements
refine invitation email
2017-11-16 21:11:44 +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
Georg Ehrke b073b13d9f
refine invitation email
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-11-16 13:54:19 +01:00
Morris Jobke dd83055198
Merge pull request #7188 from nextcloud/fix-broken-svg-2
Re-optimize places and files icons
2017-11-16 09:34:27 +01:00
Nextcloud bot b2e9cb6a00
[tx-robot] updated from transifex 2017-11-16 01:09:50 +00:00
Marin Treselj 2d069339cc Re-optimize places and files icons
Signed-off-by: Marin Treselj <marin@pixelipo.com>
2017-11-15 14:27:16 +01:00
Morris Jobke 7310c698de
Merge pull request #7173 from nextcloud/bugfix/noid/show_username_in_invitationsemails
Show organizer's name in From field of invitation email
2017-11-15 14:25:45 +01:00
Nextcloud bot c5afb25714
[tx-robot] updated from transifex 2017-11-15 01:09:47 +00:00
Georg Ehrke 072652b2af
show name of organizer in from name of invitation email
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-11-14 21:23:27 +01:00
Morris Jobke a3f86b99e9
Merge pull request #7165 from nextcloud/smb-2.0.3
update icewind/smb to 2.0.3
2017-11-14 17:46:04 +01:00
Jan-Christoph Borchardt 346dbfa1ee
Merge pull request #7130 from nextcloud/fix-broken-svg
Optimize SVG icons
2017-11-14 15:51:09 +01:00
Robin Appelman 418e49d816
update icewind/smb to 2.0.3
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-11-14 14:14:30 +01:00
blizzz a6d8948937
Merge pull request #5749 from nextcloud/ldap-primary-buttons
LDAP Wizard: primary-style buttons
2017-11-14 14:03:27 +01:00
Jan-Christoph Borchardt 1c5586adab Fix tooltip placement in Shared files list
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-11-14 11:55:44 +01:00
Nextcloud bot 28e8a1c4b0
[tx-robot] updated from transifex 2017-11-14 01:09:46 +00:00
Julius Härtl 57eb046836
Use primary class also for ui-button elements
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-11-13 16:33:21 +01:00
Arthur Schiwon 5603d9a5ea
hackishly add primary css class adaption for jquery ui
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-11-13 16:33:17 +01:00
Morris Jobke e23921c7b1
Merge pull request #7123 from nextcloud/external-storage-user-mount-checkbox
Fix "allow user mount" checkbox for external storage
2017-11-13 14:52:21 +01:00
Vincent Petry dfc91a253c Parse Sabre Exception in OC.Files.Client and file-upload
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>
2017-11-13 12:19:14 +01:00
Morris Jobke ff2d4432d8
Merge pull request #7051 from nextcloud/breadcrumbs-refactor
Breadcrumbs refactor
2017-11-13 12:19:05 +01:00
John Molakvoæ (skjnldsv) 8c2dbeb13a
Added more tests and only test jsunit on drone (for testing only)
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-13 10:51:31 +01:00
Julius Härtl 7a812aa0e1
Theming: bump version to retrigger icon generation
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-11-13 10:18:48 +01:00
Julius Härtl d70e9059a5
Theming: Fix tests for favicon containing multiple sizes
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-11-13 10:18:48 +01:00
Julius Härtl 31b9fc9eac
Theming: Generate favicon sizes to avoid resizing issues done by the browser
fixes #5193

Signed-off-by: Julius Haertl <jus@bitgrid.net>
2017-11-13 10:18:47 +01:00
John Molakvoæ 8e61ad8847
Merge pull request #6678 from nextcloud/downstream-ldap-configurable-user-update
LDAP: configurable user update  interval
2017-11-13 08:14:52 +01:00
Nextcloud bot f376659933
[tx-robot] updated from transifex 2017-11-13 01:10:11 +00:00
Georg Ehrke 19b77039d7
remove cached size from shared calendar objects
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-11-12 17:30:22 +01:00
John Molakvoæ (skjnldsv) b4f5b38713
Add menu tests
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-12 05:20:06 +01:00
Nextcloud bot 8e3861563b
[tx-robot] updated from transifex 2017-11-12 01:10:00 +00:00
Georg Ehrke 2b51d84b98
generate birthday calendars in a background job after admin enabled them
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-11-11 16:17:18 +01:00
Georg Ehrke a87d986041
create a user's birthday calendar right after they requested it
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-11-11 11:28:34 +01:00
Georg Ehrke 4d5ed1372a
update autoloaders
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-11-11 02:15:57 +01:00
Georg Ehrke ef6f41a16c
respect admin / user choice about birthday calendars in corresponding hooks
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-11-11 02:15:57 +01:00
Georg Ehrke d59b3392ab
disallow users to create calendars with reserved names
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-11-11 02:15:56 +01:00
Georg Ehrke 1c106a66b1
adapt occ 'dav:sync-birthday-calendar command
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-11-11 02:15:56 +01:00
Georg Ehrke 5068d56fb0
add CalDAV interface that allows users to re-enable their birthday calendar
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-11-11 02:15:50 +01:00
Nextcloud bot 6ca4abfc0b
[tx-robot] updated from transifex 2017-11-11 01:10:09 +00:00
Georg Ehrke dc34622008
remember when a user deleted their contact birthdays calendar
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-11-10 23:05:04 +01:00
sidey79 d536e4e3b8
Fixed indentation
Fixed indentation of this pr

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-11-10 17:08:29 +01:00
sidey79 fbd8c5db4f
Fixed typo from last commit
Fixed typo in getAppValue mocket method from last commit

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-11-10 17:08:29 +01:00
sidey79 ea0ad82e56
Update testUpdateNoRefresh
Mocked getAppValue to deliver a value of 1800 when updateAttributesInterval  is requested by needsRefresh.

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-11-10 17:08:15 +01:00
sidey79 45dfc11137
tryfix needsRefresh unit tests
Forced updateAttributesInterval from getAppValue to int

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-11-10 17:07:41 +01:00
sidey79 039f6c9636
Fixed Typo in user.php
Fixed a typo for the app config prameter updateAttributesInterval

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-11-10 17:07:41 +01:00
sidey79 0b290c0904
Update User.php
Makes the time between needsRefresh configurable via app config option updateAttribuesInterval.
Default is still 86400 secons which is one day.

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-11-10 17:07:36 +01:00
Robin Appelman 56fd462718
Use the correct root for shared jail when the source storage is also a jail
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-11-10 17:03:27 +01:00
blizzz 1a2f9fe678
Merge pull request #7056 from nextcloud/oc-28415-enable-chunking-in-authenticated-web-upload
[oc] Enable chunking for bigger files in authenticated web upload
2017-11-10 15:35:58 +01:00
Marin Treselj 4d5490c339 second batch of fixed and re-optimized icons
Signed-off-by: Marin Treselj <marin@pixelipo.com>
2017-11-10 15:21:44 +01:00
Lukas Reschke d3e7dd1992
Merge pull request #7057 from nextcloud/ldap-sync-split
Bring LDAP user attribute updates ("sync") to the background
2017-11-10 15:02:26 +01:00
John Molakvoæ (skjnldsv) f40e56f0e6
Fix menu declaration and width calculation
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-10 08:23:24 +01:00
Nextcloud bot ede6499de4
[tx-robot] updated from transifex 2017-11-10 01:09:43 +00:00
Georg Ehrke 8b22bfea4f
Add admin checkbox to disable birthday calendars
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-11-09 17:12:06 +01:00
Georg Ehrke 7784672cc0
add option to filter CalendarAPI by componenttype
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-11-09 15:14:58 +01:00
Georg Ehrke dd13aecc88
update dav autoloaders after adding calendar api
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-11-09 15:14:58 +01:00
Georg Ehrke fa416e031b
integrate Dav app with Calendar API
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-11-09 15:14:58 +01:00
Robin Appelman 0baa7ce911
Fix "allow user mount" checkbox for external storage
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-11-09 14:49:21 +01:00
Morris Jobke c7e5bc0f9a
Merge pull request #7112 from nextcloud/theming-imagemagick-hint
Theming: add hint about favicon generation
2017-11-09 12:16:55 +01:00
Arthur Schiwon 419759e68b
resolve DI
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-11-09 11:10:59 +01:00
Arthur Schiwon 3ba8b337a4
fix unit tests after rebase
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-11-09 11:10:59 +01:00
Arthur Schiwon 8113f26eed
add Sync test
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-11-09 11:10:58 +01:00
Arthur Schiwon fc6b3902af
adjust tests
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-11-09 11:10:58 +01:00
Arthur Schiwon 59c05d5447
move LDAP user attributes "sync" to background (except for ajax jobs)
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-11-09 11:10:56 +01:00
Arthur Schiwon ef3cd32916
don't skip updating when ajax is set as background job mode
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-11-09 11:10:04 +01:00
Arthur Schiwon c6f1af9896
move ldap user sync to background (WIP)
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-11-09 11:09:59 +01:00
John Molakvoæ (skjnldsv) 2a1e9ad046
Removed console log
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-09 11:04:30 +01:00
Nextcloud bot 723a25a315
[tx-robot] updated from transifex 2017-11-09 09:12:41 +00:00
Morris Jobke 479966dce8
Fix unit tests
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-09 10:03:31 +01:00
Morris Jobke e0aaca1726
Merge pull request #7046 from nextcloud/hide-summary-file-actions-when-selected-file-does-not-match
Hide summary file actions when a selected file does not match
2017-11-09 09:45:55 +01:00
Morris Jobke 6b3975c23a
Merge pull request #6846 from nextcloud/filelist-confict-path
still trigger conflict resolution for existing entries when the curre…
2017-11-09 09:33:59 +01:00
Lukas Reschke 2bfa1ce5c3
Merge pull request #5568 from nextcloud/ldap-agent-credentials-safe
Ldap agent credentials save
2017-11-09 09:26:51 +01:00
Nextcloud bot aa525d89e8
[tx-robot] updated from transifex 2017-11-09 01:09:13 +00:00
Julius Härtl b1b8c99193
Theming: add hint about favicon generation
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-11-08 23:31:18 +01:00
John Molakvoæ (skjnldsv) 85355e98e6
Fixed tests and width calculation
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-08 20:12:38 +01:00
John Molakvoæ (skjnldsv) aea30e0004
Scrutinizer fix
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-08 19:12:56 +01:00
John Molakvoæ (skjnldsv) 584272962a
Improve drag & drop and fix some background issue if d&d on narrow windows
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-08 19:03:32 +01:00
Lukas Reschke 8c915baa34
Merge pull request #6788 from staabm/master
Prevent XSS in links which open a new browser window
2017-11-08 18:55:35 +01:00
John Molakvoæ (skjnldsv) b001060556
Fixed remaining tests
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-08 18:11:33 +01:00
John Molakvoæ (skjnldsv) f25cb7d156
Menu hidden by default
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-08 18:05:01 +01:00
John Molakvoæ (skjnldsv) 694a96d938
Fixed some more test and loop fix
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-08 17:54:38 +01:00
John Molakvoæ (skjnldsv) 41210c8cf1
Add droppable ability to menu and icon switch. Fix colour
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-08 16:56:58 +01:00
John Molakvoæ (skjnldsv) 267b673ccb
Updated tests according to new system
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-08 16:04:10 +01:00
John Molakvoæ (skjnldsv) 176ad7670f
Fix to-be-shown algorithm
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-08 14:04:34 +01:00
John Molakvoæ (skjnldsv) c6103dc9b7
Popover icon
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-08 13:10:30 +01:00
John Molakvoæ (skjnldsv) 396154d7e4
Fixed click in menu
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-08 13:04:39 +01:00
John Molakvoæ (skjnldsv) 9d3af829f2
Fixed breadcrumb action feedback and optimisation
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-08 13:04:39 +01:00
John Molakvoæ (skjnldsv) 33bac270db
Do not hide root
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-08 13:04:39 +01:00
John Molakvoæ (skjnldsv) 03d074ebe8
Popover filling system updated
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-08 13:04:38 +01:00
John Molakvoæ (skjnldsv) 1786784d12
Popover init
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-08 13:04:38 +01:00
John Molakvoæ (skjnldsv) 6ee75e16af
Fixed computation and removed unwanted scripts
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-08 13:04:38 +01:00
John Molakvoæ (skjnldsv) 9616074f58
Fix controls width
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-08 13:04:38 +01:00
John Molakvoæ 9bb28bab30
Flex to controls
Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
2017-11-08 13:04:38 +01:00
John Molakvoæ 9422e98151
Breadcrumbs hiding calculation
Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
2017-11-08 13:04:37 +01:00
Roeland Jago Douma 497cd7fa4e
Merge pull request #7064 from nextcloud/popover-fix
Fix popover layout
2017-11-08 12:47:58 +01:00
Nextcloud bot 79c9439c50
[tx-robot] updated from transifex 2017-11-08 01:09:21 +00:00
Lukas Reschke b754a2e385
Merge pull request #7042 from nextcloud/bugfix/noid/ensure_unique_uid_for_calendar_objects
ensure uid for calendar objects is unique
2017-11-07 21:55:09 +01:00
John Molakvoæ (skjnldsv) b44581e15d
Fixed sharing popover and removed unused old code
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-07 18:20:59 +01:00
John Molakvoæ (skjnldsv) bce00d8b3d
Reduce spread of css selector for a.action
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-07 16:32:20 +01:00
Roeland Jago Douma f55732a18f
Merge pull request #7075 from nextcloud/remove-unused-variables
Remove unused variables
2017-11-07 16:18:40 +01:00
Robin Appelman 8eaf1956bb
never show '/' as path for conflicting file names
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-11-07 15:01:56 +01:00
Robin Appelman 7ea06dacb1
still trigger conflict resolution for existing entries when the current entry doesn't need it
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-11-07 14:46:29 +01:00
Julius Härtl 00956c00b2
Theming: expose element color though capabilities API
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-11-07 12:31:23 +01:00
Nextcloud bot f9b7109de3
[tx-robot] updated from transifex 2017-11-07 01:08:57 +00:00
Morris Jobke 31c5c2a592
Change @georgehrke's email
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-06 20:38:59 +01:00
Morris Jobke 0eebff152a
Update license headers
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-06 16:56:19 +01:00
Morris Jobke 5411d60b24
Merge pull request #5321 from coletivoEITA/user_ldap_plugins_structure
Implement plugins infrastructure in User_LDAP
2017-11-06 16:07:31 +01: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 4df08f296b
ensure uid for calendar objects is unique
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-11-06 14:25:08 +01:00
Christoph Wurst d4f83d505a
Merge pull request #7074 from nextcloud/use-proper-whitespace
Use proper whitespace
2017-11-06 10:27:09 +01:00
Morris Jobke 5445b1ff17
Remove unused variables
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-06 09:43:45 +01:00
Morris Jobke c9f3b5a311
Use proper whitespace
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-06 09:41:25 +01:00
Nextcloud bot 81ac1ec977
[tx-robot] updated from transifex 2017-11-06 01:09:07 +00:00
Nextcloud bot 2730a57580
[tx-robot] updated from transifex 2017-11-05 01:08:56 +00:00
Vincent Petry cd8d13b9e6 Enable chunking for bigger files in authenticated web upload
This commit adds chunked uploads in the Web UI (for authenticated users,
but not for public uploads). To do that the server endpoint used by the
uploader is changed from WebDAV v1 to WebDAV v2. The chunking itself is
done automatically by the jQuery-File-Upload plugin when the
"maxChunkSize" parameter is set; in "fileuploadchunksend" the request is
adjusted to adapt the behaviour of the plugin to the one expected by
"uploads/" in WebDAV v2.

The chunk size to be used by the Web UI can be set in the
"max_chunk_size" parameter of the Files app configuration. By default it
is set to 10MiB.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-11-03 17:19:23 +01:00
Vinicius Cubas Brand fa565750d1 User_LDAP plugins: smaller fixes
Signed-off-by: Vinicius Cubas Brand <viniciuscb@gmail.com>
2017-11-03 11:42:59 -02:00
Vinicius Cubas Brand 10ca793452 Plugins infrastructure in User_LDAP
Signed-off-by: Vinicius Cubas Brand <viniciuscb@gmail.com>
2017-11-03 11:41:40 -02:00
Jan-Christoph Borchardt bd7d0de86f Add variable for border-radius
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-11-03 14:08:21 +01:00
Georg Ehrke 43147aeada
fancify invitation emails
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-11-03 11:20:03 +01:00
Joas Schilling 1bb048d11f
Correctly use the email templating
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-11-03 11:20:03 +01:00
Joas Schilling b14b933062
Language depending dates
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-11-03 11:20:03 +01:00
Joas Schilling cf04093fa6
Fix phpStorm complaints
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-11-03 11:20:03 +01:00
Leon Klingele c899f35261
DAV: Initial email customization support
Signed-Off-By: Leon Klingele <leon@struktur.de>
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-11-03 11:19:39 +01:00
Jan-Christoph Borchardt 576d31d48d
Merge pull request #7049 from nextcloud/fix-actions-menu
Fix opening the file actions menu in mobile
2017-11-03 11:11:01 +01:00
Jan-Christoph Borchardt 4ee2d2a1c2
Merge pull request #7048 from nextcloud/flexbox-css
Vendor prefix for flexbox not needed anymore
2017-11-03 11:10:25 +01:00
Morris Jobke 5e02cedef3
Fix opening the file actions menu in mobile
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-03 10:41:32 +01:00
Morris Jobke 9e9e5c2d16
Vendor prefix for flexbox not needed anymore
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-03 10:30:42 +01:00
Nextcloud bot 7e1e9430b6
[tx-robot] updated from transifex 2017-11-03 01:09:06 +00:00
Daniel Calviño Sánchez c047f32f25 Remove requeriment for read permission on some actions
The Details and the Favorite actions do not require any permission on
the files to be performed.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-11-02 19:37:01 +01:00
Daniel Calviño Sánchez e6b74fac40 Add proper handling of files without permissions
Now a file gets its directory permissions only if it contained no
permissions (they were undefined or null), but not if its permissions
were set to "NONE".

Besides that, now file actions that do not require any permission on the
file to be performed can be used on files that have no permissions.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-11-02 19:37:00 +01:00
Daniel Calviño Sánchez 555d582f35 Return whether the file is readable or not in the DAV permissions
Until now it was safe to assume that every file was readable by its
owner, so there was no need to return whether the file was readable or
not. However, with the introduction of end to end encryption that is no
longer the case, and it is now necessary to explicitly provide that
information.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-11-02 19:37:00 +01:00
John Molakvoæ 3091ddb043
Merge pull request #6652 from nextcloud/sharing-link-menu
Move sharing page options to menu in top right
2017-11-02 17:41:01 +01:00
Jan-Christoph Borchardt eebf19e2e6 Fix Scrutinizer issue
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-11-02 15:26:37 +01:00
Jan-Christoph Borchardt 4a3893b105
Merge pull request #6094 from nextcloud/sharedby-avatar
Show avatar instead of username for shared files
2017-11-02 14:51:17 +01:00
Arthur Schiwon 222d99fe96
adjust more js unit tests
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-11-02 13:51:08 +01:00
Daniel Calviño Sánchez a9540fe990 Hide summary file actions when a selected file does not match
When several files are selected and one of them can not be deleted the
"Delete" file action is not shown in the summary. This commit extends
that behaviour too to the other file actions in the summary ("Move or
copy" and "Download"), so now an action is shown in the summary only if
it can be executed on all the currently selected files.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-11-02 12:47:57 +01:00
Nextcloud bot 52a1760d4e
[tx-robot] updated from transifex 2017-11-02 01:10:52 +00:00
Roeland Jago Douma c2e82148e5
Merge pull request #7030 from nextcloud/proper_og_image
Use the new direct endpoint for the OpenGraph image
2017-11-01 21:00:05 +01:00
Arthur Schiwon f1570c2c04
update autoloader
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-11-01 16:30:20 +01:00
Arthur Schiwon e2805f02aa
Merge branch 'master' into autocomplete-gui 2017-11-01 15:37:29 +01:00
Jan-Christoph Borchardt 84b8cb12be Clicking publicly shared image opens direct preview url
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-11-01 14:49:52 +01:00
Jan-Christoph Borchardt 18dff925be Directly show link
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-11-01 14:17:34 +01:00
Jan-Christoph Borchardt bc47668206 Use standard way of showing and hiding popover menu
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-11-01 12:06:04 +01:00
Jan-Christoph Borchardt b3ccaf815d Fix scrollbar showing up on public page
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-11-01 12:05:31 +01:00
Jan-Christoph Borchardt 116cb58c3c Show and hide menu via Javascript, thanks @skjnldsv
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-11-01 11:52:58 +01:00
Jan-Christoph Borchardt f2fadf677c Adjust prominence of shared-by info to not overpower file name
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-11-01 11:52:58 +01:00
Jan-Christoph Borchardt 9f4cd52a97 Add label to download action
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-11-01 11:52:58 +01:00
Jan-Christoph Borchardt 40a3b01838 Fix display of Download entry text
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-11-01 11:52:58 +01:00
Jan-Christoph Borchardt 3d05540d36 Move shared page controls to menu in top right
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-11-01 11:52:58 +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
Jan-Christoph Borchardt 9407f6c1d0 Fix test for tooltip and local share owner
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-11-01 11:41:22 +01:00
Joas Schilling ce12cd91db
Merge pull request #6875 from nextcloud/app_autoloaders
Move server apps to dedicated autoloader
2017-11-01 11:15:27 +01:00
Nextcloud bot cc83052ca7
[tx-robot] updated from transifex 2017-11-01 01:08:44 +00:00
Roeland Jago Douma 2e443c97af
Use the new direct endpoint for the og:image
Some providers had issues when using the preview link (since it was
double encoded).

Now we actually serve the max size preview so it looks better

The image isn't cropped anymore so supporting platforms can just embed
the whole image.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-10-31 21:00:36 +01:00
blizzz b3ff9a2248
Merge pull request #6849 from nextcloud/fix-missing-translation-of-personal-calendar-in-activity
Fix missing translation of "Personal" calendar in activities
2017-10-31 15:05:26 +01:00
Arthur Schiwon 582d2d36ee
fix avatar loading for generic placeholders
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-31 14:42:21 +01:00
Arthur Schiwon d0f2f5f1de
remove more vendor-imported files that aren't necessary
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-31 14:06:16 +01:00
Arthur Schiwon bcfac75b06
simplify registration of manager in server container
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-31 13:55:03 +01:00
Arthur Schiwon 4b24dea6c7
only ship minimized js files
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-31 12:28:22 +01:00
Marin Treselj f1d90adb09
Fix CSS, better handling of recipients
Signed-off-by: Marin Treselj <marin@pixelipo.com>
2017-10-31 11:35:21 +01:00
Jan-Christoph Borchardt 9998700e7c
Show avatar instead of username for shared files
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-10-31 11:35:19 +01:00
Joas Schilling 8ce5adcf70
Merge pull request #6903 from nextcloud/feature/679/remove_valarms_from_read_only_shared_calendars
remove reminders from read-only shared calendars
2017-10-31 09:50:46 +01:00
Nextcloud bot 299ef9aa78
[tx-robot] updated from transifex 2017-10-31 01:08:31 +00:00
Roeland Jago Douma 638be96232
Do not error when downloading from a numeric public subfolder
Fixes #6820

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-10-30 21:06:35 +01:00
Jan-Christoph Borchardt fcb9c034fa
Merge pull request #7012 from nextcloud/show-favourite-action-as-the-first-one
Show favourite action as the first one in the file actions menu
2017-10-30 19:01:22 +01:00
Jan-Christoph Borchardt 446a3d2f21 Reverse favorite icon coloring in files action menu
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-10-30 18:17:59 +01:00
Daniel Calviño Sánchez 9df618131b Show favourite action as the first one in the file actions menu
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-10-30 17:09:15 +01:00
Arthur Schiwon d5f1cef642
fix comment sorter
background: we have a flat hierarchy of comments, not a tree. therefore we
can also remove again the unnecessary additions.

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-30 15:59:43 +01:00
Arthur Schiwon 61db8615f4
preserve line breaks
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-30 11:10:04 +01:00
Morris Jobke 42a14ad4cd
Merge pull request #6976 from nextcloud/fix-checkbox-in-popover
Fix checkboxes on popover
2017-10-30 09:45:03 +01:00
Nextcloud bot 5521937dc4
[tx-robot] updated from transifex 2017-10-30 01:08:34 +00:00
Nextcloud bot 267991b154
[tx-robot] updated from transifex 2017-10-29 00:08:31 +00:00
Nextcloud bot 84f3d247f2
[tx-robot] updated from transifex 2017-10-28 00:08:32 +00:00
Daniel Calviño Sánchez 1f19a45a88 Merge pull request #6869 from burned42/6307-fix_page_title_not_changed
#6307 fix page title not changed
2017-10-27 17:12:47 +02:00
Arthur Schiwon 20e7a0c07b
fix sharerecipientssorter tests
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-27 16:03:37 +02:00
Bernd Stellwag 844db3c891 bugfix: set/change page title when switching to file tags
Signed-off-by: Bernd Stellwag <burned@zerties.org>
2017-10-27 15:23:39 +02:00
Bernd Stellwag 3e3e4899fa bugfix: set/change page title when switching to filelist
Signed-off-by: Bernd Stellwag <burned@zerties.org>
2017-10-27 15:23:39 +02:00
Arthur Schiwon 7b0868ddac
fix saving changes…
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-27 14:25:19 +02:00
Arthur Schiwon 158e161a27
add some whitespace around credential elements
(…in a stupid way)

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-27 14:25:19 +02:00
Arthur Schiwon 9a1f706ae4
fix creating an empty configuration
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-27 14:25:19 +02:00
Arthur Schiwon 5c05a9327c
add save button for setting LDAP Agent DN and Password
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-27 14:25:19 +02:00
Arthur Schiwon 52b1b97c58
Fix regression: undesired writes to the DB
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-27 14:25:19 +02:00
Arthur Schiwon 4eab39f133
LDAP: only write actually changes values to the DB
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-27 14:25:19 +02:00
Arthur Schiwon 4c1a5d6a88
first, remove the hack
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-27 14:25:19 +02:00
Arthur Schiwon ca72c0150b
configurable amount of autocomplete results in comments
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-27 13:50:38 +02:00
Arthur Schiwon bd951e926f
avatar css fixes
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-27 12:34:24 +02:00
Nextcloud bot 65621141fd
[tx-robot] updated from transifex 2017-10-27 00:08:29 +00:00
Arthur Schiwon eace507043
apply our theming
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-27 00:32:47 +02:00
John Molakvoæ (skjnldsv) 97638e76ad
Share views fix
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-10-26 18:12:29 +02:00
John Molakvoæ (skjnldsv) 419ddeacee
Fix checkboxes on popover
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-10-26 17:54:44 +02:00
Arthur Schiwon 7f58c41015
fix sorting
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-26 16:23:41 +02:00
Arthur Schiwon aa2fd30775
autocomplete on demand
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-26 15:25:24 +02:00
Morris Jobke c733cdaa65
Use ::class in test mocks of encryption app
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-10-26 13:56:56 +02:00
Morris Jobke 06f46bd256 Merge pull request #6939 from nextcloud/class-usage-in-mocks-dav-app
Use ::class in test mocks of dav app
2017-10-26 13:26:00 +02:00
Morris Jobke 3f107e59dd
Fix another warning
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-10-26 10:36:17 +02:00
Morris Jobke ab36980d20
Use ::class in test mocks of dav app
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-10-26 10:16:12 +02:00
Nextcloud bot 37bedbc10d
[tx-robot] updated from transifex 2017-10-26 00:08:39 +00:00
Sascha Sambale 30460b52df
Updated OpenGraph title to display folder name instead of a nextcloud standard text
When sharing a folder via Facebook, WhatsApp or any other platform that makes use of OpenGraph, the display title was "Nextcloud - a safe home for all your data" and the description was the actual name of the folder. This should not be the case, so the display title has been changed to display the folder name and the description now displays the former OpenGraph title.

Signed-off-by: Sascha Sambale <mastixmc@gmail.com>

Fixing whitespaces and empty line.
2017-10-25 18:33:27 +02:00
Arthur Schiwon 3628d4d65d
avoid unnecessary recursion
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-25 17:23:42 +02:00
Morris Jobke 9f5e1648c1 Merge pull request #6947 from nextcloud/fix_6821
Use new-password as autocomplete on share auth page
2017-10-25 15:02:14 +02:00
Joas Schilling e0c09076de Merge pull request #6940 from nextcloud/master-6935-ellipsis
Add space between ellipsis and word
2017-10-25 09:14:17 +02:00
Roeland Jago Douma b9e8c8943e
Use new-password as autocomplete on share auth page
Fixes #6821

This makes sure that (supported) browsers will not prefill the password
field if a user has a password saved for that nextcloud.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-10-25 08:23:42 +02:00
Nextcloud bot c85deacddb
[tx-robot] updated from transifex 2017-10-25 00:08:45 +00:00
Morris Jobke 1978867a11 Merge pull request #6709 from nextcloud/show-checkbox-where-the-favourite-icon-is-now
Show checkbox where the favourite icon is now
2017-10-25 01:07:51 +02:00
Morris Jobke 7d71b54715
Add space between ellipsis and word
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-10-25 00:12:41 +02:00
Morris Jobke 5d84daa167 Merge pull request #6936 from nextcloud/master-6935
Fix typo
2017-10-25 00:07:17 +02:00
Roeland Jago Douma 134bb2fd78
User_LDAP Autoloader
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-10-24 20:40:13 +02:00
Roeland Jago Douma 53e0b7c1a8
UpdateNotification Autoloader
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-10-24 20:40:13 +02:00
Roeland Jago Douma c20b3d3634
TwoFactorBackupCodes Autoloader
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-10-24 20:40:13 +02:00
Roeland Jago Douma 71eb826cf4
Testing Autoloader
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-10-24 20:40:13 +02:00
Roeland Jago Douma f71588838a
SystemTags Autoloader
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-10-24 20:40:13 +02:00
Roeland Jago Douma dd9d2bcb19
ShareByMail Autoloader
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-10-24 20:40:13 +02:00
Roeland Jago Douma d92e4bbece
Provisioning_API Autoloader
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-10-24 20:40:13 +02:00
Roeland Jago Douma 21f129dd46
OAuth2 autoloader
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-10-24 20:40:13 +02:00
Roeland Jago Douma 9e296748dd
LookupServerConnector Autoloader
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-10-24 20:40:12 +02:00
Roeland Jago Douma 58287f71c5
Files_Versions Autoloader
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-10-24 20:40:12 +02:00
Roeland Jago Douma 3722ee73f5
Files_Trashbin Autoloader
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-10-24 20:40:12 +02:00
Roeland Jago Douma 436966372e
Files_Sharing Autoloader
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-10-24 20:40:12 +02:00
Roeland Jago Douma 89802ba016
Files Autoloader
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-10-24 20:40:12 +02:00
Roeland Jago Douma b906be4d6b
Federation Autoloader
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-10-24 20:40:12 +02:00
Roeland Jago Douma 38d9d394b0
FederatedFileSharing Autoloader
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-10-24 20:40:12 +02:00
Roeland Jago Douma fc1032f4bc
Encryption Autoloader
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-10-24 20:40:12 +02:00
Roeland Jago Douma ab20a64ed4
DAV Autoloader
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-10-24 20:40:11 +02:00
Roeland Jago Douma 112b0d57a8
Comments Autoloader
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-10-24 20:40:11 +02:00
Roeland Jago Douma ce7c9dfe8a
Admin Audit autoloader
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-10-24 20:40:09 +02:00
Morris Jobke 43e498844e
Use ::class in test mocks
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-10-24 17:45:32 +02:00
Morris Jobke dc823043e0
Replace ... with …
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-10-24 17:38:30 +02:00
Morris Jobke b1f77aca4e Merge pull request #6919 from nextcloud/di-appmanager-encryption-migration
Use DI for IAppManager to encryption migration
2017-10-24 16:33:03 +02:00
Björn Schießle 306d4e1d40 Merge pull request #6922 from nextcloud/unneeded-isEnabled-check
Remove unneeded check if app is enabled
2017-10-24 15:59:13 +02:00
Morris Jobke 99934134dc
Use DI for IAppManager to encryption migration
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-10-24 15:52:00 +02:00
Morris Jobke 3eaf23f29f Merge pull request #6920 from nextcloud/appmanager-usage
Use appmanager instead of OC_App for check for enabled app
2017-10-24 13:53:17 +02:00