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

39504 commits

This branch
This branch
All branches
Author SHA1 Message Date
Marin Treselj
9d25b86a83
Add viewport to all core/img/places/* icons. 
Also removed some unneeded style declarations.

Signed-off-by: Marin Treselj <marin@pixelipo.com>
 2017-06-17 09:32:59 +02:00
Marin Treselj
40c1f3e3ce
Add white version of the calendar.svg icon 
There's no reason for not including it and it is needed for Deck app.

Signed-off-by: Marin Treselj <marin@pixelipo.com>
 2017-06-16 23:06:25 +02:00
Robin Appelman
cc0ff6f5e3 Merge pull request #5177 from Bekcpear/master 
Fix upload remaining time
 2017-06-16 14:11:55 +02:00
Joas Schilling
698a7cb7f0 Merge pull request #5124 from nextcloud/allow-dirlisting-with-unreadable-items 
Allow dir-listing also when one child is blocked by access control
 2017-06-16 10:47:08 +02:00
Bekcpear
2a1681510b update core.js 
Signed-off-by: Yaojin Qian <i@ume.ink>
 2017-06-16 15:36:09 +08:00
Bekcpear
8267e5e007 Fix uploadrate value of 'original-title' attribute 
The unit of `data.bitrate` is bit, but the argument unit of
`humanFileSize` function is byte, so it should be divided by 8.

Signed-off-by: Yaojin Qian <i@ume.ink>
 2017-06-16 15:35:51 +08:00
Bekcpear
82e263ed04 Fix upload remaining time 
The upload remaining time is always 'a few second' whatever a big or a
small file uploading.
This commit fixes it. The `new Date().getMilliseconds()` only return a
three digits number. When time arrived the next second, the millisecond
start from ZERO again. So `new Date().getTime()` is the righe choice.
And remaining time variables shoule be initialized when the file starts
uploading, otherwise the remaining time of a new upload will always be
'Infinity years' until you refresh the page.

Signed-off-by: Yaojin Qian <i@ume.ink>
 2017-06-16 15:33:10 +08:00
Nextcloud bot
74654288e6
[tx-robot] updated from transifex 2017-06-16 00:08:44 +00:00
Morris Jobke
5bf447649d Merge pull request #5421 from nextcloud/5190-master 
[master] Treat PHP Errors on User session regenerate
 2017-06-15 10:11:56 -05:00
blizzz
8ccc2e2758 Merge pull request #5396 from nextcloud/gpx-mimetype 
add gpx mimetype
 2017-06-15 13:23:32 +02:00
Arthur Schiwon
d1a8269de3
Forward port of #5190 to master 
Treat PHP Errors on User session regenerate

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>

remove unnecessary lines…

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>

change PHP errors to ErrorException in the session (PHP >=7)

Otherwise it might be that authentication apps are being disabled on
during operation while in fact the session handler has hiccup.

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-06-15 11:20:49 +02:00
Morris Jobke
ca3c69c8ae Merge pull request #5298 from nextcloud/bugfix/4885/calendar_shares_url_special_char_issue 
urldecode group principals in Cal- and CardDAV backend
 2017-06-14 23:10:40 -05:00
Morris Jobke
ac565cecad Merge pull request #5300 from nextcloud/bugfix/noid/fix_proppatch_requests_to_groupshares 
allow users to send PropPatch request when calendar is group-shared with them
 2017-06-14 23:00:39 -05:00
Morris Jobke
db14089d6c Merge pull request #5375 from nextcloud/share-folder-for-remote-shares 
Use the share_folder config for remote shares
 2017-06-14 22:42:06 -05:00
Nextcloud bot
7a269ae872
[tx-robot] updated from transifex 2017-06-15 00:08:40 +00:00
Morris Jobke
2398d40d98 Merge pull request #5384 from nextcloud/allow-to-share-to-local-users-via-email 
Allow to find local users by their email address
 2017-06-14 18:03:24 -05:00
Morris Jobke
fc47d0bbaa Merge pull request #5244 from nextcloud/dynamic-percentual-appmenu-limit 
Now using dynamic percentual appmenu limit
 2017-06-14 11:36:04 -05:00
Morris Jobke
8eb955d5c6 Merge pull request #4993 from michaelletzgus/emit_css-tags 
Emit css tags
 2017-06-14 11:29:25 -05:00
Joas Schilling
f28511cac6
Add unit test 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-06-14 15:32:34 +02:00
Joas Schilling
4f98852f52
Make sure to only add system users once 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-06-14 15:07:21 +02:00
Joas Schilling
07bfedb062 Merge pull request #5409 from nextcloud/1param2much 
a parameter too much
 2017-06-14 14:47:56 +02:00
Joas Schilling
da95d4bcf1 Merge pull request #5400 from nextcloud/fix/contactsmenu-l10n-search-placeholder 
Localize contacts menu search input placeholder
 2017-06-14 14:44:54 +02:00
Arthur Schiwon
ed49d9b9ed
a parameter too much 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-06-14 14:41:30 +02:00
Lukas Reschke
3cacd4156f Merge pull request #5013 from nextcloud/update-integration-tests-composer-cache 
Update integration tests composer cache
 2017-06-14 14:22:24 +02:00
Lukas Reschke
a7abac5897 Merge pull request #5392 from nextcloud/maintenance-mode-style 
Use the guest.css for the maintenance page as well
 2017-06-14 14:11:28 +02:00
Arthur Schiwon
0f92a2c6fd
bycatch, x-ldif entry was missing 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-06-14 11:47:44 +02:00
Arthur Schiwon
4d692b6966
add location filetype icon 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-06-14 11:46:00 +02:00
Julius Härtl
cec2893d3b
Show at least 8 icons, don't use percentage on mobile 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-06-14 11:14:04 +02:00
Arthur Schiwon
c1d9565131
added kml, kmz, tcx types as well while at it 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-06-14 11:02:05 +02:00
Arthur Schiwon
addcda9325
add geospatial mime types repair step 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-06-14 10:48:56 +02:00
blizzz
f3f3d077ae Merge pull request #5207 from nextcloud/ldap-remove-userwebdavauth-check 
remove check, user_webdavauth is not an app anymore for long
 2017-06-14 10:32:14 +02:00
Christoph Wurst
64d39aad25 Localize contacts menu search input placeholder 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2017-06-14 10:29:36 +02:00
Lukas Reschke
b76e43e0a3 Merge pull request #5361 from nextcloud/exclude-files-external-dir-from-encryption 
don't try to encrypt/decrypt the certificate bundle
 2017-06-14 09:50:45 +02:00
Morris Jobke
57fb36b6ae
Update integration tests composer cache 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-06-14 09:37:47 +02:00
Nextcloud bot
dc61fb999d
[tx-robot] updated from transifex 2017-06-14 00:08:39 +00:00
Morris Jobke
f38f2baa5a Merge pull request #5295 from nextcloud/bugfix/5077/allow_proppatches_to_birthday_calendar 
allow PropPatch requests to contact_birthdays
 2017-06-13 18:11:13 -05:00
Morris Jobke
0b92700b52 Merge pull request #5072 from mjmunger/master 
Fixed a crash caused by Local::copyFromStorage() not conforming to Co…
 2017-06-13 17:51:16 -05:00
Morris Jobke
262e6fc1b0 Merge pull request #5061 from nextcloud/example-theme-guest 
Fix example theme
 2017-06-13 17:48:05 -05:00
Arthur Schiwon
6538302daa
add gpx mimetype 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-06-14 00:26:01 +02:00
Morris Jobke
0f83cdc78e Use the guest.css for the maintenance page as well 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-06-13 16:43:25 -05:00
Morris Jobke
101d1c0f81 Merge pull request #5367 from nextcloud/better-share-error 
Better error message on invalid sharing link
 2017-06-13 14:59:38 -05:00
Morris Jobke
69fd3a3c7b Merge pull request #5380 from nextcloud/global-scale-settings 
fix "add to your nextcloud" input field
 2017-06-13 14:41:32 -05:00
Morris Jobke
c4bb37b4ee Merge pull request #5383 from nextcloud/revert-5259 
Revert "allow admin to disable groups on personal page"
 2017-06-13 14:39:02 -05:00
Morris Jobke
e7b5c5c268 Merge pull request #5372 from nextcloud/we-shall-monkey-patch-auth-headers-for-clients-that-dont-follow-specs 
Prevent sending second WWW-Authenticate header
 2017-06-13 12:36:31 -05:00
Morris Jobke
eafaa2f238 Merge pull request #5378 from patschi/fix-5349 
Fix #5349, no themed icon when dragging folder
 2017-06-13 12:21:17 -05:00
Morris Jobke
666e4de55f Merge pull request #5305 from nextcloud/add-quota-to-files-view 
Add quota to the files view
 2017-06-13 12:19:27 -05:00
Joas Schilling
0f8c1b13a3
Fix unknown share token 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-06-13 18:44:50 +02:00
Joas Schilling
ae693129db
Allow to find local users by their email address 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-06-13 18:07:47 +02:00
Bjoern Schiessle
2b3549610b
fix 'add to your nextcloud' input field, this is not an email address 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-06-13 17:46:46 +02:00
Morris Jobke
8760abae63 Revert "allow admin to disable groups on personal page" 
This reverts commit 28e1a9da6c.

See #5259
 2017-06-13 10:43:21 -05:00