| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge pull request #3679 from nextcloud/socialsharing | Lukas Reschke | 2017-03-16 | 5 | -10/+193 |
| |\ | | | | | Add social sharing | ||||
| | * | Fix layout of sharing buttons | Morris Jobke | 2017-03-14 | 2 | -13/+26 |
| | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
| | * | Fix tests | Roeland Jago Douma | 2017-03-06 | 1 | -0/+1 |
| | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| | * | Make sure copy tooltip remains when we have no social providers | Roeland Jago Douma | 2017-03-03 | 1 | -5/+22 |
| | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| | * | Move social buttons to menu | Roeland Jago Douma | 2017-03-03 | 5 | -150/+107 |
| | | | | | | | | | | | | | | | | | | | * If there are social sharing buttons move them and the copy action to a menu * If there are no social sharing buttons just leave the copy action where it is directly Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| | * | Add social sharing | Roeland Jago Douma | 2017-03-03 | 4 | -1/+196 |
| | | | | | | | | | | | | | | | * Add socialshare manager * Add social share field under link share Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| * | | Merge pull request #3862 from nextcloud/dont-set-the-status-twice | Lukas Reschke | 2017-03-16 | 1 | -1/+0 |
| |\ \ | | | | | | | Don't set the HTTP status twice | ||||
| | * | | Don't set the HTTP status twice | Joas Schilling | 2017-03-16 | 1 | -1/+0 |
| | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| * | | | Merge pull request #3008 from nextcloud/appmenu-experiment | Morris Jobke | 2017-03-16 | 6 | -91/+438 |
| |\ \ \ | | | | | | | | | Show apps in header | ||||
| | * | | | Fix html formating issues | Julius Haertl | 2017-03-16 | 1 | -14/+5 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Julius Haertl <jus@bitgrid.net> | ||||
| | * | | | Rebuild menu to keep order of icons correct | Julius Haertl | 2017-03-16 | 2 | -29/+38 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Julius Haertl <jus@bitgrid.net> | ||||
| | * | | | Reduce device width and hide app name when menu is open | Julius Haertl | 2017-03-16 | 1 | -2/+3 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Julius Haertl <jus@bitgrid.net> | ||||
| | * | | | Make enabling/disabling apps work with the new menu | Julius Haertl | 2017-03-16 | 3 | -30/+67 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Julius Haertl <jus@bitgrid.net> | ||||
| | * | | | Fix positioning of popovermenu | Julius Haertl | 2017-03-16 | 1 | -2/+6 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Julius Haertl <jus@bitgrid.net> | ||||
| | * | | | Fix popover positioning after window resize | Julius Haertl | 2017-03-16 | 1 | -5/+13 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Julius Haertl <jus@bitgrid.net> | ||||
| | * | | | Cleanup SCSS for app menu and fix mobile view | Julius Haertl | 2017-03-16 | 1 | -103/+91 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Julius Haertl <jus@bitgrid.net> | ||||
| | * | | | Make app management icon act like a normal app icon | Julius Haertl | 2017-03-16 | 2 | -2/+9 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Julius Haertl <jus@bitgrid.net> | ||||
| | * | | | Fix menu issues | Julius Haertl | 2017-03-16 | 4 | -61/+101 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Julius Haertl <jus@bitgrid.net> | ||||
| | * | | | Generate seperate menu list for header bar | Julius Haertl | 2017-03-16 | 4 | -22/+73 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Julius Haertl <jus@bitgrid.net> | ||||
| | * | | | Move active app to the first slot | Julius Haertl | 2017-03-16 | 1 | -9/+19 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Julius Haertl <jus@bitgrid.net> | ||||
| | * | | | Show app icons in the header | Julius Haertl | 2017-03-16 | 3 | -5/+206 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Julius Haertl <jus@bitgrid.net> | ||||
| * | | | | Merge pull request #3863 from nextcloud/additional-hardening-of-t | Roeland Jago Douma | 2017-03-16 | 5 | -18/+23 |
| |\ \ \ \ | | | | | | | | | | | Harden t() with DOMPurify | ||||
| | * | | | | Harden t() with DOMPurify | Lukas Reschke | 2017-03-16 | 5 | -18/+23 |
| |/ / / / | | | | | | | | | | | | | | | | | | | | | This mitigates issues where developers pass untrusted user-input through t() which may lead to XSS issues. Signed-off-by: Lukas Reschke <lukas@statuscode.ch> | ||||
| * | | | | Merge pull request #3860 from nextcloud/fix_master_after_3802 | Lukas Reschke | 2017-03-16 | 2 | -0/+39 |
| |\ \ \ \ | |_|/ / |/| | | | Fix unit tests of master | ||||
| | * | | | Fix unit tests of master | Roeland Jago Douma | 2017-03-16 | 2 | -0/+39 |
| |/ / / | | | | | | | | | | | | | | | | Follow up to #3802 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| * | | | Merge pull request #3802 from Ko-/master | Roeland Jago Douma | 2017-03-16 | 10 | -8/+48 |
| |\ \ \ | | | | | | | | | Check that set_time_limit is not disabled before calling it | ||||
| | * | | | Add warning on admin screen when set_time_limit is unavailable | Ko- | 2017-03-16 | 2 | -0/+23 |
| | | | | | |||||
| | * | | | Check that set_time_limit is not disabled before calling it | Ko- | 2017-03-11 | 8 | -8/+25 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Ko- <k.stoffelen@cs.ru.nl> | ||||
| * | | | | Merge pull request #3857 from ↵ | Joas Schilling | 2017-03-16 | 1 | -1/+1 |
| |\ \ \ \ | |_|/ / |/| | | | | | | | | | | | nextcloud/issue-3901-legacy-caldav-endpoint-email-invitations Fix scheduling plugin on legacy caldav endpoint | ||||
| | * | | | Fix scheduling plugin on legacy caldav endpoint | Joas Schilling | 2017-03-16 | 1 | -1/+1 |
| |/ / / | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| * | | | Merge pull request #3624 from marncz/master | Roeland Jago Douma | 2017-03-16 | 1 | -2/+15 |
| |\ \ \ | | | | | | | | | Update.js: countdown feedback before redirect | ||||
| | * | | | Spacing | Marcin Czarnecki | 2017-03-15 | 1 | -1/+1 |
| | | | | | | | | | | | | | Signed-off-by: marncz <M.Czarnecki1@uni.brighton.ac.uk> | ||||
| | * | | | Update: feedback before redirect | Marcin Czarnecki | 2017-03-14 | 1 | -8/+9 |
| | | | | | | | | | | | | | Signed-off-by: marncz <M.Czarnecki1@uni.brighton.ac.uk> | ||||
| | * | | | Update: feedback before redirect | Marcin Czarnecki | 2017-02-25 | 1 | -2/+14 |
| | | | | | | | | | | | | | Signed-off-by: marncz <M.Czarnecki1@uni.brighton.ac.uk> | ||||
| * | | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-03-16 | 96 | -114/+18 |
| | | | | | |||||
| * | | | | Merge pull request #3788 from nextcloud/fed-share-modify | Roeland Jago Douma | 2017-03-15 | 2 | -21/+59 |
| |\ \ \ \ | | | | | | | | | | | Add api to change the remote of an incoming federated share | ||||
| | * | | | | Add api to change the remote of an incoming federated share | Robin Appelman | 2017-03-10 | 2 | -21/+59 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl> | ||||
| * | | | | | Merge pull request #3843 from nextcloud/encryption-fix-mail-share | Joas Schilling | 2017-03-15 | 1 | -3/+3 |
| |\ \ \ \ \ | | | | | | | | | | | | | take share by mail into consideration if we calculate the access list | ||||
| | * | | | | | take share by mail into consideration if we calculate the access list | Bjoern Schiessle | 2017-03-14 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org> | ||||
| * | | | | | | Merge pull request #3848 from nextcloud/remove-single-quotes-around-search-query | Roeland Jago Douma | 2017-03-15 | 2 | -4/+4 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Remove single quotes around search query like in user search | ||||
| | * | | | | | | Remove single quotes around search query like in user search | Joas Schilling | 2017-03-15 | 2 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| * | | | | | | | Merge pull request #3841 from nextcloud/encyryption-trash-bin | Björn Schießle | 2017-03-15 | 4 | -14/+34 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Delete files on encryption error | ||||
| | * | | | | | | | delete files right away in case of a encryption exception | Bjoern Schiessle | 2017-03-14 | 2 | -8/+29 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org> | ||||
| | * | | | | | | | always throw a encryption exception | Bjoern Schiessle | 2017-03-14 | 2 | -6/+5 |
| | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org> | ||||
| * | | | | | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-03-15 | 24 | -98/+220 |
| | | | | | | | | |||||
| * | | | | | | | Merge pull request #3838 from Xuanwo/basename-fix | Roeland Jago Douma | 2017-03-14 | 1 | -1/+2 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | [OC/Files/Cache]: Fix wrong usage of basename | ||||
| | * | | | | | | | [OC/Files/Cache]: Fix wrong usage of basename | Xuanwo | 2017-03-14 | 1 | -1/+2 |
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix https://github.com/nextcloud/server/issues/3837 Signed-off-by: Xuanwo <xuanwo@yunify.com> | ||||
| * | | | | | | | Merge pull request #3829 from nextcloud/reshares-in-folder | Roeland Jago Douma | 2017-03-14 | 2 | -2/+2 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | switch reshares to true (display reshares in the folder/filelist) | ||||
| | * | | | | | | | fix mock | Maxence Lange | 2017-03-14 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| | * | | | | | | | switch reshares to true | Maxence Lange | 2017-03-14 | 1 | -1/+1 |
| |/ / / / / / / | | | | | | | | | | | | | | | Signed-off-by: Maxence Lange <maxence@nextcloud.com> | ||||
 |
index : nextcloud-server.git | |
| Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server | www-data |
| summaryrefslogtreecommitdiffstats |