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

37723 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Toledo
aa72f0e612
Add percentage to user's quota info 
* Add percentage to user's quota info

Fixes https://github.com/owncloud/core/issues/24011

* Do not show percentage if the quota is Unlimited

* translate quota

* correct condition and remove print_unescaped

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-19 22:04:55 -06:00
Morris Jobke
0f2ee20885
ownC -> Nextc 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-19 22:02:21 -06:00
Matthew Setter
d4058b73c2
Update the occ:encrypt-all prompt 
The message isn't as clear, nor as succinct, as it could be.
Given that, this commit seeks to address both those points.
This commit was prompted by https://github.com/owncloud/documentation/pull/2835.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-19 22:02:14 -06:00
Jörn Friedrich Dreyer
c96486cfae
test setTagGroups with empty groupids 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-19 22:01:46 -06:00
Jörn Friedrich Dreyer
4e1aca4e3c
don't store empty groupids 
gives an exception on oracle and shouldn't be added in the first place

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-19 22:01:37 -06:00
Felix Heidecke
13718b23e9
trigger event on input autofill 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-19 22:00:58 -06:00
Nextcloud bot
528a903a7b
[tx-robot] updated from transifex 2017-03-20 01:07:43 +00:00
Morris Jobke
540656c716 Merge pull request #3907 from nextcloud/port-more-db-stuff 
Use SystemConfig instead of AllConfig for DB stuff
 2017-03-19 16:29:50 -06:00
Morris Jobke
edd55b0ea9
Use SystemConfig instead of AllConfig for DB stuff 
* preparation for followup PRs to clean up the DB bootstrapping

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-19 15:53:49 -06:00
Morris Jobke
c02527e414 Merge pull request #3927 from nextcloud/minor-fixes 
Namespace and array syntax fixes
 2017-03-19 15:49:38 -06:00
Morris Jobke
d99ce3971b
Namespace and array syntax fixes 
* minor fixes in preparation of a bigger DB and config PR

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-19 14:52:54 -06:00
Roeland Jago Douma
a1f46db793
Fix tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-03-19 21:15:54 +01:00
Roeland Jago Douma
ef789f8480 Merge pull request #3906 from nextcloud/shares-circles-2 
Support Circles
 2017-03-19 20:45:55 +01:00
Roeland Jago Douma
0ad4b89d41
Some code cleanup 
As suggested by the inspector

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-03-19 20:30:46 +01:00
Roeland Jago Douma
4cd13e7668
Don't generate max preview twice 
If you request a preview of X by Y. And after calculating X and Y are
equal to maxWidth and maxHeight then there is no reason to create a
preview of that size.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-03-19 20:23:23 +01:00
Michael Letzgus
14f465879c Fix duplicate id "apps-management" 
Change CSS from #apps-management to .apps-management

Signed-off-by: Michael Letzgus <michaelletzgus@users.noreply.github.com>
 2017-03-19 16:17:26 +01:00
Michael Letzgus
0df6172036 Fix avatar and caret position 
* Avatar image was not vertcially aligned
* The caret was below the avatar
* The surrounding <div> exceeded the title bar

Signed-off-by: Michael Letzgus <michaelletzgus@users.noreply.github.com>
 2017-03-19 15:19:11 +01:00
Roeland Jago Douma
6677963902 Merge pull request #3913 from cwickert/master 
DummyGetResponsePlugin: ownCloud -> Nexcloud
 2017-03-19 14:08:34 +01:00
Michael Letzgus
0b6ff1706f Fix duplicate id "apps-management" 
Make duplicate id "apps-management" a class since IDs must be unique:

https://www.w3.org/TR/2011/WD-html5-20110525/elements.html#the-id-attribute
https://api.jquery.com/id-selector/

Signed-off-by: Michael Letzgus <michaelletzgus@users.noreply.github.com>
 2017-03-19 12:36:29 +01:00
Nextcloud bot
1983606f80
[tx-robot] updated from transifex 2017-03-19 01:08:20 +00:00
Michael Letzgus
98187bf942 Fix value of attribute "autocapitalize" 
Change <input> attribute "autocapitalize" from value "off" to "none" regarding to apples dev guide:

https://developer.apple.com/library/content/documentation/AppleApplications/Reference/SafariHTMLRef/Articles/Attributes.html#//apple_ref/doc/uid/TP40008058-autocapitalize

Signed-off-by: Michael Letzgus <michaelletzgus@users.noreply.github.com>
 2017-03-18 16:06:57 +01:00
