Commit Graph

19398 Commits

Author SHA1 Message Date
Jörn Friedrich Dreyer 4a855be814 fix logger implementation and test 2014-07-15 10:10:16 +02:00
Björn Schießle 05ba9b3c64 Merge pull request #9539 from enoch85/patch-1
Fix for #9422
2014-07-14 12:58:23 +02:00
Björn Schießle 45c3a948b9 Merge pull request #9572 from owncloud/deleteunsharetooltip
mountType attribute + delete hint fix
2014-07-14 11:50:19 +02:00
Vincent Petry 8cad574379 Merge pull request #9605 from owncloud/sftp-missing-streamwrapper
Re-add missing sftp:// stream wrapper
2014-07-14 11:45:35 +02:00
Vincent Petry dd7529da98 Added mountType attribute and adapted Delete action text
Added mountType attribute for files/folder to indicated whether they are
regular, external or shared.

The client side then adapts the "Delete" action hint text based on this
information.

Only the mount roots must have the delete icon hint adapted.
To make this detectable on the client side, the mountType can now
be null, "shared", "shared-root", "external" or "external-root".

This also gives room to icon customization on the client side.
2014-07-14 10:36:04 +02:00
Vincent Petry e58dce2ee0 Merge pull request #9571 from owncloud/fix_appstore_update_issue
Fix update to button issue
2014-07-14 10:00:39 +02:00
Jenkins for ownCloud 5dd76b510f [tx-robot] updated from transifex 2014-07-14 01:54:27 -04:00
Morris Jobke ec3224aab9 Merge pull request #9563 from owncloud/version-delete-cache
Remove deleted versions from the cache
2014-07-13 18:14:14 +02:00
Jenkins for ownCloud d7b8e3209b [tx-robot] updated from transifex 2014-07-13 01:54:35 -04:00
Andreas Fischer d02604b3fb Add short description explaining how SFTP ext storage class works. 2014-07-12 13:58:49 +02:00
Andreas Fischer c8024934c0 The file providing the sftp:// scheme needs to be included manually. 2014-07-12 13:57:27 +02:00
Jenkins for ownCloud c1e95d62ec [tx-robot] updated from transifex 2014-07-12 01:54:39 -04:00
Thomas Müller f24e18f8df Merge pull request #9597 from owncloud/enc-removelegacytests
Disable legacy encryption tests
2014-07-11 17:11:39 +02:00
Vincent Petry 9fa28aa3f4 Disable legacy encryption tests
It seems these tests are not needed any more, but will now be skipped
instead until the case is cleared out.
2014-07-11 15:20:58 +02:00
Morris Jobke 8dc3c3ed6a Merge pull request #9569 from owncloud/fix-require-of-blowfish-master
[OC8] remove pointless require of Blowfish.php
2014-07-10 21:59:59 +02:00
Georg Ehrke fb685b0856 improve check for duplicate apps 2014-07-10 17:18:10 +02:00
Georg Ehrke 305db9c2d7 add proper version comparision in OC_Installer::isUpdateAvailable 2014-07-10 17:17:55 +02:00
Thomas Müller b8c2e644cc remove pointless require of Blowfish.php 2014-07-10 16:42:21 +02:00
Vincent Petry e391108ebc Merge pull request #9538 from owncloud/fileactions-cleanup
Propagate file action changes to the file lists
2014-07-10 16:15:23 +02:00
Vincent Petry 4d08367b7c Merge pull request #9525 from owncloud/incrementuser2
increment/decrement group and user counts when necessary
2014-07-10 16:09:18 +02:00
Morris Jobke e33ef0d449 Merge pull request #9536 from owncloud/default-app-groups-master
Default app groups master
2014-07-10 15:45:44 +02:00
Robin Appelman aab33b8b0e Remove deleted versions from the cache 2014-07-10 15:19:40 +02:00
Vincent Petry 480f5ddda3 Merge pull request #9516 from owncloud/kill-legacy-encryption-oc8
[OC8] Kill legacy encryption migration
2014-07-10 14:01:06 +02:00
Vincent Petry 7af1a05266 Merge pull request #9519 from owncloud/search-bounce
debounce the search function
2014-07-10 14:00:43 +02:00
Jenkins for ownCloud 77792b5b7e [tx-robot] updated from transifex 2014-07-10 04:59:40 -04:00
Vincent Petry b63e646053 Merge pull request #9460 from owncloud/versions-local
Dont assume local home storage for files_version
2014-07-10 10:28:24 +02:00
Thomas Müller db07c33ecd use .filterAttr() 2014-07-09 16:52:52 +02:00
Thomas Müller 56f029d524 use .filterAttr() 2014-07-09 16:48:26 +02:00
Thomas Müller 899d6eab00 some more cleanup 2014-07-09 16:36:51 +02:00
Thomas Müller b15510ed9a magic strings - bad kungfu 2014-07-09 16:13:33 +02:00
Thomas Müller 506a3400e5 remove the group in case the last user has removed from that group 2014-07-09 15:29:38 +02:00
Daniel Hansson 851c1f87d6 Fix for #9422 2014-07-09 14:40:05 +02:00
Thomas Müller f76deb9f87 fixing JS synatx errors 2014-07-09 14:32:10 +02:00
Arthur Schiwon bdc36461a7 avoid global selector 2014-07-09 14:32:10 +02:00
Arthur Schiwon e2c935d6fb increase/decrease everyone count on user creation/deletion 2014-07-09 14:32:10 +02:00
Arthur Schiwon 5e5a02cc2f decrease user count in affected groups after user delete 2014-07-09 14:30:39 +02:00
Arthur Schiwon a584022ecc increment group counters when a user is created 2014-07-09 14:30:39 +02:00
Thomas Müller 404ac8bcd3 Merge pull request #9534 from owncloud/fix-9532-master
De-double class name
2014-07-09 13:11:58 +02:00
Vincent Petry 22653e21a2 Propagate file action changes to the file lists
Whenever an app needs to register an event late, it does that on the
original file actions object.

