summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Collapse)AuthorAgeFilesLines
* Add some security utilitiesLukas Reschke2014-08-272-8/+0
| | | | | | | | | | | | | | | | | | | | | | | This adds some security utilities to core including: - A library for basic crypto operations (e.g. to encrypt passwords) - A better library for cryptographic actions which allows you to specify the charset - A library for secure string comparisions Remove .htaccess Remove .htaccess Fix typo Add public API Use timing constant comparision Remove CBC constant Adjust code Remove confusing $this
* Merge pull request #10604 from owncloud/fixing-faviconThomas Müller2014-08-263-3/+3
|\ | | | | Adding type to favicon
| * Adding type to faviconClark Tomlinson2014-08-223-3/+3
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2014-08-265-14/+31
| |
* | Merge pull request #10598 from owncloud/warn_on_encryption_occ_pwresetLukas Reschke2014-08-251-0/+10
|\ \ | | | | | | Warn user on resetting passwords via occ when encryption is enabled
| * | Warn user on resetting passwords via occ when encryption is enabledkondou2014-08-221-0/+10
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-08-252-1/+6
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-08-2430-2/+90
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-08-232-14/+17
| |/ |/|
* | Merge pull request #10584 from owncloud/simple-wizard-trusted-domainsThomas Müller2014-08-222-0/+23
|\ \ | | | | | | Add a trusted domain wizard
| * | Add a trusted domain wizardLukas Reschke2014-08-212-0/+23
| | | | | | | | | | | | | | | | | | Adds a little button to the trusted domain warning, if an admin clicks on the warning he will be redirected to ownCloud and asked whether he want to trust this domain. By far not the cleanest code, or clean at all, but does the job and I don't see a reason to make a lot of changes for this little improvement.
* | | Add require_once to update.php due to routingLukas Reschke2014-08-221-0/+1
| | | | | | | | | | | | Fixes https://github.com/owncloud/core/issues/10585 Partially reverts 52d5429768acdb87b2dc2efedc89eb4ad0d29139
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-08-222-1/+7
|/ /
* | Merge pull request #10522 from owncloud/removeLoadAppScriptblizzz2014-08-212-12/+2
|\ \ | | | | | | Remove loadAppScriptFile
| * | Add update route to coreLukas Reschke2014-08-192-2/+2
| | |
| * | Remove loadAppScriptFile from the default routesLukas Reschke2014-08-191-10/+0
| | |
* | | Merge pull request #10573 from owncloud/share-dropdownfixwhenlinkdisallowedVincent Petry2014-08-212-11/+17
|\ \ \ | | | | | | | | Fix share dropdown when links are not allowed
| * | | Fix share dropdown when links are not allowedVincent Petry2014-08-212-11/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When links are not allowed, the email field does not exist and autocomplete returns null. This causes Javascript errors. The fix prevents entering the bogus block when links aren't allowed, as it doesn't make sense to enter it in such cases anyway.
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-08-2112-8/+34
| | | |
* | | | Removing `x-webkit-speech` attribute #10561Volker E.2014-08-201-1/+1
| | | | | | | | | | | | Remove obsolete (from Google Chrome 36 on) attribute due to security vulnerability
* | | | Merge pull request #10557 from owncloud/better-hover-appsMorris Jobke2014-08-201-7/+2
|\ \ \ \ | |/ / / |/| | | full opacity for the hovered/focused app as well for better contrast
| * | | full opacity for the hovered/focused app as well for better contrastJan-Christoph Borchardt2014-08-201-7/+2
| | | |
* | | | Add note about the term "Cheers" at end of mailMorris Jobke2014-08-202-0/+2
|/ / / | | | | | | | | | | | | * for translators * fixes #8689
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-08-2016-5/+22
| | |
* | | Merge pull request #9866 from owncloud/app-upgradeRobin Appelman2014-08-191-0/+6
|\ \ \ | | | | | | | | Don't do app upgrades in the background
| * | | Send feedback from upgrading apps to the upgrade uiRobin Appelman2014-08-041-0/+6
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-08-192-1/+11
| | | |
* | | | Merge pull request #10339 from owncloud/users-defaultquotafixVincent Petry2014-08-182-65/+84
|\ \ \ \ | | | | | | | | | | Fixed default quota field on user management page
| * | | | Do not close container/slider when clicking on single select fieldVincent Petry2014-08-151-0/+4
| | | | |
| * | | | it does not affect gravity on planet earth, but only for tipsyArthur Schiwon2014-08-131-1/+1
| | | | |
| * | | | make singleselect check for gravity wish, and make it south for default quotaArthur Schiwon2014-08-121-1/+5
| | | | |
| * | | | Replaced spaces with tabs in apps.jsVincent Petry2014-08-121-54/+54
| | | | |
| * | | | Trigger events when app-settings visibility changesVincent Petry2014-08-121-4/+15
| | | | |
* | | | | fix color of links in warnings, fix #10480Jan-Christoph Borchardt2014-08-181-0/+1
| | | | |
* | | | | Added upgrade notice to avoid timeoutsVincent Petry2014-08-181-0/+4
| |_|/ / |/| | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-08-184-4/+19
| | | |
* | | | Merge pull request #10407 from owncloud/rm-obsolete-japaneseLukas Reschke2014-08-171-184/+0
|\ \ \ \ | | | | | | | | | | remove obsolete japanese lang code
| * | | | remove obsolete japanese lang codeVolkan Gezer2014-08-131-184/+0
| |/ / /
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-08-173-1/+27
| | | |
* | | | Merge pull request #10447 from owncloud/share-foldericonfixMorris Jobke2014-08-163-2/+71
|\ \ \ \ | | | | | | | | | | Fixed folder icon update routine when share owner exists
| * | | | Fixed folder icon update routine when share owner existsVincent Petry2014-08-153-2/+71
| | | | | | | | | | | | | | | | | | | | | | | | | Whenever a folder has a "data-share-owner" attribute, the icon is now properly updated to a shared folder icon.
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-08-161-0/+3
| | | | |
* | | | | Merge pull request #10413 from owncloud/adding-handlebarsLukas Reschke2014-08-151-0/+2746
|\ \ \ \ \ | |/ / / / |/| | | | Adding handlebars.js
| * | | | Adding handlebars.jsThomas Müller2014-08-141-0/+2746
| | | | |
* | | | | change error text color to white for better contrast, fix #10424Jan-Christoph Borchardt2014-08-151-3/+2
| | | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-08-151-4/+4
| | | | |
* | | | | Merge pull request #10399 from owncloud/fix_setSendMailStatusBjörn Schießle2014-08-141-2/+2
|\ \ \ \ \ | |/ / / / |/| | | | [sharing] fix mail notification
| * | | | we need the recipient as a additional parameter to know for which share the ↵Bjoern Schiessle2014-08-131-2/+2
| |/ / / | | | | | | | | | | | | notification was send
* / / / [tx-robot] updated from transifexJenkins for ownCloud2014-08-141-0/+2
|/ / /
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-08-1266-129/+0
| | |