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

36061 commits

This branch
This branch
All branches
Author SHA1 Message Date
Morris Jobke
e7a146bd62
fix tests 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2016-11-29 13:40:41 +01:00
John Molakvoæ
1d50cab1c6
Use displayname 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2016-11-29 12:17:27 +01:00
Nextcloud bot
e8ea9a5d27
[tx-robot] updated from transifex 2016-11-29 01:06:47 +00:00
Christoph Wurst
ee0bb6e17b Merge pull request #2386 from nextcloud/fix-iphone-and-ipad 
Fix Regex for iPhone and add iPad
 2016-11-29 00:00:53 +01:00
Roeland Jago Douma
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
Lukas Reschke
9dead382ef
Fix Regex for iPhone and add iPad 
The previous Regex worked for an iPhone with version "10.0" but not with "10.0.1" which was wrong. I modified the Regex to also match for those situations.

I also added a Regex for the iPad

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-11-28 18:42:49 +01:00
blizzz
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
Joas Schilling
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
Lukas Reschke
d2fab66d49 Merge pull request #2375 from Morlinest/patch-1 
Mark all content in search field
 2016-11-28 17:19:25 +01:00
Lukas Reschke
708810c488 Merge pull request #2380 from nextcloud/make-it-beta-2 
Increase version to Beta 2
 2016-11-28 17:18:05 +01:00
Morris Jobke
587f28ad42 Merge pull request #2378 from nextcloud/fix-preview-image_src 
Fix image_src link
 2016-11-28 17:03:25 +01:00
Lukas Reschke
05c4d28d8d
Increase version to Beta 2 
Just as a precaution already so we can easily ship this via the updater to the beta channel properly to Beta 1 users

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-11-28 16:22:24 +01:00
Lukas Reschke
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
Morris Jobke
a12d2e67e7 Merge pull request #2335 from nextcloud/grouping-for-activities 
Bring back grouping for activities
 2016-11-28 16:18:02 +01:00
Morlinest
27cbaad96a Mark all content in search field 
To resolve issue #2310
 2016-11-28 15:06:02 +01:00
Lukas Reschke
183bee9b67 Merge pull request #2342 from nextcloud/filepicker-shadow 
Fix filepicker styling
 2016-11-28 15:00:19 +01:00
Joas Schilling
6cd02a7f43 Merge pull request #2367 from nextcloud/issue-2349-keep-filemtime-for-zip-downloads 
Keep the filemtime for files when downloading them in a zip/tar
 2016-11-28 14:56:18 +01:00
Joas Schilling
6b8c45d05a
Add doc block for $time 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-28 14:26:30 +01:00
Robin Appelman
b2b9abfa33
move more sizing logic to css 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-11-28 14:05:46 +01:00
Lukas Reschke
3950ce9223 Merge pull request #2351 from nextcloud/remember-session-default 
do not remember session tokens by default
 2016-11-28 14:05:04 +01:00
Lukas Reschke
0cc771ce19 Merge pull request #2353 from nextcloud/renew-session-token-remember 
copy remember-me value when renewing a session token
 2016-11-28 14:04:13 +01:00
Lukas Reschke
518e2edba4 Merge pull request #2341 from nextcloud/filepicker-public-share 
use public share fileclient when available
 2016-11-28 13:58:07 +01:00
Robin Appelman
7ac240f6f2
fix dialog to window using css 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-11-28 13:49:45 +01:00
Robin Appelman
26af409a6e
center dialog using css 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-11-28 13:44:27 +01:00
Morris Jobke
d02296d42f Merge pull request #2363 from nextcloud/fix-2329 
open popup menu in share dialog only for one sharee on render
 2016-11-28 12:54:51 +01:00
Lukas Reschke
ddea6d1a90 Merge pull request #2365 from nextcloud/resize-the-controls-after-the-sidebar-slided-in 
Make sure the controls is resized after the sidebar disappeared
 2016-11-28 12:50:37 +01:00
Björn Schießle
43aeab9b92 Merge pull request #2336 from nextcloud/fix-share-by-mail-permissions 
bring back permissions for mail shares
 2016-11-28 12:41:06 +01:00
Björn Schießle
e8764e53ba Merge pull request #2366 from nextcloud/phpdoc-hintexception 
add missing phpdoc to HintException
 2016-11-28 12:25:33 +01:00
Joas Schilling
d2ff6c569e
Keep the filemtime for files when downloading them in a zip/tar 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-28 11:36:10 +01:00
Arthur Schiwon
9f3031f58a
add missing phpdoc to HintException 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2016-11-28 11:34:23 +01:00
Bjoern Schiessle
e5c31b72e1
bring back permissions for mail shares 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2016-11-28 11:24:05 +01:00
Joas Schilling
65c03c26ea
Make sure the controls is resized after the sidebar disappeared 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-28 11:23:05 +01:00
Björn Schießle
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
Arthur Schiwon
1965617a2f
open popup menu in share dialog only for one sharee on render 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2016-11-28 10:56:22 +01:00
Nextcloud bot
ca7b9e5490
[tx-robot] updated from transifex 2016-11-28 09:51:57 +00:00
Nextcloud bot
9208e03219
[tx-robot] updated from transifex 2016-11-28 09:31:02 +00:00
Morris Jobke
1887fd32f1 Merge pull request #2361 from nextcloud/2fa-backup-codes-undefined-index 
fix undefined index error when the backup codes provider is not active
 2016-11-28 10:23:30 +01:00
Christoph Wurst
6543182d13 fix parameter order 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2016-11-28 10:00:53 +01:00
Christoph Wurst
ad610ae772 Merge pull request #2327 from nextcloud/exclude-pre-releases 
Exclude pre-release versions as per SemVer
 2016-11-28 09:55:24 +01:00
Christoph Wurst
2f36920ddf fix undefined index error when the backup codes provider is not active 
In users have not created backup codes yet the app is not enabled for that user
and therefore we got an undefined index error because the code assumed it was
always there. It now properly returns null.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2016-11-28 08:48:57 +01:00
Nextcloud bot
4e682d4113
[tx-robot] updated from transifex 2016-11-28 01:06:56 +00:00
Christoph Wurst
2183a1f3e6 copy remember-me value when renewing a session token 
On renew, a session token is duplicated. For some reason we did
not copy over the remember-me attribute value. Hence, the new token
was deleted too early in the background job and remember-me did
not work properly.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2016-11-27 14:19:57 +01:00
Christoph Wurst
9b808c4014 do not remember session tokens by default 
We have to respect the value of the remember-me checkbox. Due to an error
in the source code the default value for the session token was to remember
it.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2016-11-27 14:03:28 +01:00
Joas Schilling
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
Nextcloud bot
9788cf04ee
[tx-robot] updated from transifex 2016-11-27 01:07:08 +00:00
Felix A. Epp
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
Nextcloud bot
8f4ec8583d
[tx-robot] updated from transifex 2016-11-26 01:06:57 +00:00
Morris Jobke
789e6e7363 Merge pull request #2340 from nextcloud/autocomplete-max-width-to-input 
Add jquery ui fixes js file + fix autocomplete width
 2016-11-25 23:49:37 +01:00
Robin Appelman
a8ce10bba3
limit filepicker height to screen 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-11-25 20:54:08 +01:00
Robin Appelman
f4d79485d7
fix styling of filepicker dialog 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-11-25 20:54:08 +01:00