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

38360 commits

This branch
This branch
All branches
Author SHA1 Message Date
Lukas Reschke
5ca5ebe584 Merge pull request #2618 from nextcloud/2fa-challenge-text 
Move log out and backup codes link into 2fa box for better readability
 2017-04-11 11:41:55 +02:00
Roeland Jago Douma
8c01e45d6b
Do reload shared views 
Fixes #4248

The magic introduced in #3686 caused the shared views not to be updated
properly. Thus we just overwrite the _onUrlChange method in the
sharedfilelist.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-04-11 09:33:27 +02:00
Morris Jobke
1846e1262d Merge pull request #4289 from nextcloud/maintenance-mode-also-on-dav 
Add missing maintenance plugin to new DAV endpoint
 2017-04-11 00:44:20 -05:00
Morris Jobke
11d6fe1023 Merge pull request #4283 from nextcloud/shares-by-folder-quote 
properly quota table names in getSharesInFolder
 2017-04-10 19:39:19 -05:00
Nextcloud bot
4d90b0520e
[tx-robot] updated from transifex 2017-04-11 00:07:29 +00:00
Lukas Reschke
2f748f625c
Run maintenance mode tests on Drone 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-04-11 01:39:54 +02:00
Lukas Reschke
b882f65fbb
Add integration tests 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-04-11 01:39:54 +02:00
Lukas Reschke
aacbb560ae
Add missing maintenance plugin to new DAV endpoint 
The `/remote.php/dav/` endpoint was not implementing the MaintenancePlugin. Thus when the instance was put into maintenance mode the endpoints were still accessible and delivered empty content. Sync clients really do love this.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-04-11 01:31:57 +02:00
Roeland Jago Douma
3810e89449
[js] Bump blueimp-md5 a major version 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-04-10 20:56:56 +02:00
Roeland Jago Douma
7d1745d1e7
[js] Bump blueimp-md5 
* bumped to latest
* moved to min

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-04-10 20:37:07 +02:00
Morris Jobke
a045f3c4d7 Merge pull request #4146 from nextcloud/unread-comments-folder 
Allow getting the unread comment count for an entire folder at once
 2017-04-10 13:21:39 -05:00
Roeland Jago Douma
a750436ebc Merge pull request #4274 from nextcloud/fix-share-by-mail-capabilities 
move share by mail capabilities to the share provider
 2017-04-10 19:50:13 +02:00
Robin Appelman
a555672f21
properly quota table names in getSharesInFolder 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-04-10 17:59:40 +02:00
Robin Appelman
421ca6439f
use the same oci connectstring in all code paths 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-04-10 17:58:52 +02:00
Bjoern Schiessle
cbacca4202
move capabilities to share by mail app 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-04-10 17:18:13 +02:00
Björn Schießle
18580395d4 Merge pull request #4277 from nextcloud/permissions-mask-scanner 
Dont use the permissions mask while scanning
 2017-04-10 16:04:12 +02:00
Roeland Jago Douma
e9c6fe2fd8 Merge pull request #4222 from nextcloud/dav-search-fileid 
Allow searching file by fileid
 2017-04-10 15:57:56 +02:00
Robin Appelman
a7c611039d
Dont use the permissions mask while scanning 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-04-10 15:19:21 +02:00
Roeland Jago Douma
afea05d296 Merge pull request #4210 from nextcloud/downstream-26643 
Removed path to datadir in exception
 2017-04-10 12:43:46 +02:00
Joas Schilling
87bca38413 Merge pull request #4271 from nextcloud/also-send-the-new-data-with-the-event 
Also send the new account data with the event
 2017-04-10 11:14:39 +02:00
Joas Schilling
9e3a3eebf9
Lowercase "data" correctly 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-10 11:13:46 +02:00
Björn Schießle
235563f0a0 Merge pull request #4250 from nextcloud/disable-lookupserver-upload 
allow admin to disable lookupserver upload
 2017-04-10 11:04:19 +02:00
Lukas Reschke
09c66c93c5 Merge pull request #4266 from nextcloud/fix_missing_owner_on_public_calendars 
don't remove owner property for public calendars
 2017-04-10 10:41:13 +02:00
