Commit Graph

11796 Commits (c8564c07955ead3e85daa67e1871a2c41df3a6d5)
 

Author SHA1 Message Date
Thomas Mueller c8564c0795 Merge branch 'master' into move-maint-start 13 years ago
Jenkins for ownCloud 6c534c8165 [tx-robot] updated from transifex 13 years ago
Thomas Müller 8edb56de05 Merge pull request #3690 from owncloud/use_execute_audited_in_filecache 13 years ago
Thomas Müller 2a58cf8117 Merge pull request #3686 from owncloud/minor_exception_cleanup 13 years ago
Morris Jobke c6fd3f9820 Merge pull request #3586 from owncloud/contributing 13 years ago
Morris Jobke 5a214817f2 Fix typo 13 years ago
Björn Schießle 7889f2ef5c Merge pull request #3687 from owncloud/template_updates 13 years ago
Björn Schießle 15eda53215 improved footer 13 years ago
Björn Schießle 4bafa4e81a Merge pull request #3558 from owncloud/files_encryption_check_private_key 13 years ago
Björn Schießle 7cfb0dc406 Merge branch 'master' into files_encryption_check_private_key 13 years ago
Jörn Friedrich Dreyer 31f7afe56a PDOException has no previous(), oh the consistency ... 13 years ago
Björn Schießle dd8011925a Merge pull request #3552 from owncloud/files_encryption_upgrade_fix 13 years ago
Björn Schießle bc2862fcb9 Merge branch 'master' into files_encryption_upgrade_fix 13 years ago
Thomas Müller 54f3174665 Merge pull request #3640 from infoneo/master 13 years ago
Björn Schießle 2b179ccff0 Merge pull request #3668 from owncloud/encryption_migrate_only_once 13 years ago
Björn Schießle fd5042cc46 Merge branch 'files_encryption_upgrade_fix' of github.com:owncloud/core into files_encryption_upgrade_fix 13 years ago
Jan-Christoph Borchardt a178de8501 Merge pull request #3677 from owncloud/apps-buttons 13 years ago
Björn Schießle 2f1005f05f LegacyKeyRecryptKeyfileEncrypt() no longer exists, so test can be removed 13 years ago
Björn Schießle 6394fedb33 add comment to explain the helper function 13 years ago
Björn Schießle 77944cf7b8 fix typo in var name 13 years ago
Jenkins for ownCloud c989e32adc [tx-robot] updated from transifex 13 years ago
Florin Peter 2daec351d4 update submodule 13 years ago
Jörn Friedrich Dreyer 54f9477f34 fix another double wrapped array 13 years ago
Morris Jobke 86fe30bd4c TL;DR and remove link from "Report issue here" 13 years ago
Jörn Friedrich Dreyer 6d55a062be remove additional array wrapping 13 years ago
Björn Schießle 27fcdb3af5 Merge branch 'master' into files_encryption_upgrade_fix 13 years ago
Jörn Friedrich Dreyer d3eadcde56 use executeAudited in files cache 13 years ago
Thomas Tanghus 3584d48d65 Merge pull request #3679 from owncloud/multiselect-fixes 13 years ago
Roland Hager 2df8468b2f Revert "FIX: Download of files named "true" or "false" impossible" 13 years ago
Frank Karlitschek 06808eddf3 Merge pull request #3676 from owncloud/move-storage-bar 13 years ago
Björn Schießle 63472aed3f Merge branch 'template_updates' of github.com:owncloud/core into template_updates 13 years ago
Roland Hager d2d71c8797 FIX: Download of files named "true" or "false" impossible 13 years ago
Björn Schießle 2141c41d0d add logo-claim 13 years ago
Björn Schießle 2e1836c1da don't show translation hints in enterprise edition 13 years ago
Jan-Christoph Borchardt f565e4c25b move common settings footer fieldset out of conditional 13 years ago
Björn Schießle 7a575cc2d7 short explanation about OC_Defaults 13 years ago
Björn Schießle 7273f38af6 make pub link share footer aware of different owncloud editions 13 years ago
Björn Schießle 839bce80c6 make main menu aware of the different owncloud editions 13 years ago
Björn Schießle 5c6a854489 add default doc url 13 years ago
Jörn Friedrich Dreyer f7dc07602b minor cleanup for exception handling 13 years ago
Björn Schießle e1e798c623 make footer and urls aware of ownCloud editions 13 years ago
Björn Schießle b29e01d5cf keep all strings in one place to make it easier to change them 13 years ago
Björn Schießle 918906f042 make footer aware of ownCloud editions 13 years ago
Jan-Christoph Borchardt 4cafe21aa4 apps management: change misleading + to ... 13 years ago
Björn Schießle 7c108edc36 mage page title aware of ownCloud edition 13 years ago
Björn Schießle df78085171 adapt test to the code changes 13 years ago
Jan-Christoph Borchardt c0568e0443 remove App management top bar and move buttons more contextually in the interface 13 years ago
Morris Jobke a39ecd5ea9 Merge pull request #3681 from owncloud/fix_ajax_removeuser.php 13 years ago
Thomas Müller 1abce78cb8 Merge pull request #3654 from owncloud/clean_up_exceptions 13 years ago
Jörn Friedrich Dreyer a2d3c030fb every test now has 15min to execute 13 years ago