Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #3244 from nextcloud/settings-icon | Morris Jobke | 2017-01-25 | 4 | -2/+11 |
|\ | |||||
| * | Fix tests | Joas Schilling | 2017-01-25 | 1 | -1/+1 |
| * | add icon for encryption settings on personal page | Morris Jobke | 2017-01-24 | 1 | -0/+5 |
| * | Add icon to admin page sidebar for LDAP | Morris Jobke | 2017-01-24 | 2 | -1/+5 |
* | | Merge pull request #3232 from nextcloud/add-profile-data-to-provisioning-api | Björn Schießle | 2017-01-25 | 3 | -6/+177 |
|\ \ | |||||
| * | | unify endpoints form core and the the provisioning api | Bjoern Schiessle | 2017-01-25 | 3 | -2/+112 |
| * | | add data from the users profile to the provisioning api | Bjoern Schiessle | 2017-01-24 | 2 | -4/+65 |
* | | | Merge pull request #3231 from nextcloud/allow-editing-public-links | Björn Schießle | 2017-01-25 | 1 | -0/+1 |
|\ \ \ | |||||
| * | | | allow editing single files shared as public link | Bjoern Schiessle | 2017-01-24 | 1 | -0/+1 |
| |/ / | |||||
* | / | [tx-robot] updated from transifex | Nextcloud bot | 2017-01-25 | 20 | -40/+100 |
| |/ |/| | |||||
* | | Merge pull request #3151 from nextcloud/navigation-icons | Morris Jobke | 2017-01-24 | 9 | -16/+111 |
|\ \ | |||||
| * | | fix test mocks | Morris Jobke | 2017-01-20 | 1 | -0/+5 |
| * | | Fix app section tests | Joas Schilling | 2017-01-19 | 2 | -4/+32 |
| * | | Add the icons for shipped apps | Joas Schilling | 2017-01-19 | 6 | -12/+74 |
* | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-01-24 | 4 | -34/+34 |
* | | | Merge pull request #3209 from nextcloud/fix-theming-typo | Morris Jobke | 2017-01-23 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | Fix typo in theming description | Joas Schilling | 2017-01-23 | 1 | -1/+1 |
| | |/ | |/| | |||||
* | | | Merge pull request #3157 from nextcloud/fcloseafterkill | Morris Jobke | 2017-01-23 | 2 | -0/+2 |
|\ \ \ | |||||
| * | | | Prevent PHP request to get killed when using fclose callback (#26775) | Vincent Petry | 2017-01-23 | 2 | -0/+2 |
* | | | | Merge pull request #3220 from nextcloud/direct-link-open-sidebar | Morris Jobke | 2017-01-23 | 1 | -0/+5 |
|\ \ \ \ | |||||
| * | | | | open the sidebar when opening a permalink | Robin Appelman | 2017-01-23 | 1 | -0/+5 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #2924 from nextcloud/flexbox-header | Morris Jobke | 2017-01-23 | 2 | -32/+30 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | fix public sharing buttons | Christoph Wurst | 2017-01-23 | 1 | -2/+5 |
| * | | | fix log and app name | Christoph Wurst | 2017-01-23 | 1 | -5/+4 |
| * | | | more cleanup | Christoph Wurst | 2017-01-23 | 1 | -30/+26 |
* | | | | Merge pull request #3141 from nextcloud/subadmin-check-on-removing-user-from-... | Joas Schilling | 2017-01-23 | 2 | -26/+236 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Allow subadmins to add people to groups via provisioning api | Joas Schilling | 2017-01-18 | 2 | -7/+151 |
| * | | | Make sure subadmins can not delete users from their last subadmin group | Joas Schilling | 2017-01-18 | 2 | -0/+76 |
| * | | | No need to check the subadmin again | Joas Schilling | 2017-01-18 | 2 | -21/+11 |
* | | | | Merge pull request #3118 from nextcloud/newFileMenu-css-guidelines | Morris Jobke | 2017-01-22 | 3 | -41/+12 |
|\ \ \ \ | |||||
| * | | | | Popover newFolder input fix | John Molakvoæ (skjnldsv) | 2017-01-22 | 1 | -4/+2 |
| * | | | | Popover positionning fix | John Molakvoæ (skjnldsv) | 2017-01-22 | 1 | -1/+0 |
| * | | | | Popover positionning and classes | John Molakvoæ (skjnldsv) | 2017-01-22 | 3 | -2/+6 |
| * | | | | fit newFileMenu to css guidelines | John Molakvoæ (skjnldsv) | 2017-01-22 | 3 | -39/+9 |
* | | | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-01-23 | 4 | -4/+4 |
* | | | | | Merge pull request #3190 from nextcloud/fix-sharing-popover | John Molakvoæ | 2017-01-22 | 1 | -9/+7 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Fix #3174 | John Molakvoæ (skjnldsv) | 2017-01-21 | 1 | -9/+7 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #3187 from nextcloud/inputs-scss-optimisation | Morris Jobke | 2017-01-22 | 4 | -53/+28 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | Fixed public share download button | John Molakvoæ (skjnldsv) | 2017-01-22 | 1 | -2/+2 |
| * | | | Fixed sharing js | John Molakvoæ (skjnldsv) | 2017-01-22 | 1 | -1/+1 |
| * | | | Fixed public share header buttons | John Molakvoæ (skjnldsv) | 2017-01-22 | 2 | -44/+23 |
| * | | | Login and authenticate inputs fixes | John Molakvoæ (skjnldsv) | 2017-01-22 | 1 | -6/+2 |
| |/ / | |||||
* | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-01-22 | 8 | -10/+10 |
* | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-01-21 | 8 | -28/+28 |
* | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-01-20 | 6 | -10/+122 |
* | | | Merge pull request #3144 from nextcloud/use-data-download-response | Morris Jobke | 2017-01-19 | 2 | -7/+3 |
|\ \ \ | |||||
| * | | | Use DataDownloadResponse | Lukas Reschke | 2017-01-18 | 2 | -7/+3 |
* | | | | some code cleanup while working on the file | Bjoern Schiessle | 2017-01-19 | 1 | -19/+26 |
* | | | | add brute force protection to 'mount public link' operation | Bjoern Schiessle | 2017-01-19 | 1 | -0/+1 |
| |/ / |/| | | |||||
* | | | Merge pull request #3150 from nextcloud/highlight-active-navigation | John Molakvoæ | 2017-01-19 | 2 | -0/+5 |
|\ \ \ |