Commits · 5dd865a57f5e769afb612428e739caff0ba1ea65 · die_coolen_jungs / our_own_cloud_project

May 29, 2013
- changes l10n after review · 5dd865a5
  Florin Peter authored 11 years ago
  
  5dd865a5
- changes after review · efd62946
  Florin Peter authored 11 years ago
  
  efd62946
- Merge branch 'master' into remove_unused_vars · c398fc59
  Florin Peter authored 11 years ago
  
  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
  c398fc59
- [tx-robot] updated from transifex · 7c0c6bd7
  Jenkins for ownCloud authored 11 years ago
  
  7c0c6bd7
May 28, 2013
- Merge pull request #3511 from owncloud/sessionclass · fee43ec5
  Robin Appelman authored 11 years ago
  
  Abstract session access away in a class
  fee43ec5
- didn't mean to commit this yet · fa6bfe88
  Robin Appelman authored 11 years ago
  
  fa6bfe88
- fixed missing convert to new session handler · 4b4b447e
  Florin Peter authored 11 years ago
  
  4b4b447e
- Merge branch 'sessionclass' of https://github.com/owncloud/core into sessionclass · 5b7395f5
  Florin Peter authored 11 years ago
  
  5b7395f5
- fixed encryption session namespace to avoid problems · 6ae7bde7
  Florin Peter authored 11 years ago
  
  6ae7bde7
- implement ArrayInterface with Session · 57f712f8
  Robin Appelman authored 11 years ago
  
  57f712f8
- merge master into sessionclass · cc0cf931
  Robin Appelman authored 11 years ago
  
  cc0cf931
- Merge pull request #3179 from pawl/patch-1 · 1d720099
  Jörn Friedrich Dreyer authored 11 years ago
  
  Improve IE Compatibility
  1d720099
- Merge pull request #2778 from Kondou-ger/optimize_pictures · da55c761
  Jörn Friedrich Dreyer authored 11 years ago
  
  Optimize pictures with optipng.
  da55c761
- Merge pull request #3488 from zafi/master · 3beff3fd
  Arthur Schiwon authored 11 years ago
  
  The "lost password" field in the personal setting depends on OC_USER_BACKEND_SET_PASSWORD
  3beff3fd
- Merge branch 'master' into remove_unused_vars · 09b54ccb
  Florin Peter authored 11 years ago
  
  Conflicts: apps/files_encryption/lib/session.php apps/files_encryption/lib/util.php
  09b54ccb
- Merge pull request #3512 from owncloud/file_encryption_session_fix · 086c33ef
  Florin Peter authored 11 years ago
  
  fix for losing private key while being logged in and accessing a public link
  086c33ef
- $_POST["adminEnableRecovery"] is a string · 3a76c223
  Björn Schießle authored 11 years ago
  
  3a76c223
- fix for undefined index · 0041711f
  Florin Peter authored 11 years ago
  
  0041711f
- fix for losing private key while being logged in and accessing a public link · 6f9e4259
  Florin Peter authored 11 years ago
  
  6f9e4259
- [tx-robot] updated from transifex · 3420d853
  Jenkins for ownCloud authored 11 years ago
  
  3420d853
May 27, 2013
- fix syntax error · 9c990484
  Robin Appelman authored 11 years ago
  
  9c990484
- provide a dummy session for CLI · 040045cc
  Robin Appelman authored 11 years ago
  
  040045cc
- check fix if session start is successfull · f547b66d
  Robin Appelman authored 11 years ago
  
  f547b66d
- Fix session not working error · e73c0450
  Robin Appelman authored 11 years ago
  
  e73c0450
- Use the new session wrapper · 44f9af5a
  Robin Appelman authored 11 years ago
  
  44f9af5a
- Abstract the session away in a class · 76d13120
  Robin Appelman authored 11 years ago
  
  76d13120
- Merge pull request #3510 from owncloud/publicemitter · aeff1a4c
  Frank Karlitschek authored 11 years ago
  
  Add PublicEmitter class
  aeff1a4c
- changed to public log api · e1e1c589
  Florin Peter authored 11 years ago
  
  e1e1c589
- replace == with === and replace != with !== · 7224fc98
  Florin Peter authored 11 years ago
  
  7224fc98
- changed basic auth to test user · 6075aff6
  Florin Peter authored 11 years ago
  
  6075aff6
- Add PublicEmitter class · 9e65f40d
  Robin Appelman authored 11 years ago
  
  9e65f40d
- Merge branch 'master' into remove_unused_vars · 2c3c60c1
  Björn Schießle authored 11 years ago
  
  Conflicts: apps/files_encryption/hooks/hooks.php apps/files_encryption/lib/crypt.php apps/files_encryption/lib/proxy.php
  2c3c60c1
- replace == with === · c81e34ef
  Björn Schießle authored 11 years ago
  
  c81e34ef
- legacyBlockDecryprt() needs to be public · 4c05259c
  Björn Schießle authored 11 years ago
  
  4c05259c
- make legacyDecrypt() private als always call legacyBlockDecrypt() from other classes · df22a7c4
  Björn Schießle authored 11 years ago
  
  df22a7c4
- fix migration from old to new encryption · 8b355788
  Björn Schießle authored 11 years ago
  
  8b355788
- reformat code · 5d32e214
  Florin Peter authored 11 years ago
  
  5d32e214
- Merge branch 'master' into remove_unused_vars · 690bf9b8
  Florin Peter authored 11 years ago
  
  Conflicts: apps/files_encryption/lib/util.php
  690bf9b8
- Merge pull request #3506 from owncloud/fix_3320 · f8d1c321
  Björn Schießle authored 11 years ago
  
  fix https://github.com/owncloud/core/issues/3320
  f8d1c321
- Merge pull request #3495 from owncloud/file_encryption_util_is_error · c6d6925b
  Thomas Tanghus authored 11 years ago
  
  added OC_DB::isError and logging for #3486
  c6d6925b