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

36199 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Roeland Jago Douma
2fd1cf2e92
Ignore AppData in encryption wrapper 
Fixes part of #2407

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-29 22:01:04 +01:00
Roeland Jago Douma
66a77a8857
Fix js tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-29 20:48:03 +01:00
Roeland Jago Douma
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
Christoph Wurst
83cef4e764 Merge pull request #2412 from nextcloud/filepicker-bottom-padding-fix 
Fix #2408
 2016-11-29 19:30:15 +01:00
Nextcloud bot
0fb912e724
[tx-robot] updated from transifex 2016-11-29 17:57:47 +00:00
Lukas Reschke
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
John Molakvoæ
506c9815ac
Fix #2408 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2016-11-29 18:36:49 +01:00
Nextcloud bot
a84dacc16f
[tx-robot] updated from transifex 2016-11-29 17:03:24 +00:00
Morris Jobke
d86b29b42b Merge pull request #2066 from nextcloud/fix-redirect-double-encoding 
do not double encode the redirect url
 2016-11-29 17:21:43 +01:00
Morris Jobke
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
Arthur Schiwon
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
Morris Jobke
7780e45348 Merge pull request #2388 from nextcloud/share-table-ellipsis 
Fix whitespace between sharee name and icons #2384
 2016-11-29 16:56:16 +01:00
Morris Jobke
69db58250a
Execute MoveAvatars repair step only once 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2016-11-29 16:55:13 +01:00
Joas Schilling
e86ea95043 Merge pull request #2404 from nextcloud/streamresponse-warning 
prevent warning in StreamResponse
 2016-11-29 16:36:01 +01:00
Joas Schilling
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
Joas Schilling
8d87e39146
Deduplicate icon assignment 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-29 16:08:58 +01:00
Joas Schilling
9b62302f7d
Add viewbox to the icons 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-29 15:48:16 +01:00
Joas Schilling
ddc82b4ca2
Move calendar activity parsing to new API 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-29 15:47:43 +01:00
Robin Appelman
72a54ff9de
prevent warning in StreamResponse 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-11-29 15:29:02 +01:00
Joas Schilling
a16fd3991a
Move CalDAV activity settings to new API 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-29 15:06:54 +01:00
Joas Schilling
253a75e5ae
Move CalDAV activity filters to new API 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-29 15:04:08 +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
John Molakvoæ (skjnldsv)
bd18349f46
Fix mobile view 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2016-11-29 13:47:37 +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)
ab751277a1
Fix username width 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2016-11-29 10:51:35 +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
John Molakvoæ (skjnldsv)
a984f4b430
Fix #2384 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2016-11-29 07:06:41 +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