summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #4483 from owncloud/compare-true-falseBart Visscher2013-08-187-14/+14
|\
| * Use boolean casting for bitwise and result.Andreas Fischer2013-08-171-1/+1
| * Fix spacing of all touched lines.Andreas Fischer2013-08-171-1/+1
| * Compare result are already true/falseBart Visscher2013-08-177-14/+14
* | Merge pull request #4486 from owncloud/ldap_adjust_cacheBart Visscher2013-08-181-1/+6
|\ \
| * | LDAP: use memcache if availableArthur Schiwon2013-08-171-1/+6
| |/
* | Merge pull request #4426 from owncloud/ldap_settings_designJan-Christoph Borchardt2013-08-185-9/+49
|\ \
| * | LDAP: Update Host in configuration chooser on SaveArthur Schiwon2013-08-151-0/+7
| * | LDAP: Show Host name in configuration drop downArthur Schiwon2013-08-153-1/+31
| * | LDAP: slightly smaller input fieldsArthur Schiwon2013-08-151-1/+1
| * | LDAP: move small info text strings into tooltipsArthur Schiwon2013-08-141-7/+4
| * | LDAP: right align labels on settings pageArthur Schiwon2013-08-141-0/+6
* | | Merge pull request #4339 from owncloud/mimetype-defaultsThomas Müller2013-08-174-315/+331
|\ \ \
| * | | communicate size of newly created file back and update UIThomas Müller2013-08-163-310/+316
| * | | Merge branch 'master' into mimetype-defaultsThomas Müller2013-08-16514-1095/+2078
| |\ \ \
| * | | | actually register html templateRobin Appelman2013-08-071-5/+9
| * | | | add the option to have templates for newly created filesRobin Appelman2013-08-071-34/+38
* | | | | Merge pull request #4427 from owncloud/fix_4425Morris Jobke2013-08-171-9/+21
|\ \ \ \ \
| * | | | | switched to dirname()Bjoern Schiessle2013-08-171-1/+1
| * | | | | added missing parameter documentationBjoern Schiessle2013-08-171-1/+2
| * | | | | added createMissingDirectories() methodBjoern Schiessle2013-08-171-26/+27
| * | | | | also create root dir if it doesn't exist yetBjoern Schiessle2013-08-141-6/+13
| * | | | | use OC files API to create missing directory which should handle special char...Bjoern Schiessle2013-08-141-4/+7
| | |_|/ / | |/| | |
* | | | | Merge pull request #4481 from owncloud/fix_versioning_size_checkBjörn Schießle2013-08-171-10/+9
|\ \ \ \ \
| * | | | | first check if file exists before checking the files sizeBjoern Schiessle2013-08-171-10/+9
* | | | | | Merge pull request #4352 from owncloud/encryption_clean_upBjörn Schießle2013-08-175-445/+50
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | change decryptUnknownKeyfile() to decryptKeyfile(), we always use openssl_sealBjoern Schiessle2013-08-121-30/+6
| * | | | | Merge branch 'encryption_clean_up' of github.com:owncloud/core into encryptio...Bjoern Schiessle2013-08-092-7/+7
| |\ \ \ \ \
| | * | | | | fixing typos and PHPDocThomas Müller2013-08-082-7/+7
| * | | | | | remove old comments, TODos, etc.Bjoern Schiessle2013-08-092-66/+0
| |/ / / / /
| * | | | | remove todo itemBjoern Schiessle2013-08-081-4/+0
| * | | | | adapt tests to the changes in crypt.phpBjoern Schiessle2013-08-082-244/+31
| * | | | | make methods private which are not used from outsideBjoern Schiessle2013-08-081-101/+13
* | | | | | LDAP: only connect to LDAP once on loginArthur Schiwon2013-08-172-6/+18
* | | | | | Merge pull request #4480 from owncloud/remove-ru_RU-masterThomas Müller2013-08-178-56/+0
|\ \ \ \ \ \
| * | | | | | remove ru_RU - fixes #3135Thomas Müller2013-08-178-56/+0
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #4193 from owncloud/versions_fix_cssMorris Jobke2013-08-172-9/+6
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | increase width of versions dialogBjoern Schiessle2013-08-171-0/+4
| * | | | | css for button no longer neededBjörn Schießle2013-07-251-3/+0
| * | | | | remove unused code; use jqueryBjörn Schießle2013-07-251-6/+2
| * | | | | fix cssBjörn Schießle2013-07-251-1/+1
* | | | | | Merge pull request #4442 from owncloud/no-smb-client-on-windows-masterMorris Jobke2013-08-161-10/+16
|\ \ \ \ \ \
| * | | | | | no files external for SMB on windowsThomas Müller2013-08-151-10/+16
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-1674-155/+123
* | | | | | | Merge pull request #4113 from owncloud/delete-fixJan-Christoph Borchardt2013-08-153-15/+10
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | fix loading.gif size for both upload and deletion, force visiblityJan-Christoph Borchardt2013-07-301-1/+1
| * | | | | | Replace delete icon with spinnerVictor Dubiniuk2013-07-291-5/+3
| * | | | | | Merge branch 'master' into delete-fixThomas Müller2013-07-23765-262/+70811
| |\ \ \ \ \ \
| * | | | | | | fix delete button not showing in IE8Jan-Christoph Borchardt2013-07-221-4/+4
| * | | | | | | use new delete icon for deleted files as wellJan-Christoph Borchardt2013-07-181-1/+1
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-21 13:22:08 +0000