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

36200 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Robin Appelman
97b2782c5b
use public share fileclient when available 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-11-25 19:23:17 +01:00
John Molakvoæ (skjnldsv)
9528045178
Add jquery ui fixes js file 
+ fix autocomplete width (fix #2324)

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2016-11-25 16:44:51 +01:00
Joas Schilling
da9468522b
Add an event merger and use it for the files activities 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-25 15:36:11 +01:00
Joas Schilling
5ba2b1c193
Working towards groups 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-25 15:19:55 +01:00
Morris Jobke
47646794b9 Merge pull request #2322 from nextcloud/compat-with-chrome54 
Remove exception for Chrome on Mobile
 2016-11-25 12:00:56 +01:00
Lukas Reschke
e502a2df48 Merge pull request #2325 from nextcloud/fix-slogan-styling 
Fix styling of slogan on login page for longer text
 2016-11-25 11:58:53 +01:00
Joas Schilling
f067d0ee66
Correctly match the subjects to the parameters 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-25 11:45:40 +01:00
Morris Jobke
64fb0fb3dd Merge pull request #2276 from nextcloud/update-email-address 
Update email address
 2016-11-25 11:40:20 +01:00
Lukas Reschke
29402e2c0a
Exclude pre-release versions as per SemVer 
As SemVer can be used apps could define a release like "10.0.0-alpha". This is something that we don't support at the moment in the server and we should filter all prereleases.

Ref https://github.com/nextcloud/server/pull/2307#issuecomment-262911588

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-11-25 11:32:46 +01:00
Joas Schilling
9f915e061c
Remove old test 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-25 11:17:40 +01:00
Joas Schilling
719b1905d7
Get user name from contacts if available 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-25 11:17:06 +01:00
Julius Haertl
9a3423f25f
Fix styling of slogan on login page for longer text 
Fixes #851

Signed-off-by: Julius Haertl <jus@bitgrid.net>
 2016-11-25 10:43:37 +01:00
Bjoern Schiessle
0de685c562
bring back setEmailAddress for the user management 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2016-11-25 10:26:48 +01:00
Bjoern Schiessle
3fc75073b8
update accounts table if email address or display name changes from outside 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2016-11-25 10:26:47 +01:00
Lukas Reschke
1967b9112c Increase to 11.0.0.4 2016-11-25 09:56:26 +01:00