Christoph Wickert
07b35b7bae DummyGetResponsePlugin: ownCloud -> Nexcloud 
Signed-off-by: Christoph Wickert <cwickert@suse.de>
 2017-03-18 12:59:25 +01:00
Lukas Reschke
1febf042d8 Merge pull request #3899 from nextcloud/issue-3662-not-sending-is-an-error 
Fail when the test mail could not be sent
 2017-03-18 10:47:57 +01:00
Nextcloud bot
9e1e7dac47
[tx-robot] updated from transifex 2017-03-18 01:07:50 +00:00
Lukas Reschke
3adee0f18b Merge pull request #3898 from nextcloud/issue-3627-always-suggest-cli-url 
Always suggest the overwrite.cli.url
 2017-03-18 00:01:17 +01:00
Maxence Lange
69694012ab shares-circles 
Signed-off-by: Maxence Lange <maxence@nextcloud.com>
 2017-03-17 18:48:33 -01:00
Morris Jobke
3c66ad64e6 Merge pull request #3904 from nextcloud/revert-3893-downstream-27069 
Revert "Add integration test for trashbin"
 2017-03-17 12:06:46 -06:00
Morris Jobke
4a9ce18ced Revert "Add integration test for trashbin" 2017-03-17 12:06:16 -06:00
Morris Jobke
96ea85d01d Merge pull request #3887 from nextcloud/downstream-26379 
Add CleanupRemoteStorages command
 2017-03-17 09:16:19 -06:00
Joas Schilling
26eda9dd58 Merge pull request #3892 from nextcloud/downstream-27101 
Redirect unlink to rmdir
 2017-03-17 13:56:36 +01:00
Joas Schilling
80d2717e5c
Fix 5.6 duplicate class import 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-03-17 13:54:58 +01:00
Joas Schilling
0c0ce25b3c Merge pull request #3881 from nextcloud/downstream-26842 
Backbone Webdav Adapter MKCOL support
 2017-03-17 13:53:04 +01:00
Joas Schilling
4caae91b83
Fail when the test mail could not be sent 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-03-17 13:45:25 +01:00
Joas Schilling
75b81c3e01
Always suggest the overwrite.cli.url 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-03-17 13:40:58 +01:00
blizzz
a5c8016c8b Merge pull request #3883 from nextcloud/downstream-26968 
Ignore exception when deleting keys of deleted user
 2017-03-17 11:33:50 +01:00
Joas Schilling
c65848effe Merge pull request #3878 from nextcloud/downstream-26303 
Fixed failing test which was ignoring a required (not null) column
 2017-03-17 11:10:21 +01:00
Joas Schilling
70bd819dd2
Cleanup test 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-03-17 10:59:53 +01:00
Joas Schilling
2f16f3ba44
Fix unit test 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-03-17 10:39:08 +01:00
Joas Schilling
ebabf81473
Clean up the test 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-03-17 10:35:22 +01:00
Joas Schilling
bd97b7d130
Use DI 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-03-17 10:23:04 +01:00
Roeland Jago Douma
3f331e02f9 Merge pull request #3893 from nextcloud/downstream-27069 
Add integration test for trashbin
 2017-03-17 10:10:00 +01:00
Joas Schilling
e548d27d3a Merge pull request #3885 from nextcloud/downstream-26529 
Skip FailedStorage in background scan
 2017-03-17 10:06:58 +01:00
Joas Schilling
5a8129f8ef Merge pull request #3886 from nextcloud/downstream-26995 
Chunking NG: Assemble in natural sort order of files
 2017-03-17 10:05:25 +01:00
Joas Schilling
199405ddc0
Safer queries 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-03-17 09:59:56 +01:00
Joas Schilling
0a1135a7cc
Better output 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-03-17 09:59:25 +01:00
Joas Schilling
d504408efd Merge pull request #3894 from nextcloud/downstream-27008 
Integration test check download without saving file locally
 2017-03-17 09:17:36 +01:00
Joas Schilling
e8750f618b
Correctly escape the footer description from theming 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-03-17 09:11:41 +01:00
Roeland Jago Douma
51846c95d9 Merge pull request #3856 from nextcloud/escape-likes-in-database-user-backend 
Escape like parameters in database user backend
 2017-03-17 08:53:10 +01:00
Roeland Jago Douma
57fc7f60d3
Update autoloader 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-03-17 08:51:03 +01:00
Roeland Jago Douma
85601259fb
Add LegacyHooks 
Use a helper class to listen to the eventDispatcher calls from the share
manager to emit the old \OC_Hooks

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-03-17 08:50:56 +01:00