summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* better contrast for files list, darker greys for selection and hoverJan-Christoph Borchardt2013-06-111-5/+16
* darker low threshold color for file size and age fading, better contrastJan-Christoph Borchardt2013-06-112-3/+3
* Merge pull request #3646 from owncloud/introduce_phpunit_timeoutsThomas Müller2013-06-116-0/+123
|\
| * allow 30 sec for testDeleteFileJörn Friedrich Dreyer2013-06-101-0/+1
| * raise failed tests from first commit to size @mediumJörn Friedrich Dreyer2013-06-101-0/+3
| * add timeouts 3/30/90 to phpunit testsJörn Friedrich Dreyer2013-06-105-0/+119
* | [tx-robot] updated from transifexJenkins for ownCloud2013-06-113-2/+32
* | Merge pull request #3647 from owncloud/missing_backticksMorris Jobke2013-06-101-4/+4
|\ \
| * | add missing backticks all over the placeJörn Friedrich Dreyer2013-06-101-4/+4
| |/
* | Merge pull request #3610 from owncloud/encryption_recovery_for_ldapBjörn Schießle2013-06-102-0/+10
|\ \ | |/ |/|
| * use pre_setPassword hook to update the encryption keys if the back-end doesn'...Björn Schießle2013-06-062-0/+10
* | [tx-robot] updated from transifexJenkins for ownCloud2013-06-086-14/+27
* | [tx-robot] updated from transifexJenkins for ownCloud2013-06-079-11/+54
* | Read configuratons for external filesystem test from a private place.Thomas Mueller2013-06-071-0/+9
|/
* [tx-robot] updated from transifexJenkins for ownCloud2013-06-067-2/+46
* [tx-robot] updated from transifexJenkins for ownCloud2013-06-0515-8/+167
* LDAP: append port when URL is passed in LDAP Host configuration, fixes #2600Arthur Schiwon2013-06-041-0/+4
* Merge pull request #3561 from owncloud/usericewind19912013-06-031-1/+1
|\
| * fix broken testsFlorin Peter2013-05-311-1/+1
* | Merge pull request #3051 from owncloud/backgroundjobicewind19912013-06-023-12/+11
|\ \
| * | Files: use public api to register backgroundjobRobin Appelman2013-06-021-1/+1
| * | merge master into backgroundjobRobin Appelman2013-06-02376-3989/+10324
| |\ \
| * | | Rework background job systemRobin Appelman2013-04-202-11/+10
* | | | Merge pull request #3567 from owncloud/fixing-3466Frank Karlitschek2013-06-021-2/+12
|\ \ \ \ | |_|/ / |/| | |
| * | | In cases where smb4php returns false of an empty array stat/( has to return f...Thomas Mueller2013-06-011-2/+12
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-06-022-1/+25
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-06-016-1/+28
* | | | Merge pull request #3565 from owncloud/fix_ldap_sqlite_n_jsblizzz2013-05-312-2/+8
|\ \ \ \
| * | | | LDAP: sqlite compatibility for emptyiing tablesArthur Schiwon2013-05-311-1/+7
| * | | | LDAP: fix setting value of checkbox after loading configurationArthur Schiwon2013-05-311-1/+1
| | |_|/ | |/| |
* | | | Merge pull request #3562 from owncloud/fix_ldap_offline_host_handlingblizzz2013-05-311-3/+9
|\ \ \ \
| * | | | LDAP: fix possible recursionArthur Schiwon2013-05-251-0/+7
| * | | | LDAP: fix handling when LDAP Host is offlineArthur Schiwon2013-05-251-3/+2
| | |/ / | |/| |
* | | | also fix login errors while filesystem is not loaded in app.phpFlorin Peter2013-05-311-0/+6
* | | | Merge branch 'master' into files_encryption_fs_loaded_fixFlorin Peter2013-05-317-142/+145
|\ \ \ \ | | |/ / | |/| |
| * | | Merge pull request #3527 from owncloud/file_encryption_external_storage_fixesFlorinPeter2013-05-317-142/+145
| |\ \ \
| | * | | added our own file extension .part will not work here if we use file_get_cont...Florin Peter2013-05-302-5/+5
| | * | | prevent files_versions from calling file proxy which calls files_encryption a...Florin Peter2013-05-301-0/+17
| | * | | fix share and un-share for single fileFlorin Peter2013-05-301-23/+13
| | * | | fixed problems with file_get_contents and file_put_contents this problem was ...Florin Peter2013-05-303-127/+92
| | * | | Merge branch 'master' into file_encryption_external_storage_fixesFlorin Peter2013-05-3016-718/+757
| | |\ \ \
| | * | | | fixed typoFlorin Peter2013-05-291-1/+1
| | * | | | Merge branch 'master' into file_encryption_external_storage_fixesFlorin Peter2013-05-2911-34/+40
| | |\ \ \ \
| | * | | | | fix for share folder on external storageFlorin Peter2013-05-292-2/+33
| | * | | | | check list of users with access to the file from the bottom to the top. This ...Björn Schießle2013-05-291-2/+2
| | * | | | | fixed if fopen returns false typically on external storageFlorin Peter2013-05-281-1/+1
* | | | | | | fix login errors while filesystem is not loadedFlorin Peter2013-05-311-0/+5
|/ / / / / /
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-05-316-0/+19
* | | | | | LDAP: fix generation of alternate internal name on conflicts. Use also smalle...Arthur Schiwon2013-05-301-2/+2
* | | | | | Merge pull request #3529 from owncloud/folder-permissionsicewind19912013-05-302-1/+31
|\ \ \ \ \ \