summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* fix logger implementation and testJörn Friedrich Dreyer2014-07-152-2/+2
|
* Merge pull request #9539 from enoch85/patch-1Björn Schießle2014-07-141-14/+11
|\ | | | | Fix for #9422
| * Fix for #9422Daniel Hansson2014-07-091-14/+11
| |
* | Merge pull request #9572 from owncloud/deleteunsharetooltipBjörn Schießle2014-07-145-5/+30
|\ \ | | | | | | mountType attribute + delete hint fix
| * | Added mountType attribute and adapted Delete action textVincent Petry2014-07-145-5/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | Merge pull request #9605 from owncloud/sftp-missing-streamwrapperVincent Petry2014-07-141-0/+15
|\ \ \ | |/ / |/| | Re-add missing sftp:// stream wrapper
| * | Add short description explaining how SFTP ext storage class works.Andreas Fischer2014-07-121-0/+4
| | |
| * | The file providing the sftp:// scheme needs to be included manually.Andreas Fischer2014-07-121-0/+11
| | |
* | | Merge pull request #9571 from owncloud/fix_appstore_update_issueVincent Petry2014-07-142-9/+3
|\ \ \ | | | | | | | | Fix update to button issue
| * | | improve check for duplicate appsGeorg Ehrke2014-07-101-7/+2
| | | |
| * | | add proper version comparision in OC_Installer::isUpdateAvailableGeorg Ehrke2014-07-101-2/+1
| | |/ | |/|
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-07-1420-68/+75
| | |
* | | Merge pull request #9563 from owncloud/version-delete-cacheMorris Jobke2014-07-131-4/+21
|\ \ \ | | | | | | | | Remove deleted versions from the cache
| * | | Remove deleted versions from the cacheRobin Appelman2014-07-101-4/+21
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-07-1329-159/+243
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-07-1241-262/+357
| | | |
* | | | Merge pull request #9597 from owncloud/enc-removelegacytestsThomas Müller2014-07-111-0/+4
|\ \ \ \ | |_|_|/ |/| | | Disable legacy encryption tests
| * | | Disable legacy encryption testsVincent Petry2014-07-111-0/+4
|/ / / | | | | | | | | | | | | It seems these tests are not needed any more, but will now be skipped instead until the case is cleared out.
* | | Merge pull request #9569 from owncloud/fix-require-of-blowfish-masterMorris Jobke2014-07-102-2/+0
|\ \ \ | | | | | | | | [OC8] remove pointless require of Blowfish.php
| * | | remove pointless require of Blowfish.phpThomas Müller2014-07-102-2/+0
|/ / /
* | | Merge pull request #9538 from owncloud/fileactions-cleanupVincent Petry2014-07-107-43/+137
|\ \ \ | | | | | | | | Propagate file action changes to the file lists
| * | | Propagate file action changes to the file listsVincent Petry2014-07-097-43/+137
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | Merge pull request #9525 from owncloud/incrementuser2Vincent Petry2014-07-104-37/+109
|\ \ \ \ | | | | | | | | | | increment/decrement group and user counts when necessary
| * | | | use .filterAttr()Thomas Müller2014-07-091-4/+4
| | | | |
| * | | | use .filterAttr()Thomas Müller2014-07-091-7/+8
| | | | |
| * | | | some more cleanupThomas Müller2014-07-091-38/+36
| | | | |
| * | | | magic strings - bad kungfuThomas Müller2014-07-091-0/+3
| | | | |
| * | | | remove the group in case the last user has removed from that groupThomas Müller2014-07-091-0/+12
| | | | |
| * | | | fixing JS synatx errorsThomas Müller2014-07-092-5/+5
| | | | |
| * | | | avoid global selectorArthur Schiwon2014-07-091-1/+1
| | | | |
| * | | | increase/decrease everyone count on user creation/deletionArthur Schiwon2014-07-093-8/+42
| | | | |
| * | | | decrease user count in affected groups after user deleteArthur Schiwon2014-07-091-0/+14
| | | | |
| * | | | increment group counters when a user is createdArthur Schiwon2014-07-093-3/+13
| | |_|/ | |/| |
* | | | Merge pull request #9536 from owncloud/default-app-groups-masterMorris Jobke2014-07-101-97/+97
|\ \ \ \ | |_|_|/ |/| | | Default app groups master
| * | | adding 'groups' entry to remote appsThomas Müller2014-07-091-1/+2
| | | |
| * | | fixing typosThomas Müller2014-07-091-97/+96
| | | |
* | | | Merge pull request #9516 from owncloud/kill-legacy-encryption-oc8Vincent Petry2014-07-109-881/+3
|\ \ \ \ | | | | | | | | | | [OC8] Kill legacy encryption migration
| * | | | Kill legacy encryption migrationThomas Müller2014-07-089-881/+3
| | | | |
* | | | | Merge pull request #9519 from owncloud/search-bounceVincent Petry2014-07-101-2/+2
|\ \ \ \ \ | | | | | | | | | | | | debounce the search function
| * | | | | debounce the search functionRobin Appelman2014-07-081-2/+2
| | | | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-07-10173-829/+859
| | | | | |
* | | | | | Merge pull request #9460 from owncloud/versions-localVincent Petry2014-07-101-5/+4
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | Dont assume local home storage for files_version
| * | | | | Dont delete versions as local filesRobin Appelman2014-07-071-5/+4
| | | | | |
* | | | | | Merge pull request #9534 from owncloud/fix-9532-masterThomas Müller2014-07-091-233/+0
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | De-double class name
| * | | | | test class is already in preferences.phpArthur Schiwon2014-07-091-233/+0
| | | | | |
| * | | | | De-double class nameThomas Müller2014-07-091-1/+1
|/ / / / /
* | | | | Merge pull request #9510 from libasys/patch-1Thomas Müller2014-07-091-1/+1
|\ \ \ \ \ | | | | | | | | | | | | BugFix missing $item on 'file_target' Line 1911
| * | | | | BugFix missing $item on 'file_target' Line 1911libasys2014-07-081-1/+1
| | |_|/ / | |/| | | | | | | | I think this should be right!
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-07-09462-3876/+3964
| | | | |
* | | | | Merge pull request #9528 from owncloud/fix-apostropThomas Müller2014-07-091-1/+1
|\ \ \ \ \ | | | | | | | | | | | | fix apostrophe fixes #9486
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-10 07:22:21 +0000