summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge masterLukas Reschke2013-03-0112-14/+55
|\
| * validate the generated email address and fall back to localhost.localdomain i...Thomas Mueller2013-03-011-4/+7
| * for this self test we don't care if the ssl certificate is self signed and th...Thomas Mueller2013-03-011-0/+3
| * Merge pull request #2008 from owncloud/1999-requesttokenFrank Karlitschek2013-03-011-3/+7
| |\
| | * Check if requesttoken exists in sessionLukas Reschke2013-03-011-0/+4
| | * Style fixesLukas Reschke2013-03-011-3/+3
| * | 5.0 RC 1v5.0.0RC1Frank Karlitschek2013-03-011-2/+2
| * | [tx-robot] updated from transifexJenkins for ownCloud2013-03-019-3/+12
| * | Merge pull request #1937 from owncloud/check-resharingBart Visscher2013-02-281-2/+24
| |\ \ | | |/ | |/|
| | * Check resharing settingMichael Gapczynski2013-02-261-2/+24
* | | Merge masterLukas Reschke2013-02-287-12/+32
|\| |
| * | Merge pull request #1988 from owncloud/permissionscache_cleanicewind19912013-02-282-10/+18
| |\ \
| | * | Cache: cleanup permissions cache when removing a file from the cacheRobin Appelman2013-02-281-0/+3
| | * | Cache: add option to delete file from permissions cache for all usersRobin Appelman2013-02-281-10/+15
| * | | Merge pull request #1989 from owncloud/selectSanitizeBjörn Schießle2013-02-281-1/+1
| |\ \ \ | | |/ / | |/| |
| | * | Sanitize HTML in html_select_optionsLukas Reschke2013-02-281-1/+1
| * | | add checks for xml and dom when installingBernhard Posselt2013-02-281-1/+10
| * | | [tx-robot] updated from transifexJenkins for ownCloud2013-02-283-0/+3
| |/ /
* | | Merge masterLukas Reschke2013-02-273-5/+32
|\| |
| * | Merge pull request #1972 from owncloud/raw-pathinfoBernhard Posselt2013-02-272-2/+15
| |\ \
| | * | Use the plain urlencoded path info for the routing matchingBart Visscher2013-02-272-2/+15
| | |/
| * | Disable query cache for SqliteBart Visscher2013-02-271-1/+4
| * | Merge pull request #1944 from owncloud/query-caching-upgradeBernhard Posselt2013-02-271-2/+13
| |\ \
| | * | Disable prepared query caching while doing an upgradeRobin Appelman2013-02-261-2/+13
* | | | [core] From echo to pLukas Reschke2013-02-273-9/+9
* | | | Remove the template autoescapingLukas Reschke2013-02-271-3/+1
|/ / /
* | | Merge pull request #1031 from owncloud/external_storage_ui_feedbackMichael Gapczynski2013-02-271-0/+7
|\ \ \
| * \ \ Merge branch 'master' into external_storage_ui_feedbackMichael Gapczynski2013-02-2532-219/+706
| |\ \ \
| * \ \ \ Merge branch 'master' into external_storage_ui_feedbackMichael Gapczynski2013-02-1980-485/+1406
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into external_storage_ui_feedbackThomas Mueller2013-02-128-13/+113
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into external_storage_ui_feedbackThomas Mueller2013-02-128-0/+123
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into external_storage_ui_feedbackMichael Gapczynski2013-02-11131-3917/+6905
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into external_storage_ui_feedbackMichael Gapczynski2013-01-0932-907/+1095
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Move storage backend tests from constructor to test functionMichael Gapczynski2012-12-282-0/+9
* | | | | | | | | | Merge pull request #1962 from owncloud/big_upload_fixBernhard Posselt2013-02-271-2/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | timeout after a longer timeBernhard Posselt2013-02-271-2/+2
* | | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-02-2711-10/+15
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #1956 from owncloud/session-error-formatBart Visscher2013-02-271-0/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | only add style.css to initsessionBernhard Posselt2013-02-271-1/+2
| * | | | | | | | | | add css and scripts before session initBernhard Posselt2013-02-271-1/+1
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | Merge pull request #1961 from owncloud/trans_fixBart Visscher2013-02-271-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | fixed bug that would cause a failure because of undefined variable instead o...Bernhard Posselt2013-02-271-1/+1
| |/ / / / / / / / /
* | | | | | | | | | Merge pull request #1948 from owncloud/improve_user_sortingBernhard Posselt2013-02-271-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | sort users according to display nameArthur Schiwon2013-02-261-1/+1
| |/ / / / / / / / /
* | | | | | | | | / [tx-robot] updated from transifexJenkins for ownCloud2013-02-2711-1/+23
| |_|_|_|_|_|_|_|/ |/| | | | | | | |
* | | | | | | | | Fix using wrong quotes for breaking long linesBart Visscher2013-02-265-20/+20
|/ / / / / / / /
* | | | | | | | Catch exceptions on malformed categories.Thomas Tanghus2013-02-261-18/+34
* | | | | | | | Merge pull request #1906 from owncloud/storage-stat-failBernhard Posselt2013-02-261-83/+116
|\ \ \ \ \ \ \ \
| * | | | | | | | Storage: don't throw warnings when a stat failsRobin Appelman2013-02-261-2/+10
| * | | | | | | | Code styleRobin Appelman2013-02-261-81/+106