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

14807 commits

Author SHA1 Message Date
Bjoern Schiessle
86b362809b
always show correct place holder, mention share by mail only if the share provider is enabled 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2016-11-01 19:54:41 +01:00
Bjoern Schiessle
ce08682c2f
enabled by default and add to shipped.json 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2016-11-01 19:54:41 +01:00
Bjoern Schiessle
6d7520b1e2
unit tests updated and new added 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2016-11-01 19:54:41 +01:00
Bjoern Schiessle
1e930df91f
find and show share-by mail links 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2016-11-01 19:54:41 +01:00
Bjoern Schiessle
561dd80d57
don't show 'notify by mail' option or permissions not available for mail shares 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2016-11-01 19:54:41 +01:00
Bjoern Schiessle
31c8c38bd6
send mail for share-by-mail shares 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2016-11-01 19:54:40 +01:00
Bjoern Schiessle
7436e45c91
if we have a exact match, either for the federated cloud id or for the 
email address we only return the exact match. It is highly unlikely
that the exact same email address and federated cloud id exists

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2016-11-01 19:54:40 +01:00
Bjoern Schiessle
392c8a115f
unified way to display remote shares and mail shares 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2016-11-01 19:54:40 +01:00
Bjoern Schiessle
8c8a019b7e
show correct display name if we have the user in one of our address books 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2016-11-01 19:54:40 +01:00
Bjoern Schiessle
60a3893ca8
improve search for federated cloud ids and email adresses 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2016-11-01 19:54:40 +01:00
Bjoern Schiessle
77f74b9780
handle case if no share-by-mail share provider is loaded 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2016-11-01 19:54:40 +01:00
Bjoern Schiessle
96c40d14a1
update permissions 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2016-11-01 19:51:11 +01:00
Bjoern Schiessle
a17c6a485d
add share by mail share provider 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2016-11-01 19:51:11 +01:00
Bjoern Schiessle
0a6f02801f
introduce share by mail, ui part 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2016-11-01 19:51:11 +01:00
Lukas Reschke
ef467c3195 Merge pull request #339 from nextcloud/share-types-by-folder 
Add getShareTypesInFolder to optimize folder listening
 2016-11-01 18:44:00 +01:00
Roeland Jago Douma
7e2159e9bb
Add defaultShareProvider & federatedshareprovider tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-01 13:52:37 +01:00
Roeland Jago Douma
fc4d0a86ef
Fix merging backend results 
* Merge share types correctly
* Filter share types
* Order share types

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-01 12:16:05 +01:00
Nextcloud bot
20f45e6fe4
[tx-robot] updated from transifex 2016-11-01 01:06:57 +00:00
Roeland Jago Douma
ce7eb02685
Add remoteprovider getsharesinfolder function 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-10-31 20:26:11 +01:00
Lukas Reschke
8acb54aa0b
Add update support 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-10-31 17:17:47 +01:00
Lukas Reschke
8d83e239f3
Fix tests 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-10-31 17:17:45 +01:00
Lukas Reschke
32cf661215
Use new appstore API 
This change introduces the new appstore API in Nextcloud.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-10-31 17:17:44 +01:00
Robin Appelman
3692769b0a
Add getShareTypesInFolder to optimize folder listening 
Signed-off-by: Robin Appelman <icewind@owncloud.com>
 2016-10-31 15:55:40 +01:00
Lukas Reschke
85016977f4 Merge pull request #1935 from nextcloud/downstream-ldap-26 
Add prefix to the connection
 2016-10-31 09:27:09 +01:00
Lukas Reschke
230dca0065 Merge pull request #1903 from nextcloud/fix-log-in-button 
remove slight transparency of primary action button, ref #1615
 2016-10-31 08:51:09 +01:00
Nextcloud bot
6d2d069c17
[tx-robot] updated from transifex 2016-10-31 01:06:55 +00:00
Marius Blüm
a08a4b5981 Merge pull request #1955 from nextcloud/issue_#1776 
Issue-1776: Add unshare function to 3-dot menu.
 2016-10-30 11:27:57 +01:00
Nextcloud bot
1187a8c183
[tx-robot] updated from transifex 2016-10-30 00:06:56 +00:00
Julia Bode
2d91831b50 Issue-1776: Add unshare function to 3-dot menu. 
Signed-off-by: Julia Bode <julia.bode@lulisaur.us>
 2016-10-29 17:07:06 +02:00
