summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #11659 from jknockaert/masterVincent Petry2014-10-301-38/+54
|\
| * initialisation of cipherjknockaert2014-10-281-1/+1
| * small fixjknockaert2014-10-201-0/+1
| * bugfixesjknockaert2014-10-201-5/+6
| * ok; still some bugs that had to be fixedjknockaert2014-10-201-39/+35
| * small fixjknockaert2014-10-191-1/+2
| * rework getFileSizejknockaert2014-10-191-28/+45
* | Merge pull request #11867 from owncloud/settings-sidebar-adminJan-Christoph Borchardt2014-10-301-2/+4
|\ \
| * | admin settings: fix LDAP settings header layoutJan-Christoph Borchardt2014-10-301-2/+3
| * | fixing ldap listing in admin sidebar - needs styling reviewThomas Müller2014-10-301-2/+3
* | | Properly register sharing hooks and proxiesVincent Petry2014-10-301-1/+7
|/ /
* | [tx-robot] updated from transifexJenkins for ownCloud2014-10-3058-56/+406
* | Merge pull request #11409 from owncloud/watcher-reuseVincent Petry2014-10-292-19/+18
|\ \
| * | Fix shared cache getFolderContentsRobin Appelman2014-10-241-17/+14
| * | also update shared watcherRobin Appelman2014-10-241-2/+4
* | | Merge pull request #11835 from owncloud/enc-fixmovingsharekeystofolderMorris Jobke2014-10-293-35/+42
|\ \ \
| * | | Added encryption test when moving file as non-ownerVincent Petry2014-10-291-2/+15
| * | | Fix warning with unset extension checkVincent Petry2014-10-291-1/+1
| * | | Fix moving share keys as non-owner to subdirVincent Petry2014-10-291-32/+26
* | | | update all translation files to js and jsonThomas Müller2014-10-292037-20311/+40385
* | | | Added OC.L10N namespace with translation functionsVincent Petry2014-10-298-0/+11
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-10-295-0/+14
|/ / /
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-10-282-3/+18
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-10-272-3/+37
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-10-264-16/+55
* | | Merge pull request #11760 from owncloud/add-type-hints-where-sensibleLukas Reschke2014-10-254-19/+39
|\ \ \
| * | | Add type hinting to functionsLukas Reschke2014-10-244-19/+39
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-10-251-0/+4
|/ / /
* | | Use function outside of loopLukas Reschke2014-10-243-6/+8
* | | Merge pull request #11758 from owncloud/fix-permissionsLukas Reschke2014-10-2411-0/+0
|\ \ \ | |/ / |/| |
| * | Make files non executableLukas Reschke2014-10-2411-0/+0
* | | Merge pull request #11754 from owncloud/fix-division-nullLukas Reschke2014-10-241-1/+1
|\ \ \ | |/ / |/| |
| * | Prevent division by zeroLukas Reschke2014-10-241-1/+1
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-10-245-11/+44
|/ /
* | Merge pull request #11721 from owncloud/fix-s3-regressionMorris Jobke2014-10-231-5/+11
|\ \
| * | Fix S3 connectionVincent Petry2014-10-221-5/+11
* | | Merge pull request #11726 from owncloud/s3-fixunittestsMorris Jobke2014-10-231-0/+1
|\ \ \
| * | | Fix S3 folder creation for new AWS APIVincent Petry2014-10-221-0/+1
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-10-237-1/+12
| |/ / |/| |
* | | Lazy initialize external storagesVincent Petry2014-10-226-107/+163
|/ /
* | Merge pull request #11684 from owncloud/guess_mimetype_on_touchJörn Friedrich Dreyer2014-10-222-2/+5
|\ \
| * | guess mimetype on touchJörn Friedrich Dreyer2014-10-212-2/+5
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-10-222-1/+81
* | | Merge pull request #11630 from owncloud/kill-some-legacyLukas Reschke2014-10-212-12/+12
|\ \ \ | |/ / |/| |
| * | move some deprecated usage of OC_Config and OC_AppConfig to \OC::serverThomas Müller2014-10-202-12/+12
* | | Merge pull request #11675 from owncloud/urlencode-for-special-charactersLukas Reschke2014-10-211-3/+3
|\ \ \
| * | | URLEncode filenames to be compatible with special charactersLukas Reschke2014-10-201-3/+3
| |/ /
* / / [tx-robot] updated from transifexJenkins for ownCloud2014-10-218-7/+25
|/ /
* | make tests compatible with hook based skeleton generationJörn Friedrich Dreyer2014-10-2012-24/+102
* | make skeleton compatible with objectstoreJörn Friedrich Dreyer2014-10-201-2/+2