summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #7485 from owncloud/scrutinizer_fix_1_kondouMorris Jobke2014-06-0316-79/+166
|\
| * Fix a typokondou2014-06-021-1/+1
| * Add some more spaces for operatorskondou2014-06-021-4/+4
| * Some readability improvementskondou2014-06-022-3/+3
| * Scrutinizer cleanupkondou2014-06-0216-79/+166
* | move Help section from controls bar to sidebarJan-Christoph Borchardt2014-06-021-9/+0
* | Merge pull request #8820 from owncloud/design-detailsFrank Karlitschek2014-06-025-9/+21
|\ \ | |/ |/|
| * fix unit tests after introduction of animations - adds delays for click triggerMorris Jobke2014-06-021-0/+7
| * move Deleted Files to bottom of sidebarJan-Christoph Borchardt2014-06-021-0/+1
| * add OC.menuSpeed to control the animation speed of menu toggleMorris Jobke2014-06-021-7/+8
| * Adds Animation to Toggling Navigation on < 768px widthsraghunayyar2014-06-021-4/+4
| * shift files app breadcrumbs to account for missing app listJan-Christoph Borchardt2014-06-021-1/+4
| * fix height of select boxes for OS XJan-Christoph Borchardt2014-06-021-1/+1
* | Merge pull request #8812 from josh4trunks/avatar_rotateVincent Petry2014-06-021-7/+12
|\ \
| * | Automatically Rotate Avatar based on exif datajosh4trunks2014-06-011-7/+12
* | | Merge pull request #8613 from owncloud/filesize-alignmentMorris Jobke2014-06-022-1/+22
|\ \ \ | |_|/ |/| |
| * | display "<1 kB" for really small filesMorris Jobke2014-06-022-1/+22
| |/
* | 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