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

17162 commits

Author SHA1 Message Date
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
Marius Blüm
05039f1f71
Rename "LDAP" to "LDAP/AD-integration" 
Signed-off-by: Marius Blüm <marius@lineone.io>
 2017-11-27 09:49:28 +01:00
Morris Jobke
4af12dcab1
Fix unit tests 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-11-27 08:50:44 +01:00
Allan Nordhøy
011e05574f
that has since been deleted, ID to node 
You were mentioned in a group chat by a user that has since been deleted

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-11-27 08:50:39 +01:00
Nextcloud bot
645fc993c2
[tx-robot] updated from transifex 2017-11-27 01:09:51 +00:00
Daniel Calviño Sánchez
ea4414f9bc Disable contacts menu for mentions to current user in comment messages 
The contacts menu is not shown for avatars and user names in the author
row if they represent the current user. For consistency, and because the
contacts menu provides no value when shown for the current user, this
commit also disables the contacts menu for mentions to the current user.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2017-11-27 00:10:53 +01:00
Daniel Calviño Sánchez
8eb19a278c Disable contacts menu for mentioned users in comments being composed 
The contacts menu does not provide too much value for users mentioned in
a message being composed, so it is now disabled in this case.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2017-11-27 00:05:54 +01:00
Daniel Calviño Sánchez
107952ff00 Fix cursor for author row and avatars in comments 
When it was on an author row the cursor was shown as a pointer, even if
clicking on the author row itself does nothing. On the other hand,
avatars used the default cursor, even if clicking on them either shows
the contacts menu (in the case of the author row, only when the avatar
is for a different user than the current one) or inserts a mention (for
avatars shown in the list of suggested mentions), depending on the case.

Now, the author row uses the default cursor, and avatars (and their
associated user name) use a pointer cursor if clicking on them will
trigger an action (either showing the contacts menu or inserting a
mention).

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2017-11-26 23:56:03 +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
Nextcloud bot
63d98574e9
[tx-robot] updated from transifex 2017-11-25 01:09:56 +00:00
Daniel Calviño Sánchez
9bb2bb7870 Show delete working icon at the same position as the delete icon 
When a comment was being deleted the submit working icon was shown. Now
the submit working icon is kept hidden in that case and a specific
delete working icon, which is shown at the same position as the delete
icon, is used instead.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2017-11-24 16:31:37 +01:00
Daniel Calviño Sánchez
6e9c0b9085 Show submit working icon at the same position as the submit confirm icon 
The submit confirm icon is shown as the background image of an
absolutely positioned input element, so the CSS rules for the submit
working icon were modified to match those of the submit confirm icon.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2017-11-24 16:30:58 +01:00
Morris Jobke
892d2630fe
Merge pull request #7275 from nextcloud/disable-elements-while-a-comment-is-being-deleted 
Disable elements while a comment is being deleted
 2017-11-24 16:14:53 +01:00
Daniel Calviño Sánchez
5e6d4ad27c Disable elements while a comment is being deleted 
When a comment is being deleted the "disabled" class is added to the
comment div, which causes it to look disabled. However, the input
elements and the content editable div were not truly disabled, and thus
it was still possible to interact with them. This commit ensures that
they are properly disabled while the comment is being deleted.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2017-11-24 13:17:55 +01:00
Nextcloud bot
dc1d13a18d
[tx-robot] updated from transifex 2017-11-24 01:09:53 +00:00
Arthur Schiwon
5a9c99e6ac
recycle SharedFileInfo values in fileInfo 
fileInfo is composed of data from sharing, however additional data is
pulled when sidebar opens, e.g. the size. Then, existing data is
overwritten by data from the other source (files). The data points that
would be lost are not dirty however and still used, so we keep them.

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-11-23 17:51:56 +01:00
Daniel Calviño Sánchez
bbe00079cc Fix input field not disabled while a comment is being sent 
Since the change of the text area to a content editable div the input
field was no longer disabled while a new comment was being sent. It was
caused by still trying to disable the div using the "disabled" property,
which works only on real input fields; when using a content editable div
the way to disable it is by setting "contenteditable" to "false".

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2017-11-23 14:34:09 +01:00
Arthur Schiwon
077381c7b3
rip out obsolete recipientsDisplayName 
also needs tests adjustements, and this also brings in natural sorting

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-11-23 13:32:14 +01:00
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
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
Nextcloud bot
6ca4abfc0b
[tx-robot] updated from transifex 2017-11-11 01:10:09 +00: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
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