Mirrors/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2024-08-09 14:13:00 +02:00
Code Issues Actions 34 Packages Projects Releases Wiki Activity
36,072 Commits 385 Branches 1,017 Tags 5.4 GiB
8e361b723c
Commit Graph

36072 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Roeland Jago Douma
8e361b723c
Fix minor mail issues 
* a nextcloud
* Strong username & url

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-30 08:51:50 +01:00
Morris Jobke
224c89c1b8 Remove leftovers from #1929 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2016-11-30 01:07:00 +01:00
Morris Jobke
01867b42d4 Update sharedbymail template 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2016-11-30 01:07:00 +01:00
Felix Epp
6aa79cacfd Fix mail header logo [fixes #1326] 
Signed-off-by: Felix A. Epp <work@felixepp.de>
 2016-11-30 01:06:47 +01:00
Joas Schilling
f9271ebbd6 Merge pull request #2394 from nextcloud/use-displayname-for-sharee-view 
Use displayname instead of username for sharee view
 2016-11-29 14:30:30 +01:00
Morris Jobke
eebef56f4c Merge pull request #2393 from nextcloud/fix-tabheaders-floating 
Fix floating of tabHeader items
 2016-11-29 14:01:33 +01:00
Morris Jobke
e7a146bd62
fix tests 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2016-11-29 13:40:41 +01:00
Roeland Jago Douma
8d81b9e6eb Merge pull request #2389 from nextcloud/fix-ellipsis-breadcrumb 
Fix ellipsis breadcrumb
 2016-11-29 12:40:11 +01:00
Roeland Jago Douma
57b00a1822 Merge pull request #2396 from nextcloud/use-correct-channel 
Use correct channel information
 2016-11-29 12:39:50 +01:00
John Molakvoæ
1d50cab1c6
Use displayname 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2016-11-29 12:17:27 +01:00
Morris Jobke
734dd3a2e6
Use correct channel information 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2016-11-29 11:29:43 +01:00
Julius Haertl
5f5a658e15
Fix floating of tabHeader items 
Signed-off-by: Julius Haertl <jus@bitgrid.net>
 2016-11-29 11:14:20 +01:00
John Molakvoæ (skjnldsv)
60b65cde2b
Fix ellipsis in breadcrumb fix #2387 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2016-11-29 07:14:18 +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