Since the file actions that the file list work on is a merged list, not
the original one, the registration event needs to be propagated there as
well.
2014-07-09 12:26:33 +02:00
Thomas Müller 5d2a3c83ac adding 'groups' entry to remote apps 2014-07-09 11:23:17 +02:00
Arthur Schiwon 4e8d52d5d8 test class is already in preferences.php 2014-07-09 10:49:40 +02:00
Thomas Müller 1ae6e1bcf8 fixing typos 2014-07-09 10:20:17 +02:00
Thomas Müller 44ffc7a914 De-double class name 2014-07-09 09:36:36 +02:00
Thomas Müller 63fdaacbfc Merge pull request #9510 from libasys/patch-1
BugFix missing $item on 'file_target' Line 1911
2014-07-09 07:58:37 +02:00
Jenkins for ownCloud 6e2e0108ee [tx-robot] updated from transifex 2014-07-09 01:55:51 -04:00
Thomas Müller 6f35e51ff3 Merge pull request #9528 from owncloud/fix-apostrop
fix apostrophe fixes #9486
2014-07-09 07:42:30 +02:00
Volkan Gezer 2561ef123b fix apostrophe fixes #9486 2014-07-08 21:48:29 +02:00
blizzz 51ee4fc5df Merge pull request #9385 from owncloud/fix-7052
support for AD primary groups
2014-07-08 21:33:50 +02:00
Arthur Schiwon da490bdbbe support for AD primary groups
support for primary groups

actually the problem is only known on AD, it is only needed to take care of their attributes

adjust to ADs special behaviour

this change was not intended

cache the SID value so it is not requested over and over again

theres only one, use singular

we are access

add tests for new Access methods

add tests for new Group methods

address scrutinizer findings, mostly doc

call ldap_explode_dn from ldap wrapper, enables tests without php5-ldap

PHP Doc

yo dawg, i heard you like backslashes … php doc fix

PHPDoc updated and typos fixed while reviewing
2014-07-08 21:32:21 +02:00
Vincent Petry 87adbf1c6e Merge pull request #9515 from owncloud/update-sharecleanupfix
Fix update cleanup to only affect file and folders
2014-07-08 18:09:26 +02:00