aboutsummaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* killing some more calls to OC_App::loadApps(); - because we load all apps in ...Thomas Müller2014-03-251-1/+0
* Merge branch 'master' into load-apps-proper-masterThomas Müller2014-03-21474-2654/+5611
|\
| * Merge pull request #7655 from owncloud/shared-unencryptedsizeVincent Petry2014-03-211-1/+1
| |\
| | * Fixed warning when browsing Shared folderVincent Petry2014-03-101-1/+1
| * | Merge pull request #7823 from owncloud/fix_7796blizzz2014-03-211-2/+2
| |\ \
| | * | Fix duplicate ipauniqueidRobin McCorkell2014-03-201-1/+1
| | * | Add FreeIPA UUID compatibility, fixes #7796Robin McCorkell2014-03-191-2/+2
| * | | [tx-robot] updated from transifexJenkins for ownCloud2014-03-211-0/+1
| * | | Merge pull request #7794 from owncloud/extstorage-obfuscatepasswordsLukas Reschke2014-03-204-16/+486
| |\ \ \
| | * | | Removed commentVincent Petry2014-03-201-2/+0
| | * | | Lazy load phpseclib in ext storage configVincent Petry2014-03-201-1/+3
| | * | | Fix typo in mount loadingRobin Appelman2014-03-201-1/+1
| | * | | Fixed ext storage password field order issueVincent Petry2014-03-192-3/+10
| | * | | Fixed ext storage unit test for groupsVincent Petry2014-03-191-30/+46
| | * | | Added tests to check mount point list for a target userVincent Petry2014-03-192-7/+132
| | * | | Moved external storage mounting code to files_external appVincent Petry2014-03-192-4/+86
| | * | | Added IV for ext storage password encryptionVincent Petry2014-03-191-10/+33
| | * | | Added password obfuscation for external storage configVincent Petry2014-03-193-3/+148
| | * | | Added ext storage unit tests for writing then reload the mount configVincent Petry2014-03-191-1/+73
| * | | | remove executable flag for file-upload.jsMorris Jobke2014-03-201-0/+0
| * | | | Merge pull request #7814 from oskholl/masterMorris Jobke2014-03-201-0/+2
| |\ \ \ \
| | * | | | Comment moved to prevent 'Line is too long' warning.Oskar Hollmann2014-03-191-1/+2
| | * | | | Fix: 'Upload button tooltip doesn't disappear'Oskar Hollmann2014-03-191-0/+1
| | | |/ / | | |/| |
| * | | | Merge pull request #7651 from owncloud/close-session-faster-masterThomas Müller2014-03-2013-11/+22
| |\ \ \ \
| | * \ \ \ Merge branch 'master' into close-session-faster-masterThomas Müller2014-03-1916-177/+226
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'master' into close-session-faster-masterThomas Müller2014-03-17356-1021/+1894
| | |\ \ \ \ \
| | * | | | | | in case of phpunit executions calling header() and exit() is too badThomas Müller2014-03-141-3/+8
| | * | | | | | Merge branch 'master' into close-session-faster-masterThomas Müller2014-03-109-157/+118
| | |\ \ \ \ \ \
| | * | | | | | | close the session on all file operationsThomas Müller2014-03-1013-9/+15
| | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-03-2053-103/+66
| | |_|_|_|/ / | |/| | | | |
| * | | | | | Improve sorting performance of large lists of filesRobin Appelman2014-03-193-11/+17
| | |_|_|/ / | |/| | | |
| * | | | | Merge pull request #7790 from owncloud/fix/7788Thomas Müller2014-03-194-149/+62
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | drop file cache migration OC5 -> OC6Thomas Müller2014-03-184-149/+62
| | | |_|/ | | |/| |
| * | | | Merge pull request #7792 from owncloud/extstorage-fixpersonalstorageVincent Petry2014-03-192-17/+136
| |\ \ \ \
| | * | | | Added unit tests for when adding ext storage mount pointsVincent Petry2014-03-182-16/+135
| | * | | | Fix validation of allowed personal backendVincent Petry2014-03-181-1/+1
| | |/ / /
| * | | | [tx-robot] updated from transifexJenkins for ownCloud2014-03-199-0/+23
| * | | | Merge pull request #7766 from Xenopathic/masterRobin McCorkell2014-03-181-11/+5
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Fix smb4php to work with home sharesRobin McCorkell2014-03-171-11/+5
| * | | | Merge pull request #7649 from owncloud/routing-publicThomas Müller2014-03-171-1/+1
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Move the router classes to a namespace and expose it with a public interfaceRobin Appelman2014-03-101-1/+1
| | |/ /
| * | | clearify the use-case of this appFrank Karlitschek2014-03-171-1/+1
| * | | Merge pull request #7734 from owncloud/icon-class-removeMorris Jobke2014-03-163-6/+6
| |\ \ \
| | * | | remove unneeded icon classJan-Christoph Borchardt2014-03-143-6/+6
| * | | | [tx-robot] updated from transifexJenkins for ownCloud2014-03-164-0/+9
| * | | | [tx-robot] updated from transifexJenkins for ownCloud2014-03-1510-1/+25
| |/ / /
| * | | [tx-robot] updated from transifexJenkins for ownCloud2014-03-1318-0/+359
| * | | Merge pull request #7686 from owncloud/ocs_fix_pathsBjörn Schießle2014-03-132-5/+128
| |\ \ \
| | * | | finally fix the paths for the OCS Share APIBjoern Schiessle2014-03-132-5/+128
| * | | | Merge pull request #7671 from fpiraneo/patch-1Vincent Petry2014-03-131-1/+1
| |\ \ \ \ | | |/ / / | |/| | |