Commits · 1e84d6b14b56a4df39550b590051c2bfff900a9c · die_coolen_jungs / our_own_cloud_project

Feb 18, 2014
- Merge pull request #7190 from owncloud/appconfig-legacy-apps · 1e84d6b1
  Thomas Müller authored 11 years ago
  
  Remove usage of legacy OC_Appconfig
  1e84d6b1
- Merge pull request #6650 from owncloud/migration_unit_tests · a573fe7d
  Tom Needham authored 11 years ago
  
  User migration fix, and basic unit test
  a573fe7d
- Merge pull request #7176 from owncloud/style · 3b1083f4
  Lukas Reschke authored 11 years ago
  
  Some style fixes
  3b1083f4
- Remove unused variables · 0beaeed7
  Tom Needham authored 11 years ago
  
  0beaeed7
- Fix poor spelling · 589a7b22
  Tom Needham authored 11 years ago
  
  589a7b22
- Merge pull request #7243 from owncloud/core-sessionlifetimedefault · 92560c5b
  Thomas Müller authored 11 years ago
  
  Now using PHP session lifetime as default value for the JS config
  92560c5b
- Merge pull request #7239 from owncloud/cbr-filetype-icon · 5d3fc037
  Thomas Müller authored 11 years ago
  
  add cbr/cbz file type icon, fix #6953
  5d3fc037
Feb 17, 2014
- Now using PHP session lifetime as default value for the JS config · f9763e1f
  Vincent Petry authored 11 years ago
  
  This will fix the heartbeat when the session_lifetime config parameter hasn't been set explicitly.
  f9763e1f
- Merge pull request #7235 from DavidVentura/master · 323cc116
  Jan-Christoph Borchardt authored 11 years ago
  
  small change for compatibility
  323cc116
- Merge pull request #7240 from owncloud/mimetype-fallback · 617cbfed
  Robin Appelman authored 11 years ago
  
  use file icon as fallback instead of application icon, fix #7237
  617cbfed
- Merge pull request #7211 from mattcaron/master · 5a80339b
  Vincent Petry authored 11 years ago
  
  Fit shared videos to viewer, just like images. Issue #1648
  5a80339b
- Merge pull request #7231 from owncloud/proper-content-type · 798dc2c3
  Jörn Friedrich Dreyer authored 11 years ago
  
  Use the proper content-type
  798dc2c3
- use file icon as fallback instead of application icon, fix #7237 · c2adf033
  Jan-Christoph Borchardt authored 11 years ago
  
  c2adf033
- Merge pull request #7233 from owncloud/fix_5567 · 7e94d98b
  Jörn Friedrich Dreyer authored 11 years ago
  
  LDAP: improve wizard strings, fixes #5567
  7e94d98b
- add cbr/cbz file type icon, fix #6953 · 0f434038
  Jan-Christoph Borchardt authored 11 years ago
  
  0f434038
- Consolidate two sections, per code review. Issue #1648 · aa1a50f5
  Matthew Caron authored 11 years ago
  
  aa1a50f5
- small change for compatibility · a282afcb
  David authored 11 years ago
  
  a282afcb
- LDAP: improve wizard strings, fixes #5567 · 54f9db40
  Arthur Schiwon authored 11 years ago
  
  54f9db40
- Use the proper content-type · 8a2cd035
  Lukas Reschke authored 11 years ago
  
  We should use the proper content-type `application/xml` instead of the default `text/html` here. Backport requested.
  8a2cd035
- Merge pull request #7132 from owncloud/issue/6920 · 84cd6e03
  Jan-Christoph Borchardt authored 11 years ago
  
  Do not select input for all text input fields
  84cd6e03
- Merge pull request #6892 from owncloud/issuetemplate-enhancements · fe065f51
  Lukas Reschke authored 11 years ago
  
  Issue template enhancements
  fe065f51
- Removed quota question · fe9c9820
  Vincent Petry authored 11 years ago
  
  fe9c9820
- Merge branch 'master' into migration_unit_tests · a4b6d667
  Tom Needham authored 11 years ago
  
  a4b6d667
- Finish basic testing of user export · 049e03c2
  Tom Needham authored 11 years ago
  
  049e03c2
- Merge pull request #7155 from owncloud/enc_improved_error_handling · 5a8d3702
  Björn Schießle authored 11 years ago
  
  [encryption] improved error handling
  5a8d3702
- don't block login forever if we are stuck in the middle of the initial encryption · 6778dc5a
  Björn Schießle authored 11 years ago
  
  6778dc5a
- catch errors during decryption · f2f5769d
  Björn Schießle authored 11 years ago
  
  f2f5769d
- catch errors during initial encryption · 2ab06219
  Björn Schießle authored 11 years ago
  
  2ab06219
Feb 14, 2014
- Merge pull request #7156 from owncloud/backgroundjob-public · 750ffa82
  Thomas Müller authored 11 years ago
  
  Add the background job list to the public server container
  750ffa82
- Merge pull request #7207 from owncloud/fileinfo-serializable · df282d9e
  Morris Jobke authored 11 years ago
  
  Remove the JsonSerializable interface from \OC\Files\FileInfo
  df282d9e
- Fit shared videos to viewer, just like images. Issue #1648 · 2887fb1f
  Matthew Caron authored 11 years ago
  
  2887fb1f
- Merge pull request #7204 from owncloud/groupexists-duplicate · 41f0ad2d
  Thomas Müller authored 11 years ago
  
  Remove duplicate call to groupExists
  41f0ad2d
- remove the JsonSerializable interface from \OC\Files\FileInfo · 09502fcb
  Robin Appelman authored 11 years ago
  
  09502fcb
- Merge pull request #7206 from owncloud/fix_enc_tests · e2c0c0e2
  Arthur Schiwon authored 11 years ago
  
  fileinfo is no longer a array
  e2c0c0e2
- fileinfo is no longer a array · 29336683
  Björn Schießle authored 11 years ago
  
  29336683
- Merge pull request #6748 from owncloud/fileinfo · 2a7509ee
  Robin Appelman authored 11 years ago
  
  Add a FileInfo class which holds all info of a file ...
  2a7509ee
- Fix test cases for group manager · b35f6794
  Robin Appelman authored 11 years ago
  
  b35f6794
- Merge pull request #6726 from owncloud/fix_6630 · d7f45477
  Vincent Petry authored 11 years ago
  
  don't urldecode get var, php does this automatically
  d7f45477
- remove duplicate call to groupExists · 0ba05963
  Robin Appelman authored 11 years ago
  
  0ba05963
- Merge pull request #7183 from owncloud/remove-force-lowercase · 595b908b
  Thomas Müller authored 11 years ago
  
  remove forced lowercase from extension, fix #4747
  595b908b