summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | Merge pull request #4265 from berendt/OC_Files_Storage_AmazonS3_phpdocJörn Friedrich Dreyer2013-08-011-0/+15
|\ \ \ \ \
| * | | | | added @var tagsChristian Berendt2013-08-011-0/+15
* | | | | | Merge pull request #4266 from berendt/OC_Files_Storage_AmazonS3_loggingJörn Friedrich Dreyer2013-08-011-0/+14
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | write all catched exception messages to the logChristian Berendt2013-08-011-0/+14
| |/ / / /
* | | | | Merge pull request #4155 from owncloud/mdb2schemareader-booleansMorris Jobke2013-08-015-69/+308
|\ \ \ \ \
| * | | | | add tests for MDB2SchemaReaderRobin Appelman2013-07-292-0/+157
| * | | | | make MDB2Schema reader non staticRobin Appelman2013-07-292-72/+143
| * | | | | add function to get config object from OC_ConfigRobin Appelman2013-07-291-0/+4
| * | | | | use ===Robin Appelman2013-07-221-1/+1
| * | | | | add support for the <primary/> element within field definitionsRobin Appelman2013-07-221-0/+4
| * | | | | db: cast default values for boolean fields to booleansRobin Appelman2013-07-221-0/+3
* | | | | | Merge pull request #4208 from owncloud/scanner-php53Morris Jobke2013-08-011-6/+7
|\ \ \ \ \ \
| * | | | | | remove unneeded 'use'Robin Appelman2013-07-291-1/+0
| * | | | | | dont need to explicitly pass by referenceRobin Appelman2013-07-291-2/+2
| * | | | | | fix scanner hooks, cant use inside closures in php 5.3Robin Appelman2013-07-261-5/+7
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-0168-209/+325
* | | | | | | Merge pull request #4259 from owncloud/search_result_scrollbarMorris Jobke2013-07-311-56/+57
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | update css properties with px based valuesJörn Friedrich Dreyer2013-07-311-4/+4
| * | | | | | add overflow-y scroll and clean up indentsJörn Friedrich Dreyer2013-07-311-56/+57
|/ / / / / /
* | | | | | Merge pull request #3982 from owncloud/test_lastinsertidMorris Jobke2013-07-312-3/+17
|\ \ \ \ \ \
| * | | | | | check type, assertgreaterthanJörn Friedrich Dreyer2013-07-291-4/+6
| * | | | | | always return intJörn Friedrich Dreyer2013-07-291-2/+2
| * | | | | | test lastinsertidJörn Friedrich Dreyer2013-07-291-1/+13
| | |_|/ / / | |/| | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-07-31378-2991/+4903
* | | | | | Merge pull request #4246 from owncloud/speedup-autotest-masterAndreas Fischer2013-07-311-5/+11
|\ \ \ \ \ \
| * | | | | | use tmpfs at /dev/shm to speedup unit test executionThomas Müller2013-07-301-5/+11
* | | | | | | Merge pull request #4225 from owncloud/better-404Thomas Müller2013-07-304-6/+40
|\ \ \ \ \ \ \
| * | | | | | | Use default cursor for list itemsVictor Dubiniuk2013-07-301-1/+1
| * | | | | | | RewordingVictor Dubiniuk2013-07-291-1/+1
| * | | | | | | Move styles from core to appVictor Dubiniuk2013-07-293-12/+13
| * | | | | | | Allow apps to have own 404 content, closes #3225Victor Dubiniuk2013-07-294-6/+39
* | | | | | | | Merge pull request #4238 from owncloud/fix_4235Morris Jobke2013-07-301-0/+14
|\ \ \ \ \ \ \ \
| * | | | | | | | added missing isEmpty ajax fileBjoern Schiessle2013-07-301-0/+14
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge pull request #4227 from owncloud/fixing-testGetById-masterThomas Müller2013-07-303-9/+33
|\ \ \ \ \ \ \ \
| * | | | | | | | adding test case with no /Thomas Müller2013-07-301-0/+1
| * | | | | | | | Merge branch 'master' into fixing-testGetById-masterThomas Müller2013-07-301909-28481/+105517
| |\ \ \ \ \ \ \ \
| * | | | | | | | | adding unit tests for OC_Util::basenameThomas Müller2013-07-292-8/+25
| * | | | | | | | | implement a platform independent version of basenameThomas Mueller2013-07-292-1/+7
* | | | | | | | | | Merge pull request #4237 from owncloud/fixing-4026-masterJörn Friedrich Dreyer2013-07-302-9/+24
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |
| * | | | | | | | | fixes #4026Thomas Müller2013-07-302-9/+24
* | | | | | | | | | Updating to the latest 3rdparty master commitThomas Müller2013-07-301-0/+0
|/ / / / / / / / /
* | / / / / / / / [tx-robot] updated from transifexJenkins for ownCloud2013-07-30119-1178/+1584
| |/ / / / / / / |/| | | | | | |
* | | | | | | | Merge pull request #4213 from owncloud/scanning-performanceicewind19912013-07-291-3/+4
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | better variable namingRobin Appelman2013-07-291-3/+3
| * | | | | | | Cache: don't check if the parent exists in the cache if we are already sure i...Robin Appelman2013-07-271-3/+4
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge pull request #4203 from owncloud/trashbin_improvementsBjörn Schießle2013-07-299-50/+135
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | remove whitespacesBjoern Schiessle2013-07-291-1/+1
| * | | | | | reduce time for auto expire to 30 days by defaultBjörn Schießle2013-07-262-3/+3
| * | | | | | found some more places where we can disable buttons while performing a actionBjörn Schießle2013-07-261-6/+18
| * | | | | | Hide Delete Permanently button when Restore happensBjörn Schießle2013-07-261-0/+4