summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2014-07-16473-3097/+2186
|
* Merge pull request #9644 from owncloud/fix_user_apiThomas Müller2014-07-152-3/+3
|\ | | | | Fix user api
| * use UserSession service to resolve user idJörn Friedrich Dreyer2014-07-151-1/+1
| |
| * use correct IUser in interfaceJörn Friedrich Dreyer2014-07-151-2/+2
| |
* | Merge pull request #9540 from owncloud/use_fileinfo_in_search_resultsblizzz2014-07-151-33/+22
|\ \ | | | | | | use fileinfo object in search results
| * | mkae getRelativePath of file search results overwriteable in subclassesJörn Friedrich Dreyer2014-07-141-2/+1
| | |
| * | return relative pathJörn Friedrich Dreyer2014-07-141-27/+15
| | |
| * | use fileinfo object in search resultsJörn Friedrich Dreyer2014-07-091-9/+11
| | |
* | | Merge pull request #9628 from edozzo/masterblizzz2014-07-151-2/+12
|\ \ \ | |_|/ |/| | Userlist: async load doesnt fill checked group/subadmin array
| * | Strinct comparsion fixDeLtAfOx2014-07-151-2/+2
| | |
| * | Userlist: async load doesnt fill checked group/subadmin arrayDeLtAfOx2014-07-151-2/+12
| | |
* | | Merge pull request #9639 from owncloud/prevent-irc-trolls-fro-using-thisicewind19912014-07-151-1/+1
|\ \ \ | | | | | | | | Add warning because there are people that enable this app because they think it's the WebDAV implementation of ownCloud
| * | | Update info.xmlLukas Reschke2014-07-151-1/+1
| | | |
* | | | Merge pull request #8987 from owncloud/lastindexid-debugVincent Petry2014-07-153-8/+51
|\ \ \ \ | | | | | | | | | | [DEBUG] Test case for debugging the last index ID bug from Doctrine/MySQL
| * | | | - Added test to trigger index id errorVincent Petry2014-07-143-8/+51
| | | | | | | | | | | | | | | | | | | | | | | | | - re-enable encryption migration tests - sqlite requires reconnect after schema changes
* | | | | Merge pull request #9561 from libasys/patch-3icewind19912014-07-151-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Fix Error undefined index: file_target
| * | | | | Update share.phplibasys2014-07-101-1/+1
| | | | | | | | | | | | | | | | | | change isset with empty on line 1911
| * | | | | Update share.phplibasys2014-07-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added isset for error: ``` Undefined index: file_target at /var/www/owncloud/lib/private/share/share.php#1911 ```
* | | | | | Merge pull request #9621 from owncloud/fix_logger_implementationThomas Müller2014-07-152-2/+2
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | fix logger implementation
| * | | | | fix logger implementation and testJörn Friedrich Dreyer2014-07-152-2/+2
| | |/ / / | |/| | |
* | | | | throw exception if file is to large for trash binBjoern Schiessle2014-07-153-6/+46
| | | | |
* | | | | Merge pull request #9633 from owncloud/correct-icon-licenseThomas Müller2014-07-157-38/+1
|\ \ \ \ \ | | | | | | | | | | | | Correct icon license
| * | | | | remove unused 3rdparty clock and lock iconsJan-Christoph Borchardt2014-07-156-37/+0
| | | | | |
| * | | | | correct icon license, we use Elementary icons, not Silk anymoreJan-Christoph Borchardt2014-07-151-1/+1
| | | | | |
* | | | | | Merge pull request #9570 from PhilJung/masterblizzz2014-07-152-1/+153
|\ \ \ \ \ \ | |/ / / / / |/| | | | | [Issue #9559] identifiers uid=xxx must be considered as user DN and not ...
| * | | | | File written by blizzzPhilippe Jung2014-07-141-0/+151
| | | | | |
| * | | | | [Issue #9559] identifiers uid=xxx must be considered as user DN and not as ↵Philippe Jung2014-07-101-1/+2
| | |/ / / | |/| | | | | | | | | | | | | owncloud users
* | | | | Merge pull request #9596 from owncloud/fixing-9503-masterMorris Jobke2014-07-154-14/+14
|\ \ \ \ \ | | | | | | | | | | | | reduce share action text to the user name only
| * | | | | reduce share action text to the user name onlyThomas Müller2014-07-144-14/+14
| | | | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-07-15181-2735/+3649
| | | | | |
* | | | | | Merge pull request #9562 from owncloud/users-groupfilterThomas Müller2014-07-155-59/+153
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | Do not filter groups, but therefore update the user counts according to the filter
| * | | | | fixing PHPDocThomas Müller2014-07-141-16/+16
| | | | | |
| * | | | | remove dead codeArthur Schiwon2014-07-145-43/+137
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | do not filter groups. but update the user count according to the filter improve phpdoc improve metadata runtime cache add metadata tests
* | | | | Merge pull request #9620 from owncloud/search-fileinfo-pathicewind19912014-07-141-1/+2
|\ \ \ \ \ | |/ / / / |/| | | | Use the correct path when building the FileInfo for the search result
| * | | | Use the correct path when building the FileInfo for the search resultRobin Appelman2014-07-141-1/+2
|/ / / /
* | | | Merge pull request #9228 from owncloud/remove-routing-singular-issuesMorris Jobke2014-07-142-16/+6
|\ \ \ \ | | | | | | | | | | Routing: Dont strip the s from the resource id to prevent possible weird behavior with irregular english plural nouns
| * | | | use id instead of resourceIdBernhard Posselt2014-06-262-13/+3
| | | | |
| * | | | dont strip the s from the resourceBernhard Posselt2014-06-262-6/+6
| | | | |
* | | | | Merge pull request #9598 from owncloud/fix-app-installation-masterThomas Müller2014-07-141-9/+4
|\ \ \ \ \ | | | | | | | | | | | | append file extension to the temporary file which contains the downloade...
| * | | | | append file extension to the temporary file which contains the downloaded ↵Thomas Müller2014-07-111-9/+4
| | | | | | | | | | | | | | | | | | | | | | | | archive - in case of zip files fileinfo doesn't seem to return anything reliable
* | | | | | Merge pull request #9546 from owncloud/user-publicicewind19912014-07-147-3/+236
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | Extends the public user api
| * | | | | Expose the user manager in the public server containerRobin Appelman2014-07-141-0/+7
| | | | | |
| * | | | | Add public interfaces for User, UserManager and UserSessionRobin Appelman2014-07-146-3/+229
|/ / / / /
* | | | | 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
| | |/ / / | |/| | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-20 11:02:01 +0000