summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | Merge pull request #8443 from owncloud/csrf-on-login-and-logoutVincent Petry2014-06-021-0/+3
|\ \ \ \ | | | | | | | | | | Add CSRF check on login and logout
| * \ \ \ Merge branch 'master' into csrf-on-login-and-logoutThomas Müller2014-05-19104-280/+1271
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: core/templates/login.php
| * | | | | Add CSRF check on login and logoutLukas Reschke2014-05-041-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | This is a minor issue and not worth a backport in my opinion as it could break more things than it's worth having it.
* | | | | | Merge pull request #8187 from owncloud/escape-more-characterMorris Jobke2014-06-022-1/+12
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | Also encode > and '
| * | | | | Fix typoLukas Reschke2014-05-311-1/+1
| | | | | |
| * | | | | Add unit tests for escapeHTMLLukas Reschke2014-05-281-0/+11
| | | | | |
| * | | | | Also encode > and 'Lukas Reschke2014-04-131-1/+1
| | | | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-06-021-0/+1
| | | | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-06-011-0/+8
| | | | | |
* | | | | | Merge pull request #8798 from owncloud/fix-corejsVincent Petry2014-05-311-3/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix undefined JS on login/setup page
| * | | | | | Fix undefined JS on login/setup pageVincent Petry2014-05-301-3/+3
| | |_|_|/ / | |/| | | |
* / | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-05-3114-4/+120
|/ / / / /
* | | | | Fix fileList fallback in OC.Share for outside files appVincent Petry2014-05-301-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | OC.Share can be used in non-files apps, so the fileList callback needs to support that as well.
* | | | | Sharing overview fixes and unit testsVincent Petry2014-05-301-21/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fixed renaming and fileActionsReady event - Added unit tests for shares list - Fixed public page with defer - Fixed file actions in sharing overview - Fixed sharing counterpart list (10 entries max) - Fixed file path attribute to be used in download action - Fix sharing list headers - OC.Share icons now operate on fileList instance - Fix OC.Share.updateIcon when more than one list in DOM
* | | | | Fix IE8 issue when icon is not definedVincent Petry2014-05-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sometimes no icon file is passed to replaceSVGIcon(), it showed an error in IE8 and broke the code flow. This fix adds a check whether the file name is set.
* | | | | Fixed file actions for sharing viewsVincent Petry2014-05-301-6/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FileActions can now be clone to be use for separate file list views without having the side-effect of affecting the main file list view. Added "Open" action in sharing overview file lists to redirect to the regular file list when clicking on a folder.
* | | | | Added sharing overview page (WIP)Vincent Petry2014-05-301-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | - added sharing overview entries in the sidebar - use OCS Share API to get the list of files
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-05-3059-137/+56
| | | | |
* | | | | Merge pull request #8700 from owncloud/design-smallfixesLukas Reschke2014-05-292-7/+24
|\ \ \ \ \ | | | | | | | | | | | | Design detail fixes
| * | | | | fix height of select boxes for OS XJan-Christoph Borchardt2014-05-231-0/+5
| | | | | |
| * | | | | use user-select: none; on header, navigation and user menuJan-Christoph Borchardt2014-05-231-4/+10
| | | | | |
| * | | | | darken scrollbar to distinguish from selected sidebar itemsJan-Christoph Borchardt2014-05-231-3/+9
| | |_|_|/ | |/| | |
* | | | | Merge pull request #8727 from owncloud/upgrade-overviewLukas Reschke2014-05-296-30/+136
|\ \ \ \ \ | | | | | | | | | | | | Added update overview page
| * | | | | Fixed DOM elements, styling and code style issuesVincent Petry2014-05-283-27/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Reduced number of DOM elements - Also added mention of "config" backup.
| * | | | | Fixed styles in update overview pageVincent Petry2014-05-272-9/+19
| | | | | |
| * | | | | Now showing disabled apps as upgrade status lineVincent Petry2014-05-273-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Added app id in update overview. - Added status message for disabled app for CLI upgrade and web upgrade
| * | | | | Added update overview pageVincent Petry2014-05-273-30/+118
| | | | | |
* | | | | | Remove deprecated functionsLukas Reschke2014-05-291-33/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This functions have been deprecated since Oct 2012 (ownCloud 5), let's finally remove them for ownCloud 7. Ref https://github.com/owncloud/core/commit/c4b8bb10411a4d601b7f4c8758980005f14850ab
* | | | | | Merge pull request #8554 from owncloud/add_resetadminpass_commandAndreas Fischer2014-05-292-0/+80
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a resetadminpass command to console * owncloud/add_resetadminpass_command: Move resetpassword into user: command space. Document type of user project. Receive \OC\User\Manager as a constructor dependency. Use userManager, color output, return 1 on error Add doc, check return-value, fix spacing, require interactive Back to the future Make ResetAdminPass to ResetPassword Add a resetadminpass command to console - fix #8248
| * \ \ \ \ \ Merge remote-tracking branch 'owncloud/master' into add_resetadminpass_commandAndreas Fischer2014-05-28105-279/+1279
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * owncloud/master: (238 commits) Change visibility of scanner internals [tx-robot] updated from transifex remove legacy OC_Filesystem being used in a hook callback add title property to share dialog forgotten infobox messages translations reverts 188c543 and translates only mail fix warning text and margin Adjust core apps to use "requiremin" instead of "require" Added requiremin/requiremax fields for apps [tx-robot] updated from transifex unwrapped strings fix allow resharing of files with only share permissions don't lose file size during rename drop superflous statement in phpdoc add preRememberedLogin hook and document this and postRememberedLogin in class descripttion. Also fixes documentation of postLogin hook [tx-robot] updated from transifex fix grammar make user_ldap fully translatable [tx-robot] updated from transifex fix typo ... Conflicts: core/register_command.php
| * | | | | | | Move resetpassword into user: command space.Andreas Fischer2014-05-282-3/+3
| | | | | | | |
| * | | | | | | Document type of user project.Andreas Fischer2014-05-281-0/+1
| | | | | | | |
| * | | | | | | Receive \OC\User\Manager as a constructor dependency.Andreas Fischer2014-05-282-3/+11
| | | | | | | |
| * | | | | | | Use userManager, color output, return 1 on errorkondou2014-05-241-8/+17
| | | | | | | |
| * | | | | | | Add doc, check return-value, fix spacing, require interactivekondou2014-05-131-6/+15
| | | | | | | |
| * | | | | | | Back to the futureLukas Reschke2014-05-121-1/+1
| | | | | | | |
| * | | | | | | Make ResetAdminPass to ResetPasswordkondou2014-05-123-37/+53
| | | | | | | |
| * | | | | | | Add a resetadminpass command to console - fix #8248kondou2014-05-122-0/+37
| | | | | | | |
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-05-291-16/+20
| | | | | | | |
* | | | | | | | Merge pull request #8748 from owncloud/cli_maintenance_modeAndreas Fischer2014-05-292-0/+62
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add ability to enable/disable maintenance mode from cli. * owncloud/cli_maintenance_mode: Use OC\Config instead of OC_Config Changed class name to mode Add ability to enable/disable maintenance mode from cli.
| * | | | | | | Use OC\Config instead of OC_Configscolebrook2014-05-282-6/+15
| | | | | | | |
| * | | | | | | Changed class name to modescolebrook2014-05-282-3/+3
| | | | | | | |
| * | | | | | | Add ability to enable/disable maintenance mode from cli.scolebrook2014-05-272-0/+53
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #8681 from owncloud/logintimestampLukas Reschke2014-05-282-0/+48
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Record login timestamp per user. Required for new user managament.
| * | | | | | | print time in 24h formatArthur Schiwon2014-05-231-1/+1
| | | | | | | |
| * | | | | | | save a whitespaceArthur Schiwon2014-05-231-2/+2
| | | | | | | |
| * | | | | | | add cli command to check a users last loginArthur Schiwon2014-05-232-0/+48
| | | | | | | |
* | | | | | | | Merge pull request #8750 from owncloud/l10n-add-title-propertyVolkan Gezer2014-05-281-2/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | add title property to share dialog will close #8638
| * | | | | | | | add title property to share dialogVolkan Gezer2014-05-271-2/+2
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge pull request #8732 from owncloud/fix-warning-textJan-Christoph Borchardt2014-05-282-9/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | fix warning text and margin. fixes #8715
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-24 09:08:27 +0000