summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* refactor delete handling and apply it to users and groupsArthur Schiwon2014-06-021-0/+1
* add Last Login columnArthur Schiwon2014-06-021-0/+1
* Splits Controls overlap in files and users.raghunayyar2014-06-021-1/+4
* resolve conflicts while picking c0fb623raghunayyar2014-06-021-4/+1
* Merge pull request #8718 from owncloud/share_icons_for_shared_byVincent Petry2014-06-021-13/+31
|\
| * add share icons for folders shared by the current userBjoern Schiessle2014-05-301-13/+31
* | Merge pull request #8443 from owncloud/csrf-on-login-and-logoutVincent Petry2014-06-021-0/+3
|\ \
| * \ Merge branch 'master' into csrf-on-login-and-logoutThomas Müller2014-05-19104-280/+1271
| |\ \
| * | | Add CSRF check on login and logoutLukas Reschke2014-05-041-0/+3
* | | | Merge pull request #8187 from owncloud/escape-more-characterMorris Jobke2014-06-022-1/+12
|\ \ \ \
| * | | | 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 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
* | | | Sharing overview fixes and unit testsVincent Petry2014-05-301-21/+24
* | | | Fix IE8 issue when icon is not definedVincent Petry2014-05-301-1/+1
* | | | Fixed file actions for sharing viewsVincent Petry2014-05-301-6/+18
* | | | Added sharing overview page (WIP)Vincent Petry2014-05-301-1/+10
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-05-3059-137/+56
* | | | Merge pull request #8700 from owncloud/design-smallfixesLukas Reschke2014-05-292-7/+24
|\ \ \ \
| * | | | 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
|\ \ \ \ \
| * | | | | Fixed DOM elements, styling and code style issuesVincent Petry2014-05-283-27/+24
| * | | | | 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 update overview pageVincent Petry2014-05-273-30/+118
* | | | | | Remove deprecated functionsLukas Reschke2014-05-291-33/+0
* | | | | | Merge pull request #8554 from owncloud/add_resetadminpass_commandAndreas Fischer2014-05-292-0/+80
|\ \ \ \ \ \
| * \ \ \ \ \ Merge remote-tracking branch 'owncloud/master' into add_resetadminpass_commandAndreas Fischer2014-05-28105-279/+1279
| |\ \ \ \ \ \
| * | | | | | | 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
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | 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
|\ \ \ \ \ \ \