summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | Port of #9584Stephan Peijnik2014-07-162-2/+23
|/ / / / / / /
* | | | | | | Merge pull request #9640 from owncloud/fix_9627Björn Schießle2014-07-161-1/+1
|\ \ \ \ \ \ \
| * | | | | | | make sure that 'OC_Theme' exists before checking if the method existsBjoern Schiessle2014-07-151-1/+1
* | | | | | | | [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
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | 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
|\ \ \ \ \ \ \
| * | | | | | | 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
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | 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
|\ \ \ \ \ \ \ \
| * | | | | | | | Update info.xmlLukas Reschke2014-07-151-1/+1
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge pull request #8987 from owncloud/lastindexid-debugVincent Petry2014-07-153-8/+51
|\ \ \ \ \ \ \ \
| * | | | | | | | - Added test to trigger index id errorVincent Petry2014-07-143-8/+51
* | | | | | | | | Merge pull request #9561 from libasys/patch-3icewind19912014-07-151-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Update share.phplibasys2014-07-101-1/+1
| * | | | | | | | | Update share.phplibasys2014-07-101-1/+1
* | | | | | | | | | Merge pull request #9621 from owncloud/fix_logger_implementationThomas Müller2014-07-152-2/+2
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |
| * | | | | | | | | 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
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | File written by blizzzPhilippe Jung2014-07-141-0/+151
| * | | | | | | | | [Issue #9559] identifiers uid=xxx must be considered as user DN and not as ow...Philippe Jung2014-07-101-1/+2
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #9596 from owncloud/fixing-9503-masterMorris Jobke2014-07-154-14/+14
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | |
| * | | | | | | | | fixing PHPDocThomas Müller2014-07-141-16/+16
| * | | | | | | | | remove dead codeArthur Schiwon2014-07-145-43/+137
| |/ / / / / / / /
* | | | | | | | | Merge pull request #9620 from owncloud/search-fileinfo-pathicewind19912014-07-141-1/+2
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | 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
|\ \ \ \ \ \ \ \
| * | | | | | | | 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 downloaded arc...Thomas Müller2014-07-111-9/+4
* | | | | | | | | | Merge pull request #9546 from owncloud/user-publicicewind19912014-07-147-3/+236
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | |
| * | | | | | | | | 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 #9422Daniel Hansson2014-07-091-14/+11
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #9572 from owncloud/deleteunsharetooltipBjörn Schießle2014-07-145-5/+30
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Added mountType attribute and adapted Delete action textVincent Petry2014-07-145-5/+30
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-19 13:48:29 +0000