summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2017-03-17104-1128/+1394
* Merge pull request #3679 from nextcloud/socialsharingLukas Reschke2017-03-165-10/+193
|\
| * Fix layout of sharing buttonsMorris Jobke2017-03-142-13/+26
| * Fix testsRoeland Jago Douma2017-03-061-0/+1
| * Make sure copy tooltip remains when we have no social providersRoeland Jago Douma2017-03-031-5/+22
| * Move social buttons to menuRoeland Jago Douma2017-03-035-150/+107
| * Add social sharingRoeland Jago Douma2017-03-034-1/+196
* | Merge pull request #3862 from nextcloud/dont-set-the-status-twiceLukas Reschke2017-03-161-1/+0
|\ \
| * | Don't set the HTTP status twiceJoas Schilling2017-03-161-1/+0
* | | Merge pull request #3008 from nextcloud/appmenu-experimentMorris Jobke2017-03-166-91/+438
|\ \ \
| * | | Fix html formating issuesJulius Haertl2017-03-161-14/+5
| * | | Rebuild menu to keep order of icons correctJulius Haertl2017-03-162-29/+38
| * | | Reduce device width and hide app name when menu is openJulius Haertl2017-03-161-2/+3
| * | | Make enabling/disabling apps work with the new menuJulius Haertl2017-03-163-30/+67
| * | | Fix positioning of popovermenuJulius Haertl2017-03-161-2/+6
| * | | Fix popover positioning after window resizeJulius Haertl2017-03-161-5/+13
| * | | Cleanup SCSS for app menu and fix mobile viewJulius Haertl2017-03-161-103/+91
| * | | Make app management icon act like a normal app iconJulius Haertl2017-03-162-2/+9
| * | | Fix menu issuesJulius Haertl2017-03-164-61/+101
| * | | Generate seperate menu list for header barJulius Haertl2017-03-164-22/+73
| * | | Move active app to the first slotJulius Haertl2017-03-161-9/+19
| * | | Show app icons in the headerJulius Haertl2017-03-163-5/+206
* | | | Merge pull request #3863 from nextcloud/additional-hardening-of-tRoeland Jago Douma2017-03-165-18/+23
|\ \ \ \
| * | | | Harden t() with DOMPurifyLukas Reschke2017-03-165-18/+23
|/ / / /
* | | | Merge pull request #3860 from nextcloud/fix_master_after_3802Lukas Reschke2017-03-162-0/+39
|\ \ \ \ | |_|/ / |/| | |
| * | | Fix unit tests of masterRoeland Jago Douma2017-03-162-0/+39
|/ / /
* | | Merge pull request #3802 from Ko-/masterRoeland Jago Douma2017-03-1610-8/+48
|\ \ \
| * | | Add warning on admin screen when set_time_limit is unavailableKo-2017-03-162-0/+23
| * | | Check that set_time_limit is not disabled before calling itKo-2017-03-118-8/+25
* | | | Merge pull request #3857 from nextcloud/issue-3901-legacy-caldav-endpoint-ema...Joas Schilling2017-03-161-1/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | Fix scheduling plugin on legacy caldav endpointJoas Schilling2017-03-161-1/+1
|/ / /
* | | Merge pull request #3624 from marncz/masterRoeland Jago Douma2017-03-161-2/+15
|\ \ \
| * | | SpacingMarcin Czarnecki2017-03-151-1/+1
| * | | Update: feedback before redirectMarcin Czarnecki2017-03-141-8/+9
| * | | Update: feedback before redirectMarcin Czarnecki2017-02-251-2/+14
* | | | [tx-robot] updated from transifexNextcloud bot2017-03-1696-114/+18
* | | | Merge pull request #3788 from nextcloud/fed-share-modifyRoeland Jago Douma2017-03-152-21/+59
|\ \ \ \
| * | | | Add api to change the remote of an incoming federated shareRobin Appelman2017-03-102-21/+59
* | | | | Merge pull request #3843 from nextcloud/encryption-fix-mail-shareJoas Schilling2017-03-151-3/+3
|\ \ \ \ \
| * | | | | take share by mail into consideration if we calculate the access listBjoern Schiessle2017-03-141-3/+3
* | | | | | Merge pull request #3848 from nextcloud/remove-single-quotes-around-search-queryRoeland Jago Douma2017-03-152-4/+4
|\ \ \ \ \ \
| * | | | | | Remove single quotes around search query like in user searchJoas Schilling2017-03-152-4/+4
* | | | | | | Merge pull request #3841 from nextcloud/encyryption-trash-binBjörn Schießle2017-03-154-14/+34
|\ \ \ \ \ \ \
| * | | | | | | delete files right away in case of a encryption exceptionBjoern Schiessle2017-03-142-8/+29
| * | | | | | | always throw a encryption exceptionBjoern Schiessle2017-03-142-6/+5
| | |/ / / / / | |/| | | | |
* | | | | | | [tx-robot] updated from transifexNextcloud bot2017-03-1524-98/+220
* | | | | | | Merge pull request #3838 from Xuanwo/basename-fixRoeland Jago Douma2017-03-141-1/+2
|\ \ \ \ \ \ \
| * | | | | | | [OC/Files/Cache]: Fix wrong usage of basenameXuanwo2017-03-141-1/+2
| |/ / / / / /
* | | | | | | Merge pull request #3829 from nextcloud/reshares-in-folderRoeland Jago Douma2017-03-142-2/+2
|\ \ \ \ \ \ \
| * | | | | | | fix mockMaxence Lange2017-03-141-1/+1