Commit Graph

14334 Commits (25320f19df017947f31ea156ade061274b5bd691)
 

Author SHA1 Message Date
Bjoern Schiessle 25320f19df Merge branch 'master' into avater_with_encryption 12 years ago
Bjoern Schiessle 0b8273c768 test should work now 12 years ago
Morris Jobke 52501d6ba3 Merge pull request #5332 from owncloud/enc_run_proxy_only_for_files 12 years ago
Björn Schießle a6d9319328 Merge pull request #5269 from owncloud/ocs_share_api_add_received_from 12 years ago
Vincent Petry fa341e49a8 Merge pull request #5341 from owncloud/fix-logout-link-html 12 years ago
icewind1991 2bb4527269 Merge pull request #5340 from owncloud/fixing-5251-master 12 years ago
Andreas Fischer 06f9b7b862 Fix logout link HTML. 12 years ago
Thomas Müller 6df5c7ebd5 streamCopy() should return proper structure. 12 years ago
Vincent Petry 4ae1d08241 Merge pull request #5330 from owncloud/files-removedfileactionsbkg 12 years ago
Bjoern Schiessle 3380bd650f avatars should also work with encryption after pr #5332 was merged 12 years ago
Bjoern Schiessle d3af7a9aa4 check if we are writing to user/files, otherwise skip encryption 12 years ago
Vincent Petry e79d853867 Removed extra bkg color on file actions when row is selected/hovered on 12 years ago
Thomas Müller c97b52090e Merge pull request #4867 from owncloud/fixing-4546-master 12 years ago
Frank Karlitschek c6314b1c03 Merge pull request #5323 from owncloud/files-external-missinggridstyle 12 years ago
Vincent Petry b8285ca316 Added missing "grid" class on external storage's table 12 years ago
Jan-Christoph Borchardt e9ce704f17 Merge pull request #5297 from owncloud/quota-style 12 years ago
Vincent Petry de920736c5 Merge pull request #5320 from owncloud/fix_app_sorting 12 years ago
Frank Karlitschek 258ccdfabe case insensitive sort 12 years ago
Frank Karlitschek a201a66878 fix style 12 years ago
Thomas Müller a5e808defc Merge branch 'master' into fixing-4546-master 12 years ago
Frank Karlitschek f06df170cb finally fix the app sorting 12 years ago
raghunayyar e0d3046590 Fixes Default Quota Style in User Management. 12 years ago
Jenkins for ownCloud f3336f8877 [tx-robot] updated from transifex 12 years ago
Raghu Nayyar e8bede5e0d Merge pull request #5318 from owncloud/show_channel 12 years ago
Morris Jobke a021a12b3b Merge pull request #5253 from owncloud/externalstorage-adminstatusindicator 12 years ago
Frank Karlitschek 7cf81f2d12 show the channel. Also mark git as git channel so that someone can see where this build comes from 12 years ago
Thomas Müller 3f54e3c783 Merge pull request #5299 from owncloud/settings-ie8-tablegridstyles 12 years ago
Thomas Müller 8be9773c73 Merge pull request #5303 from owncloud/fix-unlogged-session-error 12 years ago
Morris Jobke e6d034a60b Merge pull request #5290 from owncloud/fixing-5191-master 12 years ago
Thomas Müller fce198874f Merge pull request #5272 from mrflix/master 12 years ago
Thomas Müller 46dd273b9c Merge pull request #5287 from owncloud/core-layoutviewportdirective 12 years ago
Thomas Müller bff6ca212a Merge pull request #5301 from owncloud/versioning_preview_shared 12 years ago
Tom Needham 14617682c8 Merge branch 'master' of github.com:owncloud/core into fix-unlogged-session-error 12 years ago
Tom Needham 6f8dd54788 Include exception message in log entry when session fails to start 12 years ago
Morris Jobke 22bb9762fd Merge pull request #5304 from owncloud/files-deleteiconpositionfix 12 years ago
Morris Jobke 6c85fc41aa Merge pull request #5296 from owncloud/remove-chosen-hack 12 years ago
Thomas Müller dc58195c7f Merge pull request #5207 from owncloud/fixing-4011-part2-master 12 years ago
Tom Needham cf7ea4bec5 Handle ownCloud logging when data dir not created 12 years ago
Vincent Petry a4a52733f9 Fixed position of "delete" icon in files app 12 years ago
Tom Needham cb110c0679 Log the session exception when ownCloud is not installed 12 years ago
Vincent Petry 067475a907 Merge pull request #5302 from owncloud/files-missingfileactionsafteradd 12 years ago
Vincent Petry b2986e1994 Merge pull request #5274 from owncloud/files-ie8-deletecheckbox 12 years ago
Vincent Petry e98ea06890 File actions are now updated after create/upload file 12 years ago
Bjoern Schiessle 9baedb4102 remove debug output 12 years ago
Bjoern Schiessle c32c5979d8 Merge branch 'master' into versioning_preview_shared 12 years ago
Björn Schießle 5c664704a3 Merge pull request #5261 from owncloud/versioning_no_glob 12 years ago
Björn Schießle 9a15aa8ee9 Merge pull request #5298 from owncloud/enc_fix_setting_dialog_headlines 12 years ago
Vincent Petry 1a05ed2f38 Fixed table grid styles for IE8 12 years ago
Bjoern Schiessle 57beef1e36 fix setting dialog headlines for the encryption app 12 years ago
Björn Schießle 034968c612 Merge pull request #5292 from owncloud/enc_block_file_access_if_key_is_missing 12 years ago