| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | [tx-robot] updated from transifex | Nextcloud bot | 2017-05-17 | 82 | -174/+188 |
| | | |||||
| * | Merge pull request #4922 from nextcloud/verbose-uploadmenu-text | Morris Jobke | 2017-05-17 | 1 | -2/+2 |
| |\ | | | | | Use more verbose text for upload menu | ||||
| | * | Use more verbose text for upload menu | Jan-Christoph Borchardt | 2017-05-16 | 1 | -2/+2 |
| | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net> | ||||
| * | | Merge pull request #4918 from nextcloud/theming-capabilities-plain-background | Morris Jobke | 2017-05-17 | 2 | -28/+48 |
| |\ \ | | | | | | | OCS Return color when theming uses no background image | ||||
| | * | | Return color when theming uses no background image | Julius Härtl | 2017-05-17 | 2 | -28/+48 |
| | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net> | ||||
| * | | | Fix tests | Julius Härtl | 2017-05-17 | 1 | -5/+2 |
| | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net> | ||||
| * | | | Use appdata logo when generating icons | Julius Härtl | 2017-05-17 | 4 | -33/+65 |
| |/ / | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net> | ||||
| * | | [tx-robot] updated from transifex | Nextcloud bot | 2017-05-17 | 6 | -0/+6 |
| | | | |||||
| * | | Remove primary class from public link download button | Jan-Christoph Borchardt | 2017-05-16 | 1 | -1/+1 |
| | | | |||||
| * | | Merge pull request #4900 from nextcloud/fix-search-mime-icons | Christoph Wurst | 2017-05-16 | 1 | -26/+4 |
| |\ \ | | | | | | | Use proper mime icons for search results | ||||
| | * | | Use proper mime icons for search results | Julius Härtl | 2017-05-16 | 1 | -26/+4 |
| | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net> | ||||
| * | | | Merge pull request #4554 from nextcloud/pointer-cursor-on-clickable-user | Lukas Reschke | 2017-05-16 | 1 | -0/+1 |
| |\ \ \ | | | | | | | | | Make it clear that you can now click on usernames | ||||
| | * | | | Make it clear that you can now click on usernames | Joas Schilling | 2017-04-27 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| * | | | | Merge pull request #4865 from nextcloud/improve-two-factor-buttons | Roeland Jago Douma | 2017-05-16 | 1 | -1/+3 |
| |\ \ \ \ | | | | | | | | | | | Improve layout of buttons for two factor auth | ||||
| | * | | | | Improve layout of buttons for two factor auth | Morris Jobke | 2017-05-15 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
| * | | | | | Merge pull request #4425 from nextcloud/oci | Morris Jobke | 2017-05-15 | 4 | -6/+121 |
| |\ \ \ \ \ | | | | | | | | | | | | | Primary key is too long for oracle | ||||
| | * | | | | | Rename the index so the name is unique until the old table is deleted | Joas Schilling | 2017-05-15 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| | * | | | | | Add a update step that copies all the backup codes | Joas Schilling | 2017-05-15 | 2 | -1/+115 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| | * | | | | | Rename the table to a valid name | Joas Schilling | 2017-05-15 | 2 | -4/+5 |
| | | |_|_|/ | |/| | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| * / | | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-05-16 | 10 | -0/+30 |
| |/ / / / | |||||
| * | | | | Revert "fix permissions of mountpoints - take 2" | Morris Jobke | 2017-05-15 | 1 | -4/+3 |
| | | | | | |||||
| * | | | | Merge pull request #4685 from nextcloud/fix_4683 | Morris Jobke | 2017-05-15 | 1 | -3/+4 |
| |\ \ \ \ | |/ / / |/| | | | fix permissions of mountpoints - take 2 | ||||
| | * | | | update comment to code | Robin Appelman | 2017-05-15 | 1 | -2/+3 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl> | ||||
| | * | | | Fix SharedStorage Test | Roeland Jago Douma | 2017-05-04 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A moveable mount point (What a SharedStorage is) always has DELETE + UPDATE permissions. Since you can either delete (unshare) or update (rename) it. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| * | | | | Merge pull request #4871 from ↵ | Morris Jobke | 2017-05-15 | 3 | -6/+78 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | nextcloud/remove-more-personal-info-on-user-deletion Remove more personal info on user deletion | ||||
| | * | | | | Remove 2FA backup codes on user deletion | Joas Schilling | 2017-05-15 | 3 | -6/+78 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| * | | | | | Revert "fix objectstore rename" | Roeland Jago Douma | 2017-05-15 | 1 | -1/+0 |
| |/ / / / | | | | | | | | | | | | | | | | | | | | | This reverts commit 5334a3dc337b5883763ac8e1eaef58c1a435144b. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| * | | / | [tx-robot] updated from transifex | Nextcloud bot | 2017-05-15 | 10 | -86/+94 |
| | |_|/ |/| | | |||||
| * | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-05-14 | 24 | -90/+180 |
| | | | | |||||
| * | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-05-13 | 10 | -0/+24 |
| | | | | |||||
| * | | | Merge pull request #4829 from nextcloud/theming-preview-click | Morris Jobke | 2017-05-12 | 2 | -0/+13 |
| |\ \ \ | | | | | | | | | Clicking on theming preview triggers fileupload dialog | ||||
| | * | | | Don't open the dialog for logo and background | Joas Schilling | 2017-05-12 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| | * | | | Clicking on theming preview triggers fileupload dialog | Morris Jobke | 2017-05-11 | 2 | -0/+12 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
| * | | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-05-12 | 8 | -2/+136 |
| |/ / / | |||||
| * | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-05-11 | 46 | -8/+88 |
| | | | | |||||
| * | | | Merge pull request #4783 from nextcloud/lite-application-classes | Morris Jobke | 2017-05-10 | 2 | -29/+9 |
| |\ \ \ | | | | | | | | | Use automatic injection for appdata folders | ||||
| | * | | | Use automatic DI injection for UpdateLookupServer | Joas Schilling | 2017-05-10 | 2 | -29/+9 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| * | | | | Merge pull request #4762 from nextcloud/add-unsafe-global-eval-fn | Morris Jobke | 2017-05-10 | 1 | -0/+7 |
| |\ \ \ \ | | | | | | | | | | | Add fallback to jQuery.fn.globalEval | ||||
| | * | | | | Eval script elemtents in HTML body response | Lukas Reschke | 2017-05-10 | 1 | -0/+7 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch> | ||||
| * | | | | | Use the configured lookup server | Joas Schilling | 2017-05-10 | 1 | -2/+9 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| * | | | | | Define method shouldRun | Joas Schilling | 2017-05-10 | 1 | -3/+14 |
| | |/ / / |/| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| * | | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-05-10 | 108 | -38/+262 |
| | | | | | |||||
| * | | | | Merge pull request #4772 from nextcloud/fix-theming-background-preview | Lukas Reschke | 2017-05-10 | 1 | -1/+2 |
| |\ \ \ \ | | | | | | | | | | | Fix theming preview for background image | ||||
| | * | | | | Fix theming preview for background image | Julius Härtl | 2017-05-09 | 1 | -1/+2 |
| | |/ / / | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net> | ||||
| * / / / | Stop if user folder is not available | Morris Jobke | 2017-05-09 | 1 | -0/+4 |
| |/ / / | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
| * | | | Merge pull request #4746 from ↵ | Roeland Jago Douma | 2017-05-09 | 2 | -6/+131 |
| |\ \ \ | | | | | | | | | | | | | | | | | nextcloud/fix-mentioned-user-not-clickable-after-posting-or-editing-a-comment Fix mentioned user not clickable after posting or editing a comment | ||||
| | * | | | Fix mentioned user not clickable after posting or editing a comment | Daniel Calviño Sánchez | 2017-05-08 | 2 | -3/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The contactsMenu plugin was called on avatar elements from _postRenderItem, which is called when a new comment is added to the collection. Due to this contactsMenu was not called when messages were edited; when a new comment is posted _postRenderItem is called, but at that time the "mentions" attribute is not filled yet, so "@username" is not replaced by avatars in the message and thus contactsMenu has no avatars to be called on. Calling contactsMenu was moved to a new method, _postRenderMessage, which is called from _postRenderItem and from the success callback when fetching the model in _onSubmitSuccess (which replaces "@username" by avatars in the message after posting or editing a comment). Fixes #4555 Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com> | ||||
| | * | | | Add missing unit tests for comments with mentions | Daniel Calviño Sánchez | 2017-05-08 | 1 | -3/+117 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com> | ||||
| * | | | | Merge pull request #4705 from nextcloud/htaccess-upload | Roeland Jago Douma | 2017-05-09 | 1 | -12/+12 |
| |\ \ \ \ | | | | | | | | | | | Proper exception for upload of .htaccess file via WebDAV | ||||
| | * | | | | Proper exception for upload of .htaccess file via WebDAV | Morris Jobke | 2017-05-08 | 1 | -12/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * fixes #2860 Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
 |
index : nextcloud-server.git | |
| Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server | www-data |
| summaryrefslogtreecommitdiffstats |