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

13518 Commits

Author SHA1 Message Date
kondou c741a25eaa Merge branch 'master' into improve_app-management 2013-08-18 12:15:22 +02: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
Robin Appelman d8c71ba734 merge master in storage-wrapper-quota 2013-08-18 11:34:56 +02:00
Bjoern Schiessle d544a371bf revert changes to 3rdparty submodule reference 2013-08-18 11:31:25 +02: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
Owen Winkler c427e256e1 Merge pull request #4493 from owncloud/fixing-initL10n-master 
fixing undefined js error
 2013-08-18 02:18:04 -07:00
Owen Winkler 1793ec1d5d Fixed inconsistent spacing. 2013-08-18 05:17:28 -04:00
kondou 9e8a6b704d Add _many_ newlines at the end of files 2013-08-18 11:06:59 +02:00
Owen Winkler 9840363488 Break long lines into smaller ones. 2013-08-18 05:03:20 -04: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
kondou 65d802329f Fix some naming and spacing in lib/util.php 2013-08-18 10:33:09 +02:00
Thomas Müller 3d760222d4 fixing error page layout 2013-08-18 10:30:21 +02:00
kondou edd92e4c09 Merge branch 'master' into fix_jslint_kondou 
Conflicts:
	apps/files/js/file-upload.js
 2013-08-18 00:38:52 +02:00
Andreas Fischer 4bb0e1567b Use boolean casting for bitwise and result. 2013-08-17 23:41:37 +02:00
Andreas Fischer 4f462e9b6f Add trailing comma for all touched array lines. 2013-08-17 23:39:26 +02:00
Andreas Fischer d38929fb10 Fix spacing of all touched lines. 2013-08-17 23:38:26 +02:00
Thomas Müller 15c9a0f405 fixing undefined js error 2013-08-17 19:24:06 +02:00
Thomas Müller 727a191021 update 3rdparty submodule - timepicker removed 2013-08-17 18:54:08 +02:00
Thomas Müller e22a4aba47 update 3rdparty submodule 2013-08-17 18:47:41 +02:00
Thomas Müller c5cea47ab2 3rdparty submodule update: getid3 removed 2013-08-17 18:37:45 +02:00
Thomas Müller b82c8bf9e6 update 3rdparty - openid moved 2013-08-17 18:33:44 +02:00
Thomas Müller 7575186fa6 moving Dropbox and smb4php 3rdparty code over to the apps 2013-08-17 18:20:20 +02:00
Thomas Müller b4cc79970d update 3rdparty submodule 2013-08-17 18:17:49 +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
Kondou a1128aadd0 Merge pull request #4482 from owncloud/remove_cancel_button_filepicker 
Remove cancel button from filepicker
 2013-08-17 06:58:34 -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
Morris Jobke 3e88430840 Merge pull request #4475 from owncloud/brighter-font-color 
change font on login/install page from black to white
 2013-08-17 04:37:49 -07: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 69350c4e0d Merge pull request #4471 from owncloud/password-icon 
use proper password icon, three dots are 'more'
 2013-08-17 03:16:11 -07:00
Thomas Müller 264ee9df9a Merge pull request #4476 from owncloud/doc-on-master 
fix difference between packaged version and master
 2013-08-17 03:13:17 -07: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
kondou 2ee8425295 Remove cancel button from filepicker 
Having the cancel button in the bottom right corner was a bit confusing.
It's useless anyways, since there's a X in the top right.
 2013-08-17 12:07:58 +02: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
Morris Jobke 60efd93d5d fixes for IE8 2013-08-17 11:56:52 +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
Robin Appelman d43b4c52ae also emit hooks for views that are a subfolder of the user folder 2013-08-17 10:57:31 +02:00
Jan-Christoph Borchardt 7e4dcd268f vertically center rename input box 2013-08-17 10:46:03 +02:00
Morris Jobke 746d32eb05 fix difference between packaged version and master 2013-08-17 10:33:11 +02:00