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

36423 Commits

Author SHA1 Message Date
Nextcloud bot f50252c7c1
[tx-robot] updated from transifex 2016-12-20 12:02:31 +00:00
Lukas Reschke 089210f2df Merge pull request #2774 from nextcloud/fix-2585 
remove frequent, unimportant log message
 2016-12-20 11:03:54 +01:00
Arthur Schiwon 7887566cff
remove frequent, unimportant log message 
Fixes #2585

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2016-12-19 23:36:11 +01:00
Christoph Wurst 084bddf8ae Merge pull request #2764 from nextcloud/fix-groupshare-sharetimesort 
[downstream] When grouping shares, sort by stime then id (#26777)
 2016-12-19 21:40:42 +01:00
Lukas Reschke 1287e624dd Merge pull request #2762 from nextcloud/add-js-computerFileSize 
[downstream] Add js computer file size
 2016-12-19 20:01:22 +01:00
Vincent Petry 000ba6484f
When grouping shares, sort by stime then id (#26777) 
If share times are equal, the first share should still win instead of
having the shares swapped.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-12-19 17:38:33 +01:00
Patrick Paysant d4c088cb79
Verify input, add more unit tests 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-12-19 17:29:20 +01:00
Patrick Paysant ec4bca619d
Add test for unparseable string 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-12-19 17:29:13 +01:00
Patrick Paysant ff018d48cf
Implements all comments from @PVince81 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-12-19 17:29:05 +01:00
Patrick Paysant 6217393d6a
Adding computerFileSize in OC.Util 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-12-19 17:28:58 +01:00
Lukas Reschke 1afdce9ef8 Merge pull request #2757 from nextcloud/cron-5.6 
Also check in cron for old php version
 2016-12-19 17:22:10 +01:00
Lukas Reschke 2ae15ad37b Merge pull request #2752 from nextcloud/issue-2675-dont-allow-firefox-to-store-the-space 
Use a form so firefox doesn't try to save the space as a password
 2016-12-19 15:38:45 +01:00
Roeland Jago Douma 1741fe0310
Also check in cron for old php version 
Fixes #2756

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-12-19 15:31:24 +01:00
Robin Appelman 16a55d5521 Merge pull request #2754 from nextcloud/activities-manager-publish-exception 
Activities IManager throws an BadMethodCallException
 2016-12-19 15:00:17 +01:00
Lukas Reschke 34fb313466 Merge pull request #2689 from andreas-p/fix-remote-conflict 
Fix showConflict
 2016-12-19 14:34:56 +01:00
Christoph Wurst d5ad642d18
Activities IManager throws an BadMethodCallException 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2016-12-19 14:15:19 +01:00
Joas Schilling eed0eaeb86
Use a form so firefox doesn't try to save the space as a password 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-12-19 12:43:31 +01:00
Roeland Jago Douma 9b71ee27ff Merge pull request #2727 from nextcloud/fix-colon-issue 
[downstream] Fix colon issue
 2016-12-19 10:19:15 +01:00
Roeland Jago Douma 4f79d2ff0d Merge pull request #2721 from nextcloud/ocs-die-on-exception 
[downstream] Die in OCS v1.php on exception
 2016-12-19 08:38:02 +01:00
Roeland Jago Douma f54547ff1c Merge pull request #2723 from nextcloud/integrity-exit-code 
[downstream] Return 1 if integrity check is failed. Fixes #22806
 2016-12-19 08:37:43 +01:00
pflug c7fc010215 Fix showConflict 
use getFullFileName to show conflicting file
add original.directory to make fileExists happy

Signed-off-by: Andreas Pflug <dev@admin4.org>
 2016-12-19 08:11:04 +01:00
Christoph Wurst 8a21fc0908 Merge pull request #2726 from nextcloud/check-all-channels 
[downstream] Consider all channel except blank and git to be signed
 2016-12-18 23:12:57 +01:00
Christoph Wurst c80465a68c Merge pull request #2735 from nextcloud/fix-settingsmenu 
Adjust shadows and fix positioning in header menus
 2016-12-18 20:50:20 +01:00
Julius Haertl 1ad3613307
Adjust shadows and fix positioning 
Signed-off-by: Julius Haertl <jus@bitgrid.net>
 2016-12-17 20:06:19 +01:00
Lukas Reschke ad725de9ad
Update third-party ref for new sabre/uri version 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-12-17 19:42:47 +01:00
Roeland Jago Douma a60479a3d3 Merge pull request #2725 from nextcloud/memcached-connect-once 
[downstream] Set options, then add servers
 2016-12-17 19:31:31 +01:00
Roeland Jago Douma abf302bef8 Merge pull request #2722 from nextcloud/failed-to-create-share-fix 
[downstream] commit transaction after select query
 2016-12-17 19:28:54 +01:00
Roeland Jago Douma dfc17c9ae1 Merge pull request #2720 from nextcloud/fix-25692 
[downstream] Do not validate return code is set is successful
 2016-12-17 19:27:23 +01:00
Vincent Petry 553883a1f4
Add integration test for creating folder with colon 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-12-16 18:16:35 +01:00
Victor Dubiniuk 852de31ecb
Consider all channel except blank and git to be signed 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-12-16 18:07:30 +01:00
Victor Dubiniuk 46a7cb493f
Set options, then add servers 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-12-16 17:56:39 +01:00
Victor Dubiniuk 93a8eba137
Return 1 if integrity check is failed. Fixes #22806 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-12-16 17:48:37 +01:00
phisch fc67606d39
commit transaction after select query 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-12-16 17:44:33 +01:00
Vincent Petry 00f135d320
Die in OCS v1.php on exception 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-12-16 17:35:42 +01:00
Victor Dubiniuk c5754a5ec5
Do not validate return code is set is successful 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-12-16 17:33:28 +01:00
Lukas Reschke b0c1460a1d Merge pull request #2707 from nextcloud/clear_appstore_cache_on_upgrade 
Clear appstore cache on version upgrade
 2016-12-16 17:14:53 +01:00
Roeland Jago Douma f86f4eb98d Merge pull request #2504 from nextcloud/downstream-ldap-15 
Downstream LDAP Range Support
 2016-12-16 16:40:04 +01:00
Lukas Reschke 00b4dedef5 Merge pull request #2550 from nextcloud/smb-notify-rename 
Fix order of parameters when getting notified of smb renames
 2016-12-16 16:11:39 +01:00
Lukas Reschke 058b536aea Merge pull request #2714 from amittel/patch-1 
Changed anchor
 2016-12-16 15:52:06 +01:00
Lukas Reschke 511056dd3f Merge pull request #1678 from nextcloud/smb-stat-root 
Fix mtimes for share root
 2016-12-16 13:41:33 +01:00
Lukas Reschke 9aef75cb36 Merge pull request #2398 from nextcloud/fix-2368 
flicker-free permission change in share dialog
 2016-12-16 13:35:33 +01:00
Lukas Reschke 6fd421cc3c Merge pull request #2695 from nextcloud/remove-leading-slashes-on-share-activity 
Remove leading slash from sharing activity
 2016-12-16 13:20:27 +01:00
Roeland Jago Douma 09d5c557e7 Merge pull request #2715 from nextcloud/fix_dav_toto_tests 
Fix TodoTest
 2016-12-16 12:42:11 +01:00
Roeland Jago Douma 82d76fbe96
Fix TodoTest 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-12-16 11:50:50 +01:00
amittel 14541683e3 Changed anchor 
from `avatar` to `personal-settings`

fixes #2711
 2016-12-16 10:51:01 +01:00
Roeland Jago Douma 4fdefef7e8 Merge pull request #2625 from nextcloud/fix-todo-filter 
Fix the Todos filter
 2016-12-16 08:20:00 +01:00
Roeland Jago Douma 40e0c49b04 Merge pull request #2681 from nextcloud/changes-to-changelog 
let's add a date :D
 2016-12-16 08:14:29 +01:00
Roeland Jago Douma 245501fb0c
Clear appstore cache on version upgrade 
* Add version to cached json
* Compare version
* Updated calls
* Updated tests

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-12-15 22:04:03 +01:00
Jos Poortvliet 46a2e938b3
let's add a date :D 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-12-15 20:35:42 +01:00
Lukas Reschke ee9f46b13f Merge pull request #2698 from nextcloud/dont-disable-apps-on-update-if-at-least-php7 
Don't disable apps on update if PHP >= 7.0.0
 2016-12-15 18:31:54 +01:00