summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* introduce SessionMiddleWare to control session handling via an annotationThomas Müller2014-10-223-1/+171
* Merge pull request #11630 from owncloud/kill-some-legacyLukas Reschke2014-10-218-44/+30
|\
| * move some deprecated usage of OC_Config and OC_AppConfig to \OC::serverThomas Müller2014-10-205-23/+24
| * remove legacy class OC_UpdaterThomas Müller2014-10-203-21/+6
* | 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-2128-85/+128
|/ /
* | Merge pull request #11666 from owncloud/setup-hidesqlitemessageforautoconfigLukas Reschke2014-10-201-0/+2
|\ \
| * | Hide SQLite information on setup when autoconfig is usedVincent Petry2014-10-201-0/+2
* | | Merge pull request #11593 from owncloud/useRelativePathToOwnCloudInstallationLukas Reschke2014-10-203-9/+90
|\ \ \ | |_|/ |/| |
| * | Add proper setup and teardownVincent Petry2014-10-201-0/+17
| * | Add "$_SERVER['REQUEST_URI']" to fix the unit testsLukas Reschke2014-10-201-1/+8
| * | Add unit tests for convertToRelativePathLukas Reschke2014-10-202-1/+45
| * | Refer to relative path instead of absolute pathLukas Reschke2014-10-201-8/+21
|/ /
* | Merge pull request #11644 from owncloud/tune-share-autocompleteThomas Müller2014-10-201-1/+1
|\ \
| * | adjust autocomplete behavior for sharing menuCraig Morrissey2014-10-171-1/+1
* | | make tests compatible with hook based skeleton generationJörn Friedrich Dreyer2014-10-2012-24/+102
* | | throw exception in writeBack, the returned boolean is checked nowhereJörn Friedrich Dreyer2014-10-201-3/+2
* | | make skeleton compatible with objectstoreJörn Friedrich Dreyer2014-10-204-29/+42
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-10-2031-20/+325
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-10-1918-14/+66
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-10-1875-41/+167
* | | Merge pull request #11494 from owncloud/fix-ldap-ingroup-for-9225-2blizzz2014-10-175-33/+96
|\ \ \ | |/ / |/| |
| * | adjust group manager testsArthur Schiwon2014-10-171-15/+9
| * | add one simple cache testArthur Schiwon2014-10-171-4/+29
| * | make performance less bad. Still far from good, but at least it worksArthur Schiwon2014-10-173-11/+32
| * | with several backends, more than limit can be returnedArthur Schiwon2014-10-171-1/+1
| * | fix retrievel of group members and cache group membersArthur Schiwon2014-10-171-2/+25
|/ /
* | update 3rdparty to match master - just adds the merge commitMorris Jobke2014-10-171-0/+0
* | Merge pull request #11430 from owncloud/minify-js-css-masterMorris Jobke2014-10-177-81/+147
|\ \
| * | adding cssmin and jssmin(minify)Thomas Müller2014-10-177-81/+147
* | | Merge pull request #11634 from owncloud/loadapps-encapsulaterequireLukas Reschke2014-10-171-1/+11
|\ \ \
| * | | Encapsulate require_once to avoid name space bleedindVincent Petry2014-10-171-1/+11
| | |/ | |/|
* | | Merge pull request #11631 from owncloud/fix-undefine-encryption-exceptionBjörn Schießle2014-10-171-3/+4
|\ \ \ | |_|/ |/| |
| * | fixing usage of EncryptionExceptionThomas Müller2014-10-171-3/+4
* | | Merge pull request #9104 from macjohnny/macjohnny-drastic-ldap-speedupblizzz2014-10-172-15/+22
|\ \ \
| * | | adapted tests for a groupId indexed group arraymacjohnny2014-06-241-10/+10
| * | | modified caching mechanism in getUserGroupIdsmacjohnny2014-06-231-25/+6
| * | | clean up function getUserGroupIdsmacjohnny2014-06-231-7/+4
| * | | Update manager.phpmacjohnny2014-06-211-3/+11
| * | | Update manager.phpmacjohnny2014-06-191-2/+2
| * | | Update manager.phpmacjohnny2014-06-191-9/+25
| * | | Update manager.phpmacjohnny2014-06-191-0/+1
| * | | Update manager.phpmacjohnny2014-06-191-1/+2
| * | | Update manager.phpmacjohnny2014-06-191-1/+4
* | | | Merge pull request #11611 from owncloud/fix-svg-masterMorris Jobke2014-10-172-3/+13
|\ \ \ \
| * | | | Remove insane commentLukas Reschke2014-10-161-1/+0
| * | | | Fix SVG iconsLukas Reschke2014-10-162-3/+14
* | | | | Merge pull request #11629 from owncloud/add-notice-to-php-docMorris Jobke2014-10-171-1/+1
|\ \ \ \ \
| * | | | | Add PHPDoc about sanitization of "insertIfNotExist"Lukas Reschke2014-10-171-1/+1
| | |_|/ / | |/| | |