summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #4246 from owncloud/speedup-autotest-masterAndreas Fischer2013-07-311-5/+11
|\ | | | | | | | | | | | | use tmpfs at /dev/shm to speedup unit test execution * owncloud/speedup-autotest-master: use tmpfs at /dev/shm to speedup unit test execution
| * 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
|\ \ | | | | | | More verbose 404, closes #3225
| * | 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 file
| * | | 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
|\ \ \ | | | | | | | | implement a platform independent version of basename
| * | | 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
|\ \ \ \ \ | |_|_|/ / |/| | | | Allow public upload together with password protection
| * | | | 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
|\ \ \ | | | | | | | | Cache: don't check if the parent exists in the cache if we are already sure it does
| * | | better variable namingRobin Appelman2013-07-291-3/+3
| | | |
| * | | Cache: don't check if the parent exists in the cache if we are already sure ↵Robin Appelman2013-07-271-3/+4
| | | | | | | | | | | | | | | | it does
* | | | Merge pull request #4203 from owncloud/trashbin_improvementsBjörn Schießle2013-07-299-50/+135
|\ \ \ \ | |_|_|/ |/| | | Trashbin improvements
| * | | 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
| | | |
| * | | make 'restored' extension translatableBjörn Schießle2013-07-261-2/+3
| | | |
| * | | fix typoBjörn Schießle2013-07-261-1/+1
| | | |
| * | | expire trash bin if trash bin exceeds max size after a new file was added to ↵Björn Schießle2013-07-262-7/+34
| | | | | | | | | | | | | | | | ownCloud
| * | | disable "deleted files" button if trash bin is emptyBjörn Schießle2013-07-266-7/+36
| | | |
| * | | don't move empty folders to the trash binBjörn Schießle2013-07-251-0/+5
| | | |
| * | | nicer format of unique names, use 'file (restored).txt' instead of ↵Björn Schießle2013-07-251-32/+39
| | | | | | | | | | | | | | | | 'files.txt.restored'
* | | | Merge pull request #4216 from owncloud/clean_php55_opcacheThomas Müller2013-07-291-0/+4
|\ \ \ \ | | | | | | | | | | Also clean PHP 5.5 opcache
| * | | | Also clean PHP 5.5 opcachekondou2013-07-281-0/+4
| | | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-07-2932-88/+135
| | | | |
* | | | | Merge pull request #4218 from owncloud/newdataicewind19912013-07-281-3/+3
|\ \ \ \ \ | | | | | | | | | | | | Fix potential undefined variable in Scanner
| * | | | | Move check so the variable will never be undefinedMichael Gapczynski2013-07-281-3/+3
|/ / / / /
* / / / / [tx-robot] updated from transifexJenkins for ownCloud2013-07-28169-427/+572
|/ / / /
* | / / [tx-robot] updated from transifexJenkins for ownCloud2013-07-27647-17134/+15201
| |/ / |/| |
* | | Merge pull request #4199 from owncloud/login-cleanupJörn Friedrich Dreyer2013-07-261-0/+21
|\ \ \ | | | | | | | | Login cleanup IE8 fixes
| * | | IE8 login/install screen cleartype fixes and input box bordersJörn Friedrich Dreyer2013-07-261-0/+21
| | | |
| * | | force dbs to stay in one lineJörn Friedrich Dreyer2013-07-241-1/+1
| | | |
* | | | Merge pull request #4093 from owncloud/storage-test-cleanupBart Visscher2013-07-261-50/+3
|\ \ \ \ | | | | | | | | | | Remove outdated unit tests for storage backend
| * \ \ \ Merge branch 'master' into storage-test-cleanupThomas Müller2013-07-241447-13959/+89742
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/lib/files/storage/storage.php
| * | | | | Storage: remove some unneeded strict tests of mtime behaviourRobin Appelman2013-07-161-21/+2
| | | | | |
| * | | | | Storage: remove tests for searchRobin Appelman2013-07-161-29/+1
| | | | | |
* | | | | | functions in OCP should be staticRobin Appelman2013-07-251-1/+1
| | | | | |
* | | | | | Merge pull request #4184 from owncloud/login_cleanup_oracleblizzz2013-07-253-32/+26
|\ \ \ \ \ \ | | | | | | | | | | | | | | Login cleanup oracle
| * | | | | | show tablespace only for oracle, hide dbhost for sqlite, remove unnecessary ↵Jörn Friedrich Dreyer2013-07-242-31/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | js & html ids
| * | | | | | force dbs to stay in one lineJörn Friedrich Dreyer2013-07-241-1/+1
| | | | | | |