Lukas Reschke
e48fa1c337 Merge pull request #1948 from nextcloud/move_away_lagacy_oc_l10n 
Move away from legacy OC_L10N
 2016-10-29 09:39:22 +02:00
Nextcloud bot
035890aeb1
[tx-robot] updated from transifex 2016-10-29 00:07:14 +00:00
Morris Jobke
a78f6e9586
Use OCP\\IL10N in tests too 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2016-10-28 23:04:36 +02:00
Morris Jobke
48ce0ef19c Merge pull request #1926 from nextcloud/fix-comment-mentions-in-activities 
Fix comment mentions in activities
 2016-10-28 22:47:15 +02:00
Roeland Jago Douma
83e7cfd13a
Fix more tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-10-28 22:16:28 +02:00
Roeland Jago Douma
740659a04c
Move away from OC_L10N 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-10-28 21:46:28 +02:00
Joas Schilling
286482656b
Fix comment mentions in activities 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-10-28 12:32:10 +02:00
Jörn Friedrich Dreyer
f8352fcb8d
introduce callForSeenUsers and countSeenUsers (#26361) 
* introduce callForSeenUsers and countSeenUsers

* add tests

* oracle should support not null on clob

* since 9.2.0
 2016-10-28 08:44:05 +02:00
Nextcloud bot
ad597d498d
[tx-robot] updated from transifex 2016-10-28 00:07:11 +00:00
Morris Jobke
d4969abc9d Merge pull request #1800 from nextcloud/nextcloud-rich-object-strings 
Nextcloud rich object strings
 2016-10-27 15:30:58 +02:00
Juan Pablo Villafáñez
1937e58ec0
Add prefix to the connection 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2016-10-27 13:08:09 +02:00
Nextcloud bot
9984eba727
[tx-robot] updated from transifex 2016-10-27 00:07:01 +00:00
Morris Jobke
cde7f535bd Merge pull request #1738 from nextcloud/comments-provide-displaynames-with-mentions 
comment mentions: show displayname not uid
 2016-10-26 14:02:49 +02:00
Morris Jobke
ffb0e91b60 Merge pull request #1907 from nextcloud/downstream-26164 
Highlight files and update storage stats at end of upload (#26164)
 2016-10-26 13:17:35 +02:00
Nextcloud bot
a973c1bfb9
[tx-robot] updated from transifex 2016-10-26 00:07:12 +00:00
Roeland Jago Douma
1b6ba5ad32 Merge pull request #1911 from nextcloud/downstream-26477 
Fix malformed attribute in files app
 2016-10-25 22:04:43 +02:00
Roeland Jago Douma
d89c1a49c1 Merge pull request #1913 from nextcloud/downstream-26441 
Require to use at least desktop client 2.0 by default
 2016-10-25 22:04:15 +02:00
Arthur Schiwon
b12b52b73b
fix JS test and introduce tests for rendering mentions to displaynames 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2016-10-25 18:33:59 +02:00
Thomas Müller
9df3869bfc
Fix unit tests for BlockLegacyClientPlugin 2016-10-25 18:03:10 +02:00
Thomas Müller
1c39b30d50
Require to use at least desktop client 2.0 by default 2016-10-25 18:01:25 +02:00
Morris Jobke
fa4bf7b0b0 Merge pull request #1906 from nextcloud/downstream-26460 
Remove any detailed information about the exception in the browser er…
 2016-10-25 17:58:19 +02:00
Vincent Petry
e456df14ab
Fix malformed attribute in files app 2016-10-25 17:32:59 +02:00
Vincent Petry
50b8221255
Highlight files and update storage stats at end of upload (#26164) 
Properly trigger the "stop" even from the uploader.
Also update storage stats at the end of all uploads instead of for each
upload.
 2016-10-25 14:51:44 +02:00
Thomas Müller
726994ecae
Remove any detailed information about the exception in the browser error plugin 2016-10-25 14:47:33 +02:00
Morris Jobke
89574367bc Merge pull request #1871 from nextcloud/use-csp-nonces 
Use CSP nonces
 2016-10-25 14:46:00 +02:00
Jan-Christoph Borchardt
cbd9fb3c5c also fix log in button confirm arrow when theming, fix #1615 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2016-10-25 14:24:24 +02:00
Morris Jobke
01a85a98f2 Merge pull request #1876 from nextcloud/shareesAPI_email 
Add ShareesAPI E-mail search
 2016-10-25 13:53:59 +02:00
Morris Jobke
c0adc3c2cf Merge pull request #1883 from nextcloud/downstream-26145 
Storage 503 message improvements
 2016-10-25 13:19:46 +02:00
Jan-Christoph Borchardt
551cffd1b8 remove slight transparency of primary action button, ref #1615 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2016-10-25 13:16:13 +02:00
Nextcloud bot
e23a298a81
[tx-robot] updated from transifex 2016-10-25 09:36:09 +00:00
Morris Jobke
e8c359d86e Merge pull request #1897 from nextcloud/fix-public-button 
fix button on public upload page for mobile
 2016-10-25 11:03:21 +02:00
Joas Schilling
890f752a6b Merge pull request #1452 from nextcloud/appconfig-endpoint 
Appconfig endpoint
 2016-10-25 10:57:48 +02:00
Lukas Reschke
79706e0ddc Merge pull request #1283 from nextcloud/us_files-ui-webdav-upload 
Use Webdav PUT for uploads
 2016-10-25 10:31:03 +02:00
Roeland Jago Douma
60fa82d92f Merge pull request #1860 from ryanwr/feature-sort-favorite 
Sort favorite files first
 2016-10-25 08:22:33 +02:00
Jan-Christoph Borchardt
d4515ae603 fix button on public upload page 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2016-10-24 23:26:56 +02:00
Roeland Jago Douma
c8a13f644e
Only enable files_drop plugin when we actuall do files_drop 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-10-24 21:45:00 +02:00
Roeland Jago Douma
0abcc630a5
Fix public files_drop page 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-10-24 21:45:00 +02:00
Roeland Jago Douma
7a6dbeb398
Make files_drop work 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-10-24 21:45:00 +02:00
Roeland Jago Douma
e73a11d106
Fix permision mask 
If we move a file from the temp part file to the original file we don't
need update permissions.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-10-24 21:45:00 +02:00
Vincent Petry
f374eb5f1d
More fixes to file upload 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-10-24 21:45:00 +02:00
Vincent Petry
f72ffa2f11
Fix js unit tests for webdav put upload changes 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-10-24 21:45:00 +02:00
Vincent Petry
786e858d23
Add support for chunked upload 
Hacked around Blueimp's jquery.fileupload to make it work with our new
chunking API.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-10-24 21:45:00 +02:00
Vincent Petry
c68e273664
Goodbye Iframe transport ! 
Not needed any more in IE >= 11

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-10-24 21:45:00 +02:00
Vincent Petry
59c5be1cc5
Use Webdav PUT for uploads in the web browser 
- uses PUT method with jquery.fileupload for regular and public file
  lists
- for IE and browsers that don't support it, use POST with iframe
  transport
- implemented Sabre plugin to handle iframe transport and redirect the
  embedded PUT request to the proper handler
- added RFC5995 POST to file collection with "add-member" property to
  make it possible to auto-rename conflicting file names
- remove obsolete ajax/upload.php and obsolete ajax routes

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-10-24 21:45:00 +02:00
ryanwr
3e96f33995 Sort favorite files first Issue #1802 
Signed-off-by: Ryan Welch <ryantwr@gmail.com>
 2016-10-24 17:55:47 +01:00
Lukas Reschke
38b3ac8213
Add ContentSecurityPolicyNonceManager 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-10-24 16:35:31 +02:00
Vincent Petry
44cf67accd
Storage 503 message improvements 
"Storage not available" is now "Storage temporarily not available".
Exceptions are now logged in DEBUG level, not FATAL.
 2016-10-24 15:43:15 +02:00
Roeland Jago Douma
a28528a254
Add ShareesAPI E-mail search 
* Allow to search for SHARE_TYPE_EMAIL (4)
* Added tests

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-10-24 14:59:32 +02:00
Joas Schilling
b130267e58
Import the used classes 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-10-24 14:33:54 +02:00
Roeland Jago Douma
b4ebf03bef
Fix tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-10-24 13:25:59 +02:00
Lukas Reschke
9e6634814e
Add support for CSP nonces 
CSP nonces are a feature available with CSP v2. Basically instead of saying "JS resources from the same domain are ok to be served" we now say "Ressources from everywhere are allowed as long as they add a `nonce` attribute to the script tag with the right nonce.

At the moment the nonce is basically just a `<?php p(base64_encode($_['requesttoken'])) ?>`, we have to decode the requesttoken since `:` is not an allowed value in the nonce. So if somebody does on their own include JS files (instead of using the `addScript` public API, they now must also include that attribute.)

IE does currently not implement CSP v2, thus there is a whitelist included that delivers the new CSP v2 policy to newer browsers. Check http://caniuse.com/#feat=contentsecuritypolicy2 for the current browser support list. An alternative approach would be to just add `'unsafe-inline'` as well as `'unsafe-inline'` is ignored by CSPv2 when a nonce is set. But this would make this security feature unusable at all in IE. Not worth it at the moment IMO.

Implementing this offers the following advantages:

1. **Security:** As we host resources from the same domain by design we don't have to worry about 'self' anymore being in the whitelist
2. **Performance:** We can move oc.js again to inline JS. This makes the loading way quicker as we don't have to load on every load of a new web page a blocking dynamically non-cached JavaScript file.

If you want to toy with CSP see also https://csp-evaluator.withgoogle.com/

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-10-24 12:27:50 +02:00
Roeland Jago Douma
f589f1a1d6
Move files_sharing Controllers => Controller 
lib/Controller is the default location for controllers. So lets put them
all in there.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-10-24 11:46:25 +02:00
Roeland Jago Douma
6604e76e94
Fix middleware tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-10-24 09:52:34 +02:00
Roeland Jago Douma
ea07bbc562
Move Share20OCS to ShareAPIController 
It was already a controller just still residing in its old location.

* Moved ShareAPIController to user plain userID instead of user object
* Moved Share20OCS to ShareAPIController
* Removed initisation of class from Application.php and leave it to the
AppFramework
* Fixed tests

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-10-24 09:52:34 +02:00
Lukas Reschke
598c145430 Merge pull request #1849 from nextcloud/oc_26368 
Adding capability about new chunking - refs #25682 (#26368)
 2016-10-22 15:11:49 +02:00
Lukas Reschke
1be6213ba4 Merge pull request #1832 from nextcloud/select2-into-core 
Select2 into core
 2016-10-22 14:35:07 +02:00
Lukas Reschke
169e889890
Add unit test 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-10-22 14:05:53 +02:00
Arthur Schiwon
ab3954745c
avoid that all avatars are copied to the author row when editing comments 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2016-10-21 22:57:06 +02:00
Roeland Jago Douma
7792902808
Fix tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-10-21 21:43:15 +02:00
Thomas Müller
e0d919bbfc
Adding Open Graph Support for public shares http://ogp.me/ 
In case no preview is available we display the ownCloud logo

Fix unit test
 2016-10-21 21:42:40 +02:00
John Molakvoæ
3e5e07aa64
Template css order 
Select2 systemtags removal
Settings again
Fix Script

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2016-10-21 16:56:31 +02:00
Thomas Müller
bf85139f53
Adding capability about new chunking - refs #25682 (#26368) 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-10-21 16:33:37 +02:00
Joas Schilling
0d878f94e6
Add unit tests 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-10-21 09:59:34 +02:00
Morris Jobke
2b76d14330 Merge pull request #1834 from nextcloud/downstream-26186 
Add more files plugins to new DAV endpoint
 2016-10-21 09:44:15 +02:00
Joas Schilling
103bf6dd28
Switch to public API 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-10-21 09:09:26 +02:00
Joas Schilling
0b1fb180a5
Make AppConfig part of the public API 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-10-21 09:09:23 +02:00
Roeland Jago Douma
50b6ee67cb Merge pull request #1806 from nextcloud/karakayasemi_1767 
Update file.php put function posthook calls
 2016-10-21 08:45:51 +02:00
Morris Jobke
2799b0a821 Merge pull request #1835 from nextcloud/downstream-24948 
Move OC\Files\Storage\Shared to the right namespace
 2016-10-20 23:48:15 +02:00
Vincent Petry
73e216e0a7
Add more files plugins to new DAV endpoint (#26186) 
* Add more files plugins to new DAV endpoint

Also fix report plugin to properly retrieve the path from the
prolongated URL

* In case the report is not for this plugin -> simply return to allow other plugins to get executed

* Adjust onReport tests to match new behavior
 2016-10-20 21:36:15 +02:00
Semih Serhat Karakaya
33cee3502a
Update file.php put function posthook calls 
Logicaly, postHooks should emit after touch. For chunking file it is already emitting after touch.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-10-20 21:07:15 +02:00
Morris Jobke
d9aeee2aa1 Merge pull request #1826 from nextcloud/downstream-26391 
Fix post_unshareFromSelf hook parameter format
 2016-10-20 20:44:05 +02:00
Joas Schilling
246bb9f33d
Move OC\Files\Storage\Shared to the right namespace 2016-10-20 20:27:44 +02:00
Morris Jobke
98c8464564 Merge pull request #1821 from nextcloud/downstream-26366 
Code style changes from downstream
 2016-10-20 20:18:47 +02:00
Lukas Reschke
0864f53675 Merge pull request #1796 from nextcloud/oc_fav-report 
Make it possible to filter by tags with REPORT method
 2016-10-20 18:32:51 +02:00
Vincent Petry
d4976e5554
Fix post_unshareFromSelf hook parameter format 
When unsharing from self in a group share situation, the share items
passed to the post_unshareFromSelf hook were using the wrong format in
which the attribute names (ex: "share_type") have non camel-case format.

This fix makes sure that in group sharing case we use the correct
format. It looks like the code was already producing it but in
array_merge it was not using it and adding the unprocessed one.
 2016-10-20 16:09:08 +02:00
Thomas Müller
08d6884107
Sanitize length headers when validating quota 2016-10-20 15:15:48 +02:00
Jan-Christoph Borchardt
5d7e9bb8fc Merge pull request #1768 from nextcloud/more-filepicker 
More filepicker improvements
 2016-10-20 14:46:57 +02:00
Joas Schilling
cf2d1b2427
Move federated share notifications to ROS 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-10-20 12:14:59 +02:00
Morris Jobke
195c53b7a6 Merge pull request #1797 from nextcloud/issue-1791-show-path-on-filename-conflict 
Show the path, when the filename conflicts
 2016-10-20 00:27:54 +02:00
Robin Appelman
67050fd463
fix file exist dialog styling 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-10-19 14:18:21 +02:00
Arthur Schiwon
763a99ec30
consolidate error handling 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2016-10-19 13:56:49 +02:00
Arthur Schiwon
bc18a2900e
fix avatar displaying after submit (either edit or new) 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2016-10-19 12:47:53 +02:00
Roeland Jago Douma
b5599a7673 Merge pull request #1795 from nextcloud/systemtags-activity-wording 
change wording of system tags from un/assigned to more human added/removed
 2016-10-19 12:16:46 +02:00
Joas Schilling
6f2fe8c62a
Show the path, when the filename conflicts 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-10-19 11:33:25 +02:00
Vincent Petry
361f008c70
Make it possible to filter by tags with REPORT method 
Enhanced the REPORT method on the Webdav endpoint and added a
"oc:favorite" filter rule. When set, it will return a flat list of
results filtered with only favorite files.

The web UI was also adjusted to use this REPORT method instead of the
private API endpoint.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-10-19 11:06:29 +02:00
Morris Jobke
e072057dd8 Merge pull request #1740 from nextcloud/issue-1707-big-files-on-32-bits 
Make sure we only use numbers as length
 2016-10-19 11:01:19 +02:00
Jan-Christoph Borchardt
89dd5103cf change wording of system tags from un/assigned to more human added/removed 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2016-10-19 10:50:20 +02:00
Joas Schilling
5e48ce98c7 Merge pull request #1784 from nextcloud/fix-activity-filter-names 
Adjust wording to make the separation between sharing and files more clear
 2016-10-19 09:45:30 +02:00
Joas Schilling
05223a39f9
Make sure we only use numbers as length 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-10-19 09:28:54 +02:00
Arthur Schiwon
185433967e
display avatar (if enabled) alongside displaynames 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2016-10-19 00:34:00 +02:00
Arthur Schiwon
70bd6cafd4
fix regex 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2016-10-19 00:34:00 +02:00
Arthur Schiwon
b21ce6ee5e
improve regex, fixes replacements of usernames with same trunk 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2016-10-19 00:34:00 +02:00
Arthur Schiwon
0e926efc9b
show displayname not uid in commit mentions 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2016-10-19 00:34:00 +02:00
Arthur Schiwon
5d98ab83e9
resolve displayname via manager and registerable resolvers 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2016-10-19 00:34:00 +02:00
Arthur Schiwon
fea3e20a80
move mention extraction to (I)Comment and report mentions via DAV 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2016-10-19 00:33:55 +02:00
Morris Jobke
0c8bd9fa49 Merge pull request #1788 from nextcloud/share-link-whitespace 
add whitespace above share link so it's visually distinguished more
 2016-10-18 20:19:58 +02:00
Jan-Christoph Borchardt
9f2e370ed7 add whitespace above share link so it's visually distinguished more 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2016-10-18 19:43:18 +02:00
Lukas Reschke
b8eea5fcab Merge pull request #1729 from nextcloud/downstream-ldap-3 
[downstream] LDAP empty hardening
 2016-10-18 17:20:15 +02:00
Lukas Reschke
9759f55e50 Merge pull request #1771 from nextcloud/fix-issue-loading-checks-from-cache 
Do not reset the list after adding cached entries
 2016-10-18 17:18:33 +02:00
Joas Schilling
b112493d1a
Adjust wording to make the separation between sharing and files clearer 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-10-18 17:18:14 +02:00
Lukas Reschke
c55a737b26 Merge pull request #1734 from nextcloud/setvalue_opt 
AllConfig setUserValue opt
 2016-10-18 17:16:25 +02:00
Lukas Reschke
0923d2665f Merge pull request #1742 from nextcloud/us_sync-date-of-death 
[oc] Sync deathdate and anniversary to birthday calendar
 2016-10-18 17:14:53 +02:00
Morris Jobke
d366b0eff0 Merge pull request #1774 from nextcloud/ellipsize-sharee 
ellipsize sharee name to not overlap with can edit option on mobile
 2016-10-18 17:03:03 +02:00
Morris Jobke
2bb031ecc6 Merge pull request #1606 from nextcloud/search-detail 
search design details
 2016-10-18 13:48:01 +02:00
Jan-Christoph Borchardt
22f76d96ad ellipsize sharee name to not overlap with 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2016-10-18 11:18:25 +02:00
Jan-Christoph Borchardt
129fdf2e2e Merge pull request #1754 from nextcloud/files-move 
Add file action to move files and folders
 2016-10-18 10:32:46 +02:00
Nextcloud bot
943d9737e4
[tx-robot] updated from transifex 2016-10-18 00:06:51 +00:00
Jan-Christoph Borchardt
2b79490201 use more fitting icon for files move action 2016-10-17 18:52:25 +02:00
Joas Schilling
4d6ec43402
Do not reset the list after adding cached entries 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-10-17 15:43:21 +02:00
Joas Schilling
77a5491d9d
Make sure the UID is correctly cased 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-10-17 13:41:38 +02:00
Morris Jobke
96f8f209b9 Merge pull request #1449 from nextcloud/comments-user-mention 
Notifications for simple @-mentioning in comments
 2016-10-17 09:30:47 +02:00
Nextcloud bot
5b74b3ceaf
[tx-robot] updated from transifex 2016-10-17 00:06:55 +00:00
Arthur Schiwon
dade28cadd
Merge branch 'master' into downstream-ldap-3 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2016-10-16 14:42:16 +02:00
Nextcloud bot
245a8f8fbc
[tx-robot] updated from transifex 2016-10-16 00:06:56 +00:00
Nextcloud bot
00ed841559
[tx-robot] updated from transifex 2016-10-15 00:06:56 +00:00
Robin Appelman
fdc2e8ba56
Add file action to move files and folders 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-10-14 16:23:11 +02:00
Arthur Schiwon
70c7781aa8
apply some polish 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2016-10-14 15:36:05 +02:00
Lukas Reschke
62e19dfa80 Merge pull request #1441 from nextcloud/getby-id-less-queries 
optimize Folder::getById to use less queries
 2016-10-14 15:18:23 +02:00
Thomas Citharel
3b055b160e
fix typo 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2016-10-14 11:48:18 +02:00
Thomas Müller
5cd90d4116
[9.2] Sync deathdate and anniversary to birthday calendar (#25655) 
* Sync deathdate and anniversary to birthday calendar (which should be renamed maybe)

* Sync deathdate and anniversary to birthday calendar (which should be renamed maybe)

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-10-14 10:12:43 +02:00
Nextcloud bot
92c24a91fa
[tx-robot] updated from transifex 2016-10-14 00:07:00 +00:00