Commit Graph

12225 Commits (481bb831bb898399a01495fb6d3b07ca44a02f17)
 

Author SHA1 Message Date
Thomas Müller 481bb831bb Merge branch 'master' into ext-fs-irods-master 12 years ago
icewind1991 3abe68176f Merge pull request #3270 from owncloud/convert-oc_config 12 years ago
Jenkins for ownCloud 3fbf7ab189 [tx-robot] updated from transifex 12 years ago
Jörn Friedrich Dreyer c5f2ea9a95 Merge pull request #4015 from owncloud/fixing-4005-master 12 years ago
Jenkins for ownCloud f74659f3f6 [tx-robot] updated from transifex 12 years ago
Thomas Müller d18bd17eb7 - eventsource.php: in case of potential CSRF attack we send an error message from the EventSource to the browser 12 years ago
icewind1991 d134ba9a82 Merge pull request #3978 from owncloud/forwarding-emitter 12 years ago
Morris Jobke e2a5af4b9e Merge pull request #3985 from owncloud/cookie-past2 12 years ago
Jan-Christoph Borchardt a9072056a0 Merge pull request #3990 from owncloud/size-mb 12 years ago
Morris Jobke eed516c31a Merge pull request #4002 from owncloud/use_OC_in_settings_js 12 years ago
Jan-Christoph Borchardt 3fb3a7baa8 add MB indicator to size heading, fix #3987 12 years ago
Morris Jobke 01c6ca94c2 Merge pull request #4003 from owncloud/use_close_png_instead_of_delete_png_for_dialogs 12 years ago
Arthur Schiwon 5387e5c354 LDAP: even better check for emptiness, fixes #3815 12 years ago
Jörn Friedrich Dreyer 6a50848a6e Merge pull request #3994 from owncloud/fix_oracle_setup 12 years ago
kondou 4cd87549e1 Close.png instead of delete.png for close dialogs 12 years ago
kondou efb707a431 Use OC instead of oc to show alert at an error. 12 years ago
Jenkins for ownCloud 7ec6f3bde9 [tx-robot] updated from transifex 12 years ago
Victor Dubiniuk 194ab11322 General fixes 12 years ago
mvn23 40879c6327 Merge pull request #3787 from mvn23/patch-1 12 years ago
VicDeo 43755a292b Merge pull request #3943 from owncloud/encode_uri_component 12 years ago
Thomas Tanghus 9e9c323acd Set path in cookie. 12 years ago
Victor Dubiniuk c0b210f0d5 Add unit test 12 years ago
Victor Dubiniuk 257096f1d4 Encode current trashbin directory 12 years ago
Victor Dubiniuk 582631323a Migrate to encodePath 12 years ago
Victor Dubiniuk 5a3fce12a4 Implement encodePath 12 years ago
Jan-Christoph Borchardt d70d4f435e apply @LukasReschke's cookie changes, hopefully finally fix #854 12 years ago
Jörn Friedrich Dreyer cc0965b9bc Merge pull request #3980 from owncloud/try-permissions-hook-again 12 years ago
Jörn Friedrich Dreyer 5513e30752 Merge pull request #3920 from owncloud/Fixing_search_ie8 12 years ago
Jenkins for ownCloud 439cad07b5 [tx-robot] updated from transifex 12 years ago
Michael Gapczynski 4feff3456b Only emit permissions hook for files and and include path 12 years ago
Thomas Müller 244d376a16 Merge pull request #3977 from owncloud/enable_oracle_in_autotests 12 years ago
icewind1991 af1c3dd4ce Merge pull request #3963 from owncloud/update-logic-split 12 years ago
Robin Appelman a0d5ba1167 fix typo 12 years ago
Jörn Friedrich Dreyer 15907f6aee Merge pull request #3979 from owncloud/permissions-hook 12 years ago
Bart Visscher e7b882a4fc stupid namespace 12 years ago
Bart Visscher abe9abab99 Add constructor documentation 12 years ago
Jörn Friedrich Dreyer 301c9e1399 requires fixes in 3rdparty mdb2 12 years ago
Bart Visscher 52553c64ed Merge branch 'master' into convert-oc_config 12 years ago
Michael Gapczynski 5c2a0325ba Add update permissions hook to sharing 12 years ago
Robin Appelman 4a4e139c83 forward previously registerd hooks 12 years ago
Robin Appelman 925d09cb0e add forwarding emitter for agregating multiple emitters 12 years ago
Jörn Friedrich Dreyer ccce93755f enable oracle testing by default 12 years ago
Thomas Müller 02d2e41e04 Merge pull request #3954 from owncloud/update_insertifnotexist_and_test 12 years ago
Jan-Christoph Borchardt 8d8f99fbc4 Merge pull request #3757 from owncloud/icon-cleanup 12 years ago
Thomas Müller 0365d244e0 Merge pull request #3946 from owncloud/fixing-3942-master 12 years ago
Björn Schießle 9b9ea7cd8e Merge https://github.com/owncloud/core/pull/3827 12 years ago
Jenkins for ownCloud 3cb4a72960 [tx-robot] updated from transifex 12 years ago
Jenkins for ownCloud 096d7674fc [tx-robot] updated from transifex 12 years ago
Robin Appelman 9cd7ecd502 Updater: pass update url as argument to update check 12 years ago
Robin Appelman 58f473d734 split upgrade logic from ajax file 12 years ago