Joas Schilling
bc217cdf87
Also send the new account data with the event 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-10 10:22:57 +02:00
Bjoern Schiessle
78f0b5c19f
simplify return statement 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-04-10 09:44:23 +02:00
Morris Jobke
d83c8e0271
ThemingDefaults append cacheBusterCounter to logo URL by default 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-04-09 21:43:09 -05:00
Morris Jobke
5b4adf66e5
Move OC_Defaults to OCP\Defaults 
* currently there are two ways to access default values:
  OCP\Defaults or OC_Defaults (which is extended by
  OCA\Theming\ThemingDefaults)
* our code used a mixture of both of them, which made
  it hard to work on theme values
* this extended the public interface with the missing
  methods and uses them everywhere to only rely on the
  public interface

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-04-09 21:43:01 -05:00
Nextcloud bot
d25a96d921
[tx-robot] updated from transifex 2017-04-10 00:08:50 +00:00
Georg Ehrke
c99bdc9eb4
don't remove owner property for public calendars 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2017-04-09 21:20:59 +02:00
Nextcloud bot
16091f4424
[tx-robot] updated from transifex 2017-04-09 00:07:40 +00:00
Nextcloud bot
4b0f50c456
[tx-robot] updated from transifex 2017-04-08 00:07:45 +00:00
Morris Jobke
ca9d25169d Merge pull request #4136 from nextcloud/expire-date-for-all-shares 
Unified sharing options
 2017-04-07 17:14:05 -05:00
Roeland Jago Douma
9adfa60eb3 Merge pull request #4255 from nextcloud/appmenu-tappable 
Increase clickable area of app icon
 2017-04-07 22:29:38 +02:00
Roeland Jago Douma
6c0cafb10f Merge pull request #4253 from nextcloud/downstream-27599 
make JobList::next() lock free
 2017-04-07 22:18:40 +02:00
Roeland Jago Douma
bf30090be5
Parse date trough moment 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-04-07 22:16:29 +02:00
Morris Jobke
8838ed4c2e Merge pull request #4244 from nextcloud/welcome-email 
New layout for welcome email
 2017-04-07 14:52:28 -05:00
Jan-Christoph Borchardt
50609f0d7a Increase clickable area of app icon 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2017-04-07 21:01:22 +02:00
Jan-Christoph Borchardt
637920f669 Fix share dropdown opacity issue 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2017-04-07 20:44:54 +02:00
Jan-Christoph Borchardt
8db3419df1 Fix font-weight of Unshare entry 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2017-04-07 20:31:26 +02:00
Jörn Friedrich Dreyer
c993c363e0
make JobList::next() lock free 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-04-07 13:07:09 -05:00
Morris Jobke
4c60360bf7 Merge pull request #4221 from nextcloud/provisioning-api-for-account-info 
Allow to change account info via provisioning api
 2017-04-07 12:48:44 -05:00
Lukas Reschke
8daf3d4a70
Update autoloader 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-04-07 12:03:47 -05:00
Lukas Reschke
281ad406e8
Add support for theming 
Add support for theming in generated emails and simplify API

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-04-07 12:03:47 -05:00
Lukas Reschke
1be75e8db8
Fix tests 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-04-07 12:03:47 -05:00
Morris Jobke
0560e69913
New layout for welcome email 
* thanks to @espina2 for make this nice design
* the button says "Set password" if the admin didn't specified a password

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-04-07 12:03:32 -05:00
Lukas Reschke
325f925e14 Merge pull request #4249 from nextcloud/dont-force-accept-language-anymore 
Don't force the use of Accept-Language anymore
 2017-04-07 17:05:09 +02:00
Bjoern Schiessle
d5173ac30f
make sure that the selector for the visibility always fits next to 'Profile picture' 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-04-07 16:30:07 +02:00
Bjoern Schiessle
9afd160e66
allow to disable upload to lookup server, by default it is enabled 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-04-07 16:30:07 +02:00
Bjoern Schiessle
11b46389af
adjust to changes in the theming app 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-04-07 15:44:00 +02:00
Bjoern Schiessle
0dc13d098f
reset password field properties before we hide it 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-04-07 15:44:00 +02:00