summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #2501 from nextcloud/issue-2472-remove-update-notification...Morris Jobke2016-12-051-23/+30
|\
| * Remove the update warning and the notification after an successful updateJoas Schilling2016-12-051-23/+30
* | Merge pull request #2507 from nextcloud/conflict-dialog-ffMorris Jobke2016-12-051-7/+5
|\ \
| * | fix conflict dialog styling in firefoxRobin Appelman2016-12-051-7/+5
|/ /
* | Merge pull request #2468 from nextcloud/fix-personal-settings-readonlyMorris Jobke2016-12-051-42/+16
|\ \
| * | hide password recovery note if email address can't be setBjoern Schiessle2016-12-051-2/+4
| * | handle read-only parameters correctlyBjoern Schiessle2016-12-021-40/+12
* | | Merge pull request #2502 from nextcloud/personal-settings-dead-codeMorris Jobke2016-12-051-55/+0
|\ \ \
| * | | remove dead js code from personal settingsChristoph Wurst2016-12-051-55/+0
| | |/ | |/|
* | | Merge pull request #2500 from nextcloud/issue-2326-personal-settingsMorris Jobke2016-12-052-1/+4
|\ \ \ | |/ / |/| |
| * | Allow emtpy values on personal page and fix saving checkmark positionChristoph Wurst2016-12-052-1/+4
|/ /
* | Merge pull request #2491 from nextcloud/fix-groups-enable-visualRoeland Jago Douma2016-12-052-3/+6
|\ \
| * | Change groups enable to block elementJohn Molakvoæ (skjnldsv)2016-12-052-3/+6
* | | [tx-robot] updated from transifexNextcloud bot2016-12-0518-16/+142
* | | Merge pull request #2497 from nextcloud/theming-icon-fixesJohn Molakvoæ2016-12-042-7/+9
|\ \ \
| * | | Fix transparency of iconsJulius Haertl2016-12-041-0/+1
| * | | Fix background border radiusJulius Haertl2016-12-041-1/+1
| * | | Move sizing to renderAppIcon methodJulius Haertl2016-12-042-6/+7
* | | | [tx-robot] updated from transifexNextcloud bot2016-12-0438-78/+128
* | | | Merge pull request #2493 from nextcloud/php7.1-finalRoeland Jago Douma2016-12-031-3/+3
|\ \ \ \
| * | | | Bump 7.1 CI to final!Roeland Jago Douma2016-12-031-3/+3
|/ / / /
* | | | Merge pull request #2428 from justin-sleep/upstreamMorris Jobke2016-12-031-1/+1
|\ \ \ \
| * | | | Move integer casting to the top of the chainjustin-sleep2016-12-022-2/+2
| * | | | Explicitly cast $remember to int rather than using identity operatorjustin-sleep2016-12-011-1/+1
| * | | | Fix #2427 by converting $remember to integerjustin-sleep2016-11-301-1/+1
* | | | | Merge pull request #2434 from nextcloud/app-list-growJohn Molakvoæ2016-12-031-4/+41
|\ \ \ \ \
| * | | | | use flex and specify rows to align everythingJohn Molakvoæ (skjnldsv)2016-12-031-4/+41
| * | | | | dont grow items in the app listRobin Appelman2016-12-011-1/+1
* | | | | | [tx-robot] updated from transifexNextcloud bot2016-12-03230-576/+572
* | | | | | Merge pull request #2486 from nextcloud/shared-storage-maskLukas Reschke2016-12-024-8/+18
|\ \ \ \ \ \
| * | | | | | update testRobin Appelman2016-12-021-1/+1
| * | | | | | apply permissions mask for shared storageRobin Appelman2016-12-023-7/+17
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #2482 from nextcloud/fix-loading-icon-sizeLukas Reschke2016-12-021-6/+6
|\ \ \ \ \ \
| * | | | | | Fix loader size to 32px and 16pxJohn Molakvoæ (skjnldsv)2016-12-021-6/+6
* | | | | | | Merge pull request #2437 from nextcloud/update-notification-iconsMorris Jobke2016-12-025-49/+87
|\ \ \ \ \ \ \
| * | | | | | | Fix testsJoas Schilling2016-12-021-4/+11
| * | | | | | | Update versions to 11.0.0Joas Schilling2016-12-011-39/+39
| * | | | | | | Highlight the app name in the notificationJoas Schilling2016-12-012-1/+26
| * | | | | | | Use the settings icon for the update notificationJoas Schilling2016-12-013-5/+11
* | | | | | | | Merge pull request #2490 from nextcloud/updated-gif-loaderMorris Jobke2016-12-024-0/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix gif loader to fit css designJohn Molakvoæ (skjnldsv)2016-12-024-0/+0
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge pull request #2480 from nextcloud/update-cache-successRoeland Jago Douma2016-12-021-3/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | only update the cache if the storage operation succeedsRobin Appelman2016-12-021-3/+3
| |/ / / / / / /
* | | | | | | | Merge pull request #2483 from nextcloud/fix-unshare-icon-cJohn Molakvoæ2016-12-022-6/+12
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix loader position and visibilityJohn Molakvoæ (skjnldsv)2016-12-021-4/+6
| * | | | | | | | Fix popover arrowJohn Molakvoæ (skjnldsv)2016-12-021-0/+4
| * | | | | | | | Fix unshare delete iconJohn Molakvoæ (skjnldsv)2016-12-022-2/+2
| |/ / / / / / /
* | | | | | | | Merge pull request #2475 from nextcloud/fix-filename-local-linkMorris Jobke2016-12-021-6/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | properly calculate the width of the name in the sidebarMorris Jobke2016-12-021-6/+1
| * | | | | | | | fix width of filename in sidebar to accommodate local linkJan-Christoph Borchardt2016-12-021-1/+1