0cb59ad3f5
Merge pull request #3412 from nextcloud/backport-3394-files-activity-expects-parameter-1-to-be-an-array
...
[stable11] Make sure ownCloud 8.2 activities also can get displayed
2017-02-10 10:44:14 +01:00
372474603d
Make sure the file information is available when sending the email
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-02-10 10:35:29 +01:00
76a2bf72e6
Fix detection of the new iOS app
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-02-10 10:13:33 +01:00
e48f608b08
add transifex config for sharebymail
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-02-09 19:56:04 -06:00
3aeed578fc
[tx-robot] updated from transifex
2017-02-10 01:07:12 +00:00
1ee9bee489
Backport more fixes
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-02-09 14:53:17 +01:00
201055bf8c
Merge pull request #3251 from nextcloud/fix-upload-estimation-translation
...
Use correct plural implementation for upload estimation
2017-02-09 14:45:46 +01:00
1badbe922e
Fix files sharing legacy as well
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-02-09 12:17:22 +01:00
fb3821406a
Add tests for getUser()
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-02-09 12:15:53 +01:00
b89e2ecd05
Add tests for getFile()
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-02-09 12:15:44 +01:00
0f823b654a
Make sure ownCloud 8.2 activities also can get displayed
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-02-09 12:15:36 +01:00
acc759e0c9
[tx-robot] updated from transifex
2017-02-09 01:07:20 +00:00
dfe4491b00
[tx-robot] updated from transifex
2017-02-08 01:07:18 +00:00
2c4f8089b0
Merge pull request #3363 from nextcloud/fix/2787/busy_also_for_creator_bug_stable11
...
fix shared-as-busy events for owner
2017-02-07 16:03:41 -06:00
0cb057e256
Fix Sharing app description
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-02-07 14:34:48 +01:00
cd82be929d
[tx-robot] updated from transifex
2017-02-07 01:09:03 +00:00
aa124646d2
[tx-robot] updated from transifex
2017-02-06 01:07:13 +00:00
335f2087a3
[tx-robot] updated from transifex
2017-02-05 01:07:13 +00:00
69f0bfb2c1
[tx-robot] updated from transifex
2017-02-04 01:07:29 +00:00
d398de5c6a
fix shared-as-busy events for owner
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-02-03 11:08:13 +01:00
8d12c43556
[tx-robot] updated from transifex
2017-02-03 01:07:30 +00:00
d71e472ab6
[tx-robot] updated from transifex
2017-02-02 01:07:13 +00:00
44264daa42
[tx-robot] updated from transifex
2017-02-01 01:07:06 +00:00
97a4688580
[tx-robot] updated from transifex
2017-01-31 01:07:13 +00:00
6ab21c2e94
[tx-robot] updated from transifex
2017-01-30 01:07:22 +00:00
ea51c2fc12
[tx-robot] updated from transifex
2017-01-29 01:07:03 +00:00
89cd31bd0f
[tx-robot] updated from transifex
2017-01-28 01:07:09 +00:00
edb9d83658
[tx-robot] updated from transifex
2017-01-27 01:07:28 +00:00
9e7afbf6cb
Fit newFileMenu to css guidelines
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-26 18:32:25 +01:00
757f1b922c
make sure that 'getCurrentUser' gets an array in order to manipulate the data to match the old API
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-01-26 11:34:07 +01:00
475e466d58
Merge pull request #3213 from nextcloud/ldap-ocs-stable11
...
[stable] 11 LDAP OCS API
2017-01-25 22:50:27 -06:00
6b3ddd5ccd
[tx-robot] updated from transifex
2017-01-26 01:07:27 +00:00
659320dfca
unify endpoints form core and the the provisioning api
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-01-25 14:19:41 +01:00
c4ae0cd433
add data from the users profile to the provisioning api
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-01-25 14:17:18 +01:00
1ae01c5eb5
Use correct plural implementation for upload estimation
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-25 10:22:35 +01:00
026ceab35f
[tx-robot] updated from transifex
2017-01-25 01:10:10 +00:00
175435c76b
[tx-robot] updated from transifex
2017-01-24 01:07:25 +00:00
9299c9fc79
LDAP OCS API (Part 1)
...
LDAP OCS Api for create config
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
LDAP OCS Api for delete config
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
fix and extend behat tests
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
add LDAP OCS Api for modifying a configuration
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
test against OCS v2 instead
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
LDAP OCS Api for show config
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
also, let ldap integration tests run
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
fix indentation
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
enable user_ldap app for tests
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
LDAP PUT command now supports setting multiple keys at once
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
fix deletion for configIDs < s10
Also move ensureConfigIDExists checks into try, it might throw DB
related exceptions
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
remove outdated scenario
covered by "Delete a non-existing configuration"
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-01-23 14:24:10 +01:00
34fff32409
[tx-robot] updated from transifex
2017-01-23 00:17:48 +00:00
948ab09a18
[tx-robot] updated from transifex
2017-01-22 01:08:00 +00:00
8c4a329b6d
[tx-robot] updated from transifex
2017-01-21 01:07:55 +00:00
f6b42901dc
[tx-robot] updated from transifex
2017-01-20 01:07:49 +00:00
623ea04317
[tx-robot] updated from transifex
2017-01-19 01:08:17 +00:00
d17635b502
Escape the name for the jquery selector
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-18 09:08:13 +01:00
0c8220d57e
[tx-robot] updated from transifex
2017-01-18 01:07:47 +00:00
832007a993
Fix "broken" app descriptions
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-17 11:36:40 +01:00
cbc76a1ccb
[tx-robot] updated from transifex
2017-01-17 01:08:03 +00:00
84ae958c12
generate correct path for owner and use the display name instead of the user id
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-01-16 12:31:09 +01:00
f044edaadc
[tx-robot] updated from transifex
2017-01-16 01:15:59 +00:00
fc2a2c3ee9
[tx-robot] updated from transifex
2017-01-12 01:07:53 +00:00
685381f3a1
[tx-robot] updated from transifex
2017-01-11 15:20:31 +00:00
73e93d11c2
Make sure the used event type and the setting/filter are the same
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-10 12:34:13 +01:00
639391717d
[tx-robot] updated from transifex
2017-01-09 08:25:08 +00:00
2c2c4cc6c7
[tx-robot] updated from transifex
2017-01-05 13:10:01 +00:00
7f648905b3
Merge pull request #2949 from nextcloud/backport-2677-fix-avatars-in-mail
...
[stable11] Don't set Content-Disposition header if one already exists
2017-01-05 13:27:34 +01:00
adef282c44
Don't set Content-Disposition header if one already exists
...
If a Content-Disposition header is already set by another plugin we don't need to set another one as this breaks clients.
Fixes https://github.com/nextcloud/server/issues/1992
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-01-05 12:22:27 +01:00
4f8329c95a
[tx-robot] updated from transifex
2017-01-04 12:09:51 +00:00
14bc90df9e
[tx-robot] updated from transifex
2017-01-03 01:07:56 +00:00
c9039a59aa
[tx-robot] updated from transifex
2017-01-02 01:07:41 +00:00
93d0cb220a
[tx-robot] updated from transifex
2017-01-01 01:07:38 +00:00
fba1008d19
[tx-robot] updated from transifex
2016-12-31 01:08:44 +00:00
768f1cf533
[tx-robot] updated from transifex
2016-12-30 01:07:36 +00:00
a2b45c3cb7
[tx-robot] updated from transifex
2016-12-29 01:08:08 +00:00
a4c85c76a9
[tx-robot] updated from transifex
2016-12-28 01:07:49 +00:00
ca6d8c5eba
[tx-robot] updated from transifex
2016-12-27 01:07:48 +00:00
015408fc3a
[tx-robot] updated from transifex
2016-12-26 01:09:33 +00:00
43dcc686bd
Merge pull request #2825 from nextcloud/stable11-2659
...
[stable11] Fix overwriting parameter
2016-12-22 14:47:40 +01:00
1339e51585
Fix overwriting parameter
...
Fixes #2641
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-12-22 14:02:55 +01:00
3649d86b65
Add DAV repair step to fix calendar data
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-12-21 20:30:27 +01:00
29cc292e2a
Fix TodoTest
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-12-19 09:48:08 +01:00
a1210fe5b0
Fix the Todos filter
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-12-19 09:47:11 +01:00
80ab69ba3f
Merge pull request #2696 from nextcloud/shared-scanner-unmasked-11
...
[11] use unmasked permissions in shared scanner
2016-12-16 13:15:07 +01:00
b452e250e0
Fix legacy caldav endpoints
...
* CaldavBackend is now endpoint aware (use old style principals on old
endpoint and new onces on new).
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-12-15 20:12:10 +01:00
5290eee9ec
use unmasked permissions in shared scanner
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-12-15 15:58:49 +01:00
69f0977686
Add test execution against legacy DAV backend
...
Since the tests to quite hugely rely on sync tokens being present I also included those in the legacy backend.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-12-15 11:19:59 +01:00
edd01e3ce4
Merge pull request #2637 from nextcloud/mount-cache-storageid
...
also compare storage ids when checking for changed mounts
2016-12-13 14:02:49 +01:00
bbe24d29ca
reuse cacheentry
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-12-13 12:30:29 +01:00
e49088315e
Merge pull request #2615 from nextcloud/daita-sharecontroller
...
Download a file in a subfolder in a sharedlink is not working
2016-12-12 18:28:06 +01:00
43374292b1
update phpdoc
...
Signed-off-by: Maxence Lange <maxence@pontapreta.net>
2016-12-12 16:15:13 -01:00
6cd421e603
Merge pull request #2620 from nextcloud/theming-externalfiles
...
Show theming icons on external storage folders
2016-12-12 16:04:48 +01:00
91303469e0
improve wording of admin settings to enable search on the public address book
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-12-12 13:55:12 +01:00
b12db1b494
Show theming icons on external storage folders
...
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2016-12-12 12:18:38 +01:00
0c6c85bafb
[tx-robot] updated from transifex
2016-12-12 01:07:18 +00:00
9ef8d25e46
Download a file in a subfolder in a sharedlink is not working
...
the $node created using the path (GET) parameter is not used when executing fileListDownloaded()
2016-12-11 18:32:28 -01:00
ea7a69f198
[tx-robot] updated from transifex
2016-12-11 01:07:18 +00:00
4456fa57e0
Merge pull request #2274 from nextcloud/fix-invites-on-readonly-calendars
...
Do not add invites into read-only calendars
2016-12-10 12:22:15 +01:00
7cb99e74db
[tx-robot] updated from transifex
2016-12-10 01:07:15 +00:00
d10be51d40
Merge pull request #2588 from nextcloud/theming-check-empty
...
Check if image files for theming are empty
2016-12-09 15:57:44 +01:00
de8908bf29
Merge pull request #2584 from nextcloud/theming-filter-fix
...
Add fallback to FILTER_LANCZOS for icon resizing
2016-12-09 14:53:34 +01:00
5fbadee95f
Check if image files for theming are empty
...
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2016-12-09 12:54:03 +01:00
366f14d7db
Add fallback to FILTER_LANCZOS for icon resizing
...
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2016-12-09 11:53:27 +01:00
474720ff1c
Overwrite the schedule target calendar with the personal one and create it if missing
...
Otherwise this leads to problems like events being added to the birthday calendar,
if that one is the first calendar which was created for the user. See:
https://github.com/nextcloud/server/pull/2274
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-12-09 09:34:25 +01:00
88d90066ba
[tx-robot] updated from transifex
2016-12-09 01:07:18 +00:00
158cc9c261
Merge pull request #2545 from nextcloud/fix-popover-width
...
Fix popover width
2016-12-08 13:49:56 +01:00
74d1b0bada
[tx-robot] updated from transifex
2016-12-08 01:07:26 +00:00
2eca4e65b3
Fix popover margin and width
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2016-12-07 10:50:54 +01:00
ea801d7d7c
[tx-robot] updated from transifex
2016-12-07 01:07:46 +00:00
c776aa9282
Merge pull request #2530 from nextcloud/fix-change-permissions-mail-shares-on-folder
...
fix change permission on mail shares of folders
2016-12-06 22:53:46 +01:00
7e2b866fd7
fix type in jsdoc
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2016-12-06 18:08:13 +01:00
5326985c71
Merge pull request #2519 from nextcloud/404-versions-download
...
Show nice error page for not available versions
2016-12-06 12:01:30 +01:00
2a647f4d3a
[tx-robot] updated from transifex
2016-12-06 01:07:19 +00:00
aac3024878
Merge pull request #2505 from nextcloud/sudo-mode-provisioning-api
...
Require sudo mode on the provisioning API
2016-12-05 22:29:29 +01:00
f03cd2c685
Show nice error page for not available versions
...
* fixes #1464
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-12-05 22:15:59 +01:00
8fdfb41b93
Merge pull request #1934 from nextcloud/move-latly-used-tags-to-the-top
...
Move lately used tags to the top
2016-12-05 16:10:33 +01:00
7ce5303374
Merge pull request #2496 from nextcloud/add-activities-for-favorite-managemet
...
Add an activity when managing favorites
2016-12-05 15:44:24 +01:00
af9b3e3889
fix conflict dialog styling in firefox
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-12-05 14:20:54 +01:00
bea85adc08
Require sudo mode on the provisioning API
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-12-05 11:55:21 +01:00
dda39728e3
[tx-robot] updated from transifex
2016-12-05 01:07:41 +00:00
3234d4b36c
Merge pull request #2497 from nextcloud/theming-icon-fixes
...
Fixing issues with themed icons
2016-12-04 16:09:12 +01:00
fd6670ae72
Fix transparency of icons
...
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2016-12-04 13:38:37 +01:00
f423bdcb81
Fix background border radius
...
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2016-12-04 13:38:36 +01:00
797e761492
Move sizing to renderAppIcon method
...
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2016-12-04 13:38:29 +01:00
1a802d3383
Add tests for favorite action
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-12-04 12:54:34 +01:00
7c1b288b57
Add some generic tests
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-12-04 12:41:14 +01:00
8baf986d3b
Add an activity when managing favorites
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-12-04 12:16:49 +01:00
3bea7ac6ac
[tx-robot] updated from transifex
2016-12-04 01:07:30 +00:00
181cf9c7f3
[tx-robot] updated from transifex
2016-12-03 01:07:26 +00:00
1131338562
Merge pull request #2486 from nextcloud/shared-storage-mask
...
apply permissions mask for shared storage
2016-12-02 23:39:48 +01:00
2bc931dd10
Merge pull request #2437 from nextcloud/update-notification-icons
...
Use an icon for the update notifications
2016-12-02 20:05:50 +01:00
535655e23c
Merge pull request #2483 from nextcloud/fix-unshare-icon-c
...
Fix share tab view
2016-12-02 19:49:32 +01:00
14219c1082
Fix loader position and visibility
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2016-12-02 18:10:11 +01:00
ef04bea5fb
Fix popover arrow
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2016-12-02 18:10:08 +01:00
717f1d380c
Merge pull request #2475 from nextcloud/fix-filename-local-link
...
fix width of filename in sidebar to accommodate local link
2016-12-02 18:04:57 +01:00
df12824a5b
Merge pull request #2479 from nextcloud/icon-for-empty-versions
...
add icon if no versions are available
2016-12-02 18:03:50 +01:00
02ee4f958c
apply permissions mask for shared storage
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-12-02 17:59:02 +01:00
8a12f0bc8f
Fix unshare delete icon
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2016-12-02 17:52:24 +01:00
bd2a8e768e
Merge pull request #2471 from nextcloud/harden_files_drop
...
Harden files drop
2016-12-02 17:43:04 +01:00
48dddf82eb
properly calculate the width of the name in the sidebar
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-12-02 16:08:41 +01:00
db56df1893
Merge pull request #2469 from nextcloud/fix-loading-icon-background
...
Remove white background from loading icon
2016-12-02 15:53:38 +01:00
edb116ae93
add icon if no versions are available
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-12-02 15:45:11 +01:00
ac527769c5
fix width of filename in sidebar to accommodate local link
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2016-12-02 14:49:19 +01:00
b6184b0bc2
Increase width of new menu
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-12-02 14:29:15 +01:00
40a11f12c0
fix vertical sizing change of popover in new folder flow
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2016-12-02 13:22:48 +01:00
1f387ad1e6
Add unit tests
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-12-02 13:06:13 +01:00
363963577c
Harden files drop
...
* Fail on MKCOL
* Only take filename ignore directories
* No need to parse query parameters
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-12-02 13:03:56 +01:00
4bb1154f50
Fix input field for new folder - fixes #2245
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-12-02 12:53:24 +01:00
0853f0e7a8
Remove white background from loading icon
...
* allows to use the loading icon on non-white background (disabled input fields for example)
* fixes #2466
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-12-02 12:39:12 +01:00
5ba13dd0e4
Fix tests
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-12-02 09:37:08 +01:00
1b5ff9f5c7
[tx-robot] updated from transifex
2016-12-02 01:07:35 +00:00
ac1bf3c2b7
Merge pull request #2432 from nextcloud/activity-mail-language
...
Make sure the activity emails can be sent in the users language
2016-12-01 23:01:00 +01:00
ea45b22053
Merge pull request #2444 from nextcloud/detect-also-a-400-status
...
Catch status code 400
2016-12-01 21:25:54 +01:00
61d61e794c
Merge pull request #2435 from nextcloud/sidebar-preview-non-preview
...
allow registering sidebar preview handlers for mimetypes that dont co…
2016-12-01 21:14:10 +01:00
9704b4df52
Catch status code 400
...
In case the server returns a statuscode 400 we should also gracefully return to the home directory.
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-01 19:13:28 +01:00
a4900bf23f
allow registering sidebar preview handlers for mimetypes that dont come with server side previews
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-12-01 15:43:17 +01:00
a4e2dc3033
fix mouse pointer
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-12-01 15:37:08 +01:00
1aefbed55f
Highlight the app name in the notification
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-12-01 15:36:22 +01:00
917cac5436
Use the settings icon for the update notification
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-12-01 15:36:22 +01:00
b89aafc241
We should always show permanent actions
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-12-01 15:16:06 +01:00
a87638c6ab
Merge pull request #2371 from nextcloud/issue-2369-add-share-indicator-for-mail-shares
...
Add share indicator for mail shares
2016-12-01 12:17:56 +01:00
b2f46bfa04
Adjust all implementations in the server repo
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-12-01 11:35:23 +01:00
4ca7f9c896
[tx-robot] updated from transifex
2016-12-01 01:07:17 +00:00
d7dd399bbd
Merge pull request #2422 from nextcloud/text-preview-debug
...
remove js debug statements in sidebar text preview generator
2016-11-30 15:39:59 +01:00
f075c22c72
[tx-robot] updated from transifex
2016-11-30 14:18:08 +00:00
7fc118e8ea
remove js debug statements in sidebar text preview generator
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-11-30 14:54:54 +01:00
f15ea9ec05
Merge pull request #2406 from nextcloud/move-dav-activities-to-new-api
...
Move dav activities to new api
2016-11-30 14:01:58 +01:00
b4d76b16b4
Add tests for the base provider
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-30 12:04:19 +01:00
2854e2f413
Move generic tests into namespace
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-30 11:41:38 +01:00
ad10c5c4b4
Deduplicate the provider code
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-30 11:39:38 +01:00
86168c8ea7
Merge pull request #1446 from nextcloud/fix-mail-design
...
Fix mail design
2016-11-30 11:31:43 +01:00
de1cb1ec32
Add unit tests for ISetting instances
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-30 10:52:16 +01:00
56f45e4960
Add tests for the filters
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-30 10:47:55 +01:00
6458b5adb5
Merge pull request #2414 from nextcloud/version_previews
...
Fix empty version previews
2016-11-30 10:03:17 +01:00
05b86faccc
Display link share icon when toggling share
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-30 09:35:38 +01:00
09e5e38591
Add an icon when the file is shared by mail
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-30 09:21:58 +01:00
1aa874e4e3
Also get infos about email shares
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-30 09:21:58 +01:00
15ca00c66e
Make sure the app is loaded in dav
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-30 09:21:58 +01:00
cd52b98ec7
Merge pull request #2409 from nextcloud/fix-1470
...
log exception about user not present on LDAP on login only if logleve…
2016-11-30 09:02:34 +01:00
869ae38bea
Merge pull request #2105 from nextcloud/focus-tags-input-on-toggle
...
Focus the input after clicking the "Tags" label
2016-11-30 08:57:00 +01:00
41dcceeb35
[tx-robot] updated from transifex
2016-11-30 01:07:16 +00:00
01867b42d4
Update sharedbymail template
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-11-30 01:07:00 +01:00
6aa79cacfd
Fix mail header logo [ fixes #1326 ]
...
Signed-off-by: Felix A. Epp <work@felixepp.de>
2016-11-30 01:06:47 +01:00
66a77a8857
Fix js tests
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-29 20:48:03 +01:00
4dcd0474d5
Show mimeicon when versions don't have a preview
...
Fixes #2413
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-29 20:35:57 +01:00
0fb912e724
[tx-robot] updated from transifex
2016-11-29 17:57:47 +00:00
9680201644
Merge pull request #2410 from nextcloud/fix-mobile-text
...
Fix missing text for downloads on mobile
2016-11-29 18:49:21 +01:00
a84dacc16f
[tx-robot] updated from transifex
2016-11-29 17:03:24 +00:00
db84c1c872
Fix missing text for downloads on mobile
...
* fixes #2362
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-11-29 17:06:09 +01:00
1e5344ffe9
log exception about user not present on LDAP on login only if loglevel is set to debug
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2016-11-29 17:05:55 +01:00
4c0263b78a
Move event and todo parsing to new API
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-29 16:27:12 +01:00
8d87e39146
Deduplicate icon assignment
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-29 16:08:58 +01:00
ddc82b4ca2
Move calendar activity parsing to new API
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-29 15:47:43 +01:00
a16fd3991a
Move CalDAV activity settings to new API
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-29 15:06:54 +01:00
253a75e5ae
Move CalDAV activity filters to new API
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-29 15:04:08 +01:00
bd18349f46
Fix mobile view
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2016-11-29 13:47:37 +01:00
a984f4b430
Fix #2384
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2016-11-29 07:06:41 +01:00
e8ea9a5d27
[tx-robot] updated from transifex
2016-11-29 01:06:47 +00:00
8a9343a709
Merge pull request #2383 from nextcloud/add-icon-for-remote-share-notifications
...
Add an icon to the federated sharing notification
2016-11-28 21:00:27 +01:00
cd9d1f589f
Merge pull request #2237 from nextcloud/rich-strings-and-icons-for-mention-notifications
...
Rich strings and icons for mention notifications
2016-11-28 18:13:54 +01:00
b31d621840
Add an icon to the federated sharing notification
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-28 17:23:42 +01:00
587f28ad42
Merge pull request #2378 from nextcloud/fix-preview-image_src
...
Fix image_src link
2016-11-28 17:03:25 +01:00
9def8225c0
Fix image_src link
...
The link in the image_src link (used for previews on Social Media such as Facebook) was still using the old route. This changes it to use the new route.
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-28 16:20:57 +01:00
a12d2e67e7
Merge pull request #2335 from nextcloud/grouping-for-activities
...
Bring back grouping for activities
2016-11-28 16:18:02 +01:00
e5c31b72e1
bring back permissions for mail shares
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-28 11:24:05 +01:00
46b4891bd7
Merge pull request #2312 from nextcloud/move-sharebymail-to-new-api
...
Move ShareByMail activities to new API
2016-11-28 11:09:47 +01:00
ca7b9e5490
[tx-robot] updated from transifex
2016-11-28 09:51:57 +00:00
4e682d4113
[tx-robot] updated from transifex
2016-11-28 01:06:56 +00:00
7e6f829d54
Merge pull request #2343 from nextcloud/fix-exteranl-storage-redirect
...
[Minor] Fix link to external storage settings on error notification
2016-11-27 09:02:26 +01:00
9788cf04ee
[tx-robot] updated from transifex
2016-11-27 01:07:08 +00:00
c911a876bf
Fix link to external storage settings on error notification
...
Signed-off-by: Felix A. Epp <work@felixepp.de>
2016-11-26 10:15:42 +01:00
8f4ec8583d
[tx-robot] updated from transifex
2016-11-26 01:06:57 +00:00
da9468522b
Add an event merger and use it for the files activities
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-25 15:36:11 +01:00
5ba2b1c193
Working towards groups
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-25 15:19:55 +01:00
f067d0ee66
Correctly match the subjects to the parameters
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-25 11:45:40 +01:00
9f915e061c
Remove old test
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-25 11:17:40 +01:00
719b1905d7
Get user name from contacts if available
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-25 11:17:06 +01:00
72f9920a58
Add Identityproof tests
...
* Add tests for Key
* Add tests for Manager
* Add tests for Signer
* Removed URLGenerator from Signer
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-24 21:50:19 +01:00
8f14ffd734
Merge pull request #2306 from nextcloud/dont-log-user-password
...
Don't log the user password in case something goes wrong
2016-11-24 17:08:25 +01:00
5c2ec58440
Move ShareByMail activities to new API
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-24 16:15:51 +01:00
e75dede590
fix some outdated naming
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2016-11-24 16:05:05 +01:00
df0eeb8089
Don't log the user password in case something goes wrong
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-24 13:58:03 +01:00
f4cf125a4a
Merge pull request #2296 from nextcloud/nitpicking-on-federation-admin-section
...
Fix some language issues in the federation admin panel
2016-11-24 10:13:57 +01:00
fbd574cc82
Fix some language issues in the federation admin panel
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-24 09:34:06 +01:00
1c564fd554
Fix placeholder typo in public link activity
...
https://www.transifex.com/nextcloud/nextcloud/translate/#152/files_sharing/101548786/
2016-11-23 21:43:14 +01:00
4c5e7d270a
Add tests
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-23 19:58:43 +01:00
861c8572c0
restore ldap_password_pr
...
Signed-off-by: Roger Szabo <roger.szabo@web.de>
remove notification part
Signed-off-by: Roger Szabo <roger.szabo@web.de>
blizzz comments
Signed-off-by: Roger Szabo <roger.szabo@web.de>
morris comment
Signed-off-by: Roger Szabo <roger.szabo@web.de>
improved error message for changing password
Signed-off-by: Roger Szabo <roger.szabo@web.de>
blizz comments 20161013
Signed-off-by: Roger Szabo <roger.szabo@web.de>
Signed-off-by: Roger Szabo <roger.szabo@web.de>
Adjust HintException usage
Signed-off-by: Roger Szabo <roger.szabo@web.de>
Signed-off-by: Roger Szabo <roger.szabo@web.de>
2016-11-23 19:02:48 +01:00
59db9fada2
Merge pull request #2281 from nextcloud/fix-translation
...
Fix language typo
2016-11-23 17:53:21 +01:00
5473475fa7
Merge pull request #2232 from nextcloud/imagescale-fix
...
Workaround for PHP bug when calling imagescale
2016-11-23 17:45:59 +01:00
14f01dbe33
Fix language typo
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-23 16:55:49 +01:00
6d92550772
Merge pull request #2278 from nextcloud/filelist-share-visible
...
make the share icon in the filelist visible again
2016-11-23 16:40:10 +01:00
6281607d7a
improved style of shared entry
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-11-23 15:25:48 +01:00
aa30c4cd80
Merge pull request #2240 from nextcloud/daita-encryption-init_on_master_key
...
init Session/privateKeys on Master Key
2016-11-23 15:19:24 +01:00
25f519c855
Merge pull request #2266 from nextcloud/avatar_image
...
VCARDS don't hold binary data
2016-11-23 14:49:32 +01:00
3bb3296c53
make the share icon in the filelist visible again
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-11-23 14:44:53 +01:00
2eca9cc384
Merge pull request #2262 from nextcloud/specify-parameters-on-public-download
...
Specify the parameters on public download
2016-11-23 14:02:38 +01:00
e9f98fd5a9
VCARDS don't hold binary data
...
* We need to base64 encode the avatar!
* Switched to vcard v4
* User proper data uri
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-23 13:30:32 +01:00
8a401ee156
check if session is initialized
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-23 12:20:43 +01:00
f692ea34f1
Merge pull request #2263 from nextcloud/remove91_migration
...
Remove migration steps in app dav
2016-11-23 12:18:06 +01:00
d2489ebee4
Adjust tests
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-23 11:31:35 +01:00
bfecdd4422
Use the comment icon for the notifications
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-23 11:19:44 +01:00
56cfd0a6e4
Set the rich object string for comment notifications
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-23 11:19:41 +01:00
a36d26950e
Only do stuff when its a remote-share activity
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-22 22:46:18 +01:00
181af830fd
Remove 9.1 migration steps in app dav ( #25654 )
2016-11-22 20:17:05 +01:00
e9336dddd5
Specify the parameters on public download
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-22 20:14:42 +01:00
f4470b6861
Merge pull request #2246 from nextcloud/display-name-for-files-and-tagging-activities-again
...
Use the display name for files activities again
2016-11-22 18:25:52 +01:00
717fd9fdd6
Merge pull request #2229 from nextcloud/select2-fix-bis
...
Select2 fix bis
2016-11-22 17:50:53 +01:00
f6e7269628
document new variable
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-11-22 16:55:28 +01:00
e1feb72583
Use the display name for files activities again
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-22 16:39:29 +01:00
558a934842
init Session/privateKeys on Master Key
...
I can't find another way to init the session ...
2016-11-22 13:19:42 -01:00
9619f49ba4
Fix undefined systemtags stuff
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-22 14:59:51 +01:00
6c4664bc82
Workaround for PHP bug when calling imagescale
...
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2016-11-22 12:12:59 +01:00
b8732a1a53
Merge pull request #2179 from nextcloud/update-systemtags-to-new-activity-api
...
Update systemtags activity to new API
2016-11-22 11:05:06 +01:00
6bcb6e08be
Fix systemtagsfilelist unwanted margin and clean aera a bit
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2016-11-22 10:49:24 +01:00
08ef7356f6
Merge pull request #2165 from nextcloud/sharing-activities-update
...
Move file sharing activities to the new API
2016-11-22 10:19:15 +01:00
a02d0975dd
Merge pull request #2154 from nextcloud/comments-activities-update
...
Move comments activities to the new API
2016-11-22 09:56:22 +01:00
b0cf78aa1e
[tx-robot] updated from transifex
2016-11-22 01:06:54 +00:00
d0c3c5cee3
Merge pull request #2225 from nextcloud/fix_caldav_proppatch_requests
...
fix PropPatch requests on calendars
2016-11-21 22:54:17 +01:00
3a8c4230be
fix PropPatch requests on calendars
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2016-11-21 22:10:51 +01:00
ccf3e4255a
Remove debug code
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-21 11:30:02 +01:00
7b3855a375
Add config switch
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-21 11:30:02 +01:00
c49b0d3834
Remove unused variable
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-21 11:30:01 +01:00
Lukas Reschke
Joas Schilling
Morris Jobke
Nextcloud bot
Georg Ehrke
John Molakvoæ (skjnldsv)
Bjoern Schiessle
Arthur Schiwon
Roeland Jago Douma
Robin Appelman
Maxence Lange
Julius Haertl
Roeland Jago Douma
John Molakvoæ
Jan-Christoph Borchardt
Christoph Wurst
Felix Epp
root
Thomas Müller