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

11510 Commits

Author SHA1 Message Date
Jenkins for ownCloud a730a72dcb [tx-robot] updated from transifex 2013-05-31 02:04:40 +02:00
Arthur Schiwon bd7771867b LDAP: fix generation of alternate internal name on conflicts. Use also smaller number for better user experience on e.g. *DAV links 2013-05-30 16:55:21 +02:00
Jörn Friedrich Dreyer 476747ee89 Merge pull request #3509 from owncloud/update_jquery_to_1_10 
Update jquery to 1.10.0 and add jquery-migrate 1.2.1
 2013-05-30 06:00:52 -07:00
icewind1991 aa1c5a5d63 Merge pull request #3529 from owncloud/folder-permissions 
Cache: provide a function to get the permissions of all files in a folder with one query
 2013-05-30 05:54:29 -07:00
Jenkins for ownCloud 8e1d9261aa [tx-robot] updated from transifex 2013-05-30 02:34:14 +02:00
Michael Gapczynski 5a47054505 Implement getDirectoryPermissions() in Shared Permissions, fixes #2846 2013-05-29 18:22:54 -04:00
Michael Gapczynski dbbf195727 Only retrieve the current user's permissions 2013-05-29 18:08:18 -04:00
Thomas Tanghus 2ce555fe55 Merge pull request #3533 from owncloud/signature-delimiter 
fix wrong signature delimiter - fix #3523
 2013-05-29 14:58:00 -07:00
Morris Jobke 4a6f774642 Merge pull request #3507 from owncloud/remove_unused_vars 
remove unused varaibles
 2013-05-29 14:46:04 -07:00
Florin Peter d59ae569ba reformat code 2013-05-29 23:13:45 +02:00
Florin Peter 838fd1a20a changed " to ' 2013-05-29 23:11:30 +02:00
Florin Peter 8c6eec7a8f Merge branch 'master' into remove_unused_vars 2013-05-29 20:29:09 +02:00
Florin Peter ee7c4c4c93 changed l10n to full sentences 2013-05-29 20:27:12 +02:00
Morris Jobke 5c04b3a63a fix wrong signature delimiter - fix #3523 2013-05-29 20:21:48 +02:00
Michael Gapczynski 5bbc583b56 Merge pull request #3532 from owncloud/scan-update 
Only update metadata that has changed
 2013-05-29 10:23:41 -07:00
icewind1991 8a5dec7775 Merge pull request #3530 from owncloud/cache-mimeicon 
Cache mimetype icons
 2013-05-29 08:20:58 -07:00
Michael Gapczynski 59655e9afd Style fixes 2013-05-29 10:56:28 -04:00
Michael Gapczynski ea55367678 Organize conditionals in a better order 2013-05-29 10:40:05 -04:00
Michael Gapczynski 04805d0be9 Only update metadata that has changed 2013-05-29 10:19:03 -04:00
Robin Appelman 24a401a548 Cache mimetype icons 2013-05-29 15:43:41 +02:00
Robin Appelman 44d217c425 Cache: provide a function to get the permissions of all files in a folder with one query 2013-05-29 15:25:42 +02:00
Florin Peter 5dd865a57f changes l10n after review 2013-05-29 12:47:50 +02:00
Florin Peter efd629462e changes after review 2013-05-29 12:23:33 +02:00
Florin Peter c398fc59ad Merge branch 'master' into remove_unused_vars 
Conflicts:
	apps/files_encryption/hooks/hooks.php
	apps/files_encryption/lib/proxy.php
	apps/files_encryption/lib/session.php
	apps/files_encryption/lib/stream.php
 2013-05-29 09:21:00 +02:00
Jenkins for ownCloud 7c0c6bd779 [tx-robot] updated from transifex 2013-05-29 02:10:54 +02:00
icewind1991 fee43ec506 Merge pull request #3511 from owncloud/sessionclass 
Abstract session access away in a class
 2013-05-28 13:37:39 -07:00
Robin Appelman fa6bfe8837 didn't mean to commit this yet 2013-05-28 17:21:44 +02:00
Florin Peter 4b4b447e2a fixed missing convert to new session handler 2013-05-28 17:06:37 +02:00
Florin Peter 5b7395f55b Merge branch 'sessionclass' of https://github.com/owncloud/core into sessionclass 2013-05-28 17:04:44 +02:00
Florin Peter 6ae7bde788 fixed encryption session namespace to avoid problems 2013-05-28 17:04:35 +02:00
Robin Appelman 57f712f8a9 implement ArrayInterface with Session 2013-05-28 16:52:40 +02:00
Robin Appelman cc0cf93136 merge master into sessionclass 2013-05-28 14:55:42 +02:00
Jörn Friedrich Dreyer 1d720099c3 Merge pull request #3179 from pawl/patch-1 
Improve IE Compatibility
 2013-05-28 05:18:43 -07:00
Jörn Friedrich Dreyer da55c76168 Merge pull request #2778 from Kondou-ger/optimize_pictures 
Optimize pictures with optipng.
 2013-05-28 04:48:38 -07:00
blizzz 3beff3fdc2 Merge pull request #3488 from zafi/master 
The "lost password" field in the personal setting depends on OC_USER_BACKEND_SET_PASSWORD
 2013-05-28 02:39:02 -07:00
Florin Peter 09b54ccb2b Merge branch 'master' into remove_unused_vars 
Conflicts:
	apps/files_encryption/lib/session.php
	apps/files_encryption/lib/util.php
 2013-05-28 11:00:49 +02:00
FlorinPeter 086c33ef57 Merge pull request #3512 from owncloud/file_encryption_session_fix 
fix for losing private key while being logged in and accessing a public link
 2013-05-28 01:55:55 -07:00
Björn Schießle 3a76c22372 $_POST["adminEnableRecovery"] is a string 2013-05-28 10:51:12 +02:00
Florin Peter 0041711fe3 fix for undefined index 2013-05-28 09:36:14 +02:00
Florin Peter 6f9e425939 fix for losing private key while being logged in and accessing a public link 2013-05-28 09:27:04 +02:00
Jenkins for ownCloud 3420d853ab [tx-robot] updated from transifex 2013-05-28 02:07:51 +02:00
Robin Appelman 9c99048429 fix syntax error 2013-05-28 01:31:26 +02:00
Robin Appelman 040045cc2e provide a dummy session for CLI 2013-05-28 01:15:38 +02:00
Robin Appelman f547b66d6b check fix if session start is successfull 2013-05-28 01:13:36 +02:00
Robin Appelman e73c04501e Fix session not working error 2013-05-28 01:10:18 +02:00
Robin Appelman 44f9af5a7f Use the new session wrapper 2013-05-28 01:04:09 +02:00
Robin Appelman 76d13120ea Abstract the session away in a class 2013-05-28 00:50:00 +02:00
Frank Karlitschek aeff1a4c4d Merge pull request #3510 from owncloud/publicemitter 
Add PublicEmitter class
 2013-05-27 13:45:47 -07:00
Florin Peter e1e1c58969 changed to public log api 2013-05-27 20:51:52 +02:00
Florin Peter 7224fc98b2 replace == with === and replace != with !== 2013-05-27 20:44:38 +02:00