mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
13,084 Commits 349 Branches 696 Tags 1.6 GiB
Commit Graph

6127 Commits

Author SHA1 Message Date
Georg Ehrke 224b80f906 move isMimeSupported out of template files 2013-08-21 15:55:59 +02:00
Georg Ehrke d9e8ebabdc outsource sharing and deleted files previews to apps 2013-08-19 13:24:07 +02:00
Georg Ehrke 48f0c54261 style fixes for preview lib 2013-08-19 12:16:55 +02:00
Georg Ehrke f2702ff1ca Merge master into oc_preview 2013-08-19 11:24:17 +02:00
Björn Schießle 9be836814c Merge pull request #4239 from owncloud/decrypt_files_again 
Enable user to decrypt files again after encryption app was disabled
 2013-08-18 09:51:48 -07:00
Christopher c620c5840a Merge pull request #4498 from owncloud/uploadprogress-near-uploadbutton 
move upload progress bar near upload button, more contextual
 2013-08-18 09:30:47 -07:00
Kondou c7af26ec84 Merge pull request #4497 from owncloud/newlines_at_eof_kondou 
Add newlines at the end of files
 2013-08-18 07:16:15 -07:00
Bart Visscher eb97818519 Merge pull request #4483 from owncloud/compare-true-false 
Compare result are already true/false
 2013-08-18 03:26:35 -07:00
Bart Visscher dda5eb2530 Merge pull request #4486 from owncloud/ldap_adjust_cache 
LDAP: use memcache if available
 2013-08-18 02:50:41 -07:00
Jan-Christoph Borchardt dce7cdaaec remove unneeded extra ID selectors 2013-08-18 11:27:51 +02:00
Bjoern Schiessle 1be11bb03d don't change the etags if a file gets encrypted/decrypted to avoid that the sync client downloads all files again 2013-08-18 11:21:01 +02:00
Jan-Christoph Borchardt bf4efd5290 move upload progress bar near upload button, more contextual 2013-08-18 11:18:16 +02:00
kondou 9e8a6b704d Add _many_ newlines at the end of files 2013-08-18 11:06:59 +02:00
Jan-Christoph Borchardt ce9103d522 Merge pull request #4426 from owncloud/ldap_settings_design 
Ldap settings design
 2013-08-18 01:52:51 -07:00
Andreas Fischer 4bb0e1567b Use boolean casting for bitwise and result. 2013-08-17 23:41:37 +02:00
Andreas Fischer d38929fb10 Fix spacing of all touched lines. 2013-08-17 23:38:26 +02:00
Thomas Müller 12f4494de0 Merge pull request #4339 from owncloud/mimetype-defaults 
Add the option to provide templates for newly created files
 2013-08-17 08:42:49 -07:00
Arthur Schiwon f41c4312ff LDAP: use memcache if available 2013-08-17 17:22:54 +02:00
Morris Jobke 6ae6dc00e5 Merge pull request #4427 from owncloud/fix_4425 
use OC files API to create missing directory
 2013-08-17 08:09:07 -07:00
Bjoern Schiessle f28f528431 switched to dirname() 2013-08-17 13:49:42 +02:00
Bjoern Schiessle db8fdd5032 added missing parameter documentation 2013-08-17 13:46:33 +02:00
Björn Schießle 1af2ec1724 Merge pull request #4481 from owncloud/fix_versioning_size_check 
first check if file exists before checking the files size
 2013-08-17 04:37:09 -07:00
Bjoern Schiessle f71794f0d5 added createMissingDirectories() method 2013-08-17 13:28:35 +02:00
Bjoern Schiessle cabe92ef12 Merge branch 'master' into decrypt_files_again 
Conflicts:
	apps/files_encryption/tests/keymanager.php
 2013-08-17 13:15:22 +02:00
Björn Schießle d3e2f31ada Merge pull request #4352 from owncloud/encryption_clean_up 
crypt.php clean up
 2013-08-17 04:10:15 -07:00
Bart Visscher 29b6dd53a0 Compare result are already true/false 2013-08-17 12:58:10 +02:00
Arthur Schiwon c538ac3081 LDAP: only connect to LDAP once on login 2013-08-17 12:16:51 +02:00
Thomas Müller e761cba808 Merge pull request #4480 from owncloud/remove-ru_RU-master 
remove ru_RU - fixes #3135
 2013-08-17 03:10:42 -07:00
Morris Jobke 50147bfbd1 Merge pull request #4193 from owncloud/versions_fix_css 
Versions fix css
 2013-08-17 03:01:24 -07:00
Bjoern Schiessle 16efd81a0e first check if file exists before checking the files size 2013-08-17 11:57:50 +02:00
Thomas Müller de52157e76 remove ru_RU - fixes #3135 2013-08-17 11:43:37 +02:00
Bjoern Schiessle 137cd2ca89 increase width of versions dialog 2013-08-17 11:01:43 +02:00
Jan-Christoph Borchardt 7e4dcd268f vertically center rename input box 2013-08-17 10:46:03 +02:00
Georg Ehrke 164502477d use jQuery.get instead of jQuery.ajax 2013-08-16 17:25:38 +02:00
Morris Jobke 837cefd8a3 Merge pull request #4442 from owncloud/no-smb-client-on-windows-master 
no files external for SMB on windows
 2013-08-16 02:48:42 -07:00
Jenkins for ownCloud 6bd0ba79df [tx-robot] updated from transifex 2013-08-16 01:32:30 -04:00
Jan-Christoph Borchardt d2767faf61 Merge pull request #4113 from owncloud/delete-fix 
Delete icon fix
 2013-08-15 15:31:42 -07:00
Thomas Müller 57f7ff2dbd communicate size of newly created file back and update UI 2013-08-16 00:31:27 +02:00
Thomas Müller 7279a07ca2 Merge branch 'master' into mimetype-defaults 
Conflicts:
	apps/files/ajax/newfile.php
 2013-08-16 00:13:10 +02:00
Thomas Müller bd1895bdf8 Merge pull request #4354 from owncloud/fix_2711_shared_icon_disappears_on_firefox 
fix #2711 using a custom event, also use css selectors over filterAttr
 2013-08-15 14:08:01 -07:00
Jan-Christoph Borchardt e7c0693570 checkstyle double quotes in HTML 2013-08-15 19:40:39 +02:00
Arthur Schiwon 42fc2295e4 LDAP: Update Host in configuration chooser on Save 2013-08-15 16:10:49 +02:00
Arthur Schiwon 479f893f6d LDAP: Show Host name in configuration drop down 2013-08-15 15:55:06 +02:00
Thomas Müller ada13a4d40 fixing all broken translation files 2013-08-15 15:41:45 +02:00
Bjoern Schiessle 7adfc27caf remove whitespaces and some leftover code from testing 2013-08-15 13:13:16 +02:00
Jan-Christoph Borchardt 2fd5178a00 adjust New file dialog for new styles 2013-08-15 12:50:26 +02:00
Arthur Schiwon cbfee81068 LDAP: slightly smaller input fields 2013-08-15 12:45:37 +02:00
Thomas Müller 05549884c6 no files external for SMB on windows 2013-08-15 12:00:02 +02:00
Jenkins for ownCloud 680ac48856 [tx-robot] updated from transifex 2013-08-15 04:53:54 -04:00
Morris Jobke de89c31f5a Merge pull request #4302 from synchrone/master 
Fixing owncloud/core#4301
 2013-08-14 17:11:30 -07:00