mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
39,284 Commits 349 Branches 696 Tags 1.6 GiB
Commit Graph

39284 Commits

Author SHA1 Message Date
Joas Schilling fdfe8f7f15
Adjust version requirement 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-05-22 10:32:05 +02:00
Roeland Jago Douma 9f91fd95c0
We are working on 13 now! 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-05-22 08:40:38 +02:00
Roeland Jago Douma 43eb424da1 Merge pull request #5009 from nextcloud/update-acceptance-tests-for-issue-4921 
Update acceptance tests for issue #4921
 2017-05-22 08:36:11 +02:00
Nextcloud bot 462f12611c
[tx-robot] updated from transifex 2017-05-22 00:08:23 +00:00
Lukas Reschke 1db93ec7c5 Merge pull request #5007 from nextcloud/fix_scss_cache 
Fix scss cache
 2017-05-21 22:52:24 +02:00
Roeland Jago Douma 3cec5ee8c5
Increase version 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-05-21 22:11:02 +02:00
Roeland Jago Douma 32f5c028a0
Set SCSS dependencies to memcache on compile 
Else when an upgrade happens we will recompile all the SCSS files all
the time (until the cache expires).

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-05-21 22:10:00 +02:00
Lukas Reschke 5b39c6fdd0
v12.0.0 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-05-21 17:11:12 +02:00
Daniel Calviño Sánchez 41412088db Update acceptance tests for issue #4921 
Acceptance tests opened the details view by clicking on the middle of
the file row, but due to the changes made in issue #4921 that now opens
the file instead; this commit updates the acceptance tests to open the
details view through the "Details" item in the file actions menu.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2017-05-21 14:45:43 +02:00
Morris Jobke 6521b6e9a0 Merge pull request #4983 from nextcloud/master-oauth-not-disable 
Mark OAuth app as always enabled
 2017-05-20 19:11:56 -05:00
Nextcloud bot c677f49469
[tx-robot] updated from transifex 2017-05-21 00:08:26 +00:00
Morris Jobke 2dbd389bdb Merge pull request #4997 from nextcloud/federated-share-fix 
fix for sharing
 2017-05-20 17:01:15 -05:00
Morris Jobke 0dae4946cf Merge pull request #4854 from michaelletzgus/deferred-script-loading-v2 
Make page loading faster, deferred script loading, now switchable:
 2017-05-20 16:53:30 -05:00
Lukas Reschke 7a8bd73547 Fix tests 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-05-20 16:38:32 -05:00
Lukas Reschke dfe944c272 Merge pull request #4995 from nextcloud/master-version-dump 
12.0.0RC3
 2017-05-20 20:31:32 +02:00
Daniel Hansson 119e8474b6 fix for sharing 
Signed-off-by: Daniel Hansson <daniel@techandme.se>
 2017-05-20 16:23:04 +02:00
Lukas Reschke 2bbf623aeb
12.0.0RC3 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-05-20 14:21:05 +02:00
Michael Letzgus fb9f13d4c1 Make page loading faster by deferred script loading: 
* Create generalized function for emmitting <script defer src=""> tags to templates
* Remove type attribute from inline_js
* Add defer attribute to external <script> tags

Signed-off-by: Michael Letzgus <michaelletzgus@users.noreply.github.com>
 2017-05-20 13:44:04 +02:00
Nextcloud bot a442c86a84
[tx-robot] updated from transifex 2017-05-20 00:08:27 +00:00
Lukas Reschke 3487f62d55 Mark OAuth app as always enabled 
At the moment we don't support disabling the OAuth app

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-05-19 17:24:41 -05:00
Morris Jobke fe8c67ad23 Merge pull request #4981 from nextcloud/fix-missing-argument-2-getAppContainer-master 
Fix missing argument 2 for Settings classes
 2017-05-19 17:05:49 -05:00
Joas Schilling a411adee6c
Fix missing argument 2 for Settings classes 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-05-19 22:32:50 +02:00
Björn Schießle d7eb58f09d Merge pull request #4943 from nextcloud/rename-secure-drop 
rename secure drop back to files drop
 2017-05-19 21:56:36 +02:00
Lukas Reschke 5cecaae91f Merge pull request #4974 from nextcloud/fix-hidden-sidebar 
Fixes visible sidebar even if hidden is applied
 2017-05-19 21:48:32 +02:00
Lukas Reschke 2e10812898 Merge pull request #4972 from nextcloud/fix-group-restriction 
Fix group restriction regression
 2017-05-19 21:46:10 +02:00
Lukas Reschke 86a790a544
12.0.0RC2 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-05-19 21:18:51 +02:00
Lukas Reschke c1c676f602 Merge pull request #4910 from nextcloud/make-the-logo-smaller-cream 
Fix logo being too big on log in page, fix #4585
 2017-05-19 20:50:09 +02:00
Morris Jobke 3636672fa5 Fixes visible sidebar even if hidden is applied 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-05-19 13:03:54 -05:00
Morris Jobke c7ade85982 Fix group restriction regression 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-05-19 12:05:09 -05:00
Roeland Jago Douma 7eb8b3cec1 Merge pull request #4956 from nextcloud/endless-loop-on-invalid-asset 
Stop infinit loop on invalid settings css/js file
 2017-05-19 16:51:49 +02:00
Lukas Reschke 494cd2de5f Merge pull request #4970 from franga2000/patch-1 
Fixed typo
 2017-05-19 16:19:52 +02:00
Julius Härtl 52f10c436e
Scale logo only for custom ones 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-05-19 16:18:09 +02:00
Miha Frangez 0d6493a0c7 Fixed typo 2017-05-19 15:58:13 +02:00
Joas Schilling bcddca9a64 Merge pull request #4905 from nextcloud/auto-di-for-apps-without-app.php 
Allow automatic DI for apps that don't register the container in app.php
 2017-05-19 13:48:01 +02:00
Lukas Reschke dd29e5ab9d Merge pull request #4950 from nextcloud/master-workaround-4948 
Lowercase the scriptname again
 2017-05-19 12:37:32 +02:00
Joas Schilling 4792867357
Stop infinit loop on invalid settings css/js file 
Don't try to find dirname of false...

Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-05-19 11:41:08 +02:00
Morris Jobke 770f37a01c Merge pull request #4951 from nextcloud/transifex-oauth2 
Add oauth2 to transifex
 2017-05-18 19:11:28 -05:00
Morris Jobke f53c6b146c Add oauth2 to transifex 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-05-18 19:10:55 -05:00
Nextcloud bot e24105feba
[tx-robot] updated from transifex 2017-05-19 00:08:26 +00:00
Lukas Reschke eab9468109
Lowercase the scriptname again 
Ref https://github.com/nextcloud/server/issues/4948

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-05-19 01:59:00 +02:00
Lukas Reschke 44c9080f51
12.0.0RC1 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-05-19 00:59:34 +02:00
Lukas Reschke 7976927628 Merge pull request #4894 from nextcloud/generic-security-activities 
Change 2FA activities to more generic security activities
 2017-05-19 00:50:44 +02:00
Lukas Reschke 8c624bdef9 Merge pull request #4792 from nextcloud/fix-storage-wrappers-on-scanner 
Make sure we use the passed-in storage when there is one
 2017-05-19 00:49:58 +02:00
Lukas Reschke 0eb4970ec8 Merge pull request #4704 from nextcloud/add-oauth-code-flow-support 
Add oauth code flow support
 2017-05-18 23:30:44 +02:00
Lukas Reschke c605472950 Merge pull request #4888 from nextcloud/theming-fallback-icons 
Fallback to default favicon
 2017-05-18 23:30:02 +02:00
Lukas Reschke 10930c9ff2 Merge pull request #4813 from nextcloud/accounts-table-migration-from-owncloud 
Add a migration step to save the data from the accounts table before …
 2017-05-18 22:31:36 +02:00
Roeland Jago Douma 19a1e01d6c
Update autoloader 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-05-18 22:11:29 +02:00
Roeland Jago Douma e43649e67e
Fix tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-05-18 22:10:57 +02:00
Christoph Wurst 258c8720dd
Fix backup codes activity type 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2017-05-18 22:10:57 +02:00
Christoph Wurst 58683f11ac
Publish 2fa backup codes activities to the right stream 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2017-05-18 22:10:57 +02:00