summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | | | remove unnecessary tipsy for Files deleteJan-Christoph Borchardt2013-07-181-1/+1
| * | | | | use background image instead of img for Files delete iconJan-Christoph Borchardt2013-07-181-4/+1
* | | | | | Merge pull request #4354 from owncloud/fix_2711_shared_icon_disappears_on_fir...Thomas Müller2013-08-152-4/+8
|\ \ \ \ \ \
| * | | | | | fix #2711 using a custom event, also use css selectors over filterAttrJörn Friedrich Dreyer2013-08-082-4/+8
* | | | | | | fixing all broken translation filesThomas Müller2013-08-15132-332/+332
| |_|_|/ / / |/| | | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-15134-475/+337
* | | | | | Merge pull request #4302 from synchrone/masterMorris Jobke2013-08-141-0/+1
|\ \ \ \ \ \
| * | | | | | Fixing owncloud/core#4301Alexander Bogdanov2013-08-021-0/+1
* | | | | | | Merge pull request #4393 from owncloud/fix_4326Andreas Fischer2013-08-141-1/+1
|\ \ \ \ \ \ \
| * | | | | | | use __DIR__ instead of realpathBjoern Schiessle2013-08-141-1/+1
| * | | | | | | provide correct path for require_onceBjoern Schiessle2013-08-121-1/+1
* | | | | | | | Merge pull request #4376 from owncloud/use_pluralsJörn Friedrich Dreyer2013-08-143-23/+8
|\ \ \ \ \ \ \ \
| * | | | | | | | Reword a phrasekondou2013-08-141-1/+1
| * | | | | | | | Use plural translationskondou2013-08-093-23/+8
| |/ / / / / / /
* | | | | | | | Merge pull request #4363 from owncloud/fix-4355Thomas Müller2013-08-141-11/+16
|\ \ \ \ \ \ \ \
| * | | | | | | | Use multiple lines for the JSON data array.Andreas Fischer2013-08-081-1/+5
| * | | | | | | | Adjust JSON code to stable5.Andreas Fischer2013-08-081-1/+2
| * | | | | | | | Do not repeat JSON success code.Andreas Fischer2013-08-081-8/+7
| * | | | | | | | Do not repeat definition of $target.Andreas Fischer2013-08-081-5/+6
* | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-1314-4/+51
* | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-1110-0/+13
| |/ / / / / / / |/| | | | | | |
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-09500-522/+1549
|/ / / / / / /
* | | | | | | Merge pull request #3912 from owncloud/css_cleanup_kondouJan-Christoph Borchardt2013-08-081-1/+1
|\ \ \ \ \ \ \