summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #11053 from nextcloud/occ-app-update-commandMorris Jobke2018-11-024-0/+128
|\
| * Log exception in case an app update failsMorris Jobke2018-11-011-1/+7
| * Add occ app:update commandMichael Gerber2018-11-014-0/+122
* | Merge pull request #12192 from nextcloud/development-setupJan-Christoph Borchardt2018-11-022-63/+84
|\ \
| * | Readme: Simply use emojis instead of images for tools sectionJan-Christoph Borchardt2018-11-011-14/+4
| * | Readme: Reduce size of Tools logos, use HTML for partJan-Christoph Borchardt2018-11-011-8/+12
| * | Readme: Add line breaks between tool imagesJan-Christoph Borchardt2018-11-011-1/+5
| * | Readme: Replace Github emoji codes with real emojiJan-Christoph Borchardt2018-11-011-19/+20
| * | Readme: Add note about signing off commitsJan-Christoph Borchardt2018-11-011-3/+4
| * | Add sentence about non-technical contributionsJan-Christoph Borchardt2018-11-011-4/+4
| * | Readme: Fix screenshot linkJan-Christoph Borchardt2018-11-011-1/+1
| * | Readme: adjust structure, wording, small fixesJan-Christoph Borchardt2018-11-011-25/+31
| * | Add front-end building documentation to readmeJan-Christoph Borchardt2018-11-012-23/+38
* | | Merge pull request #11844 from nextcloud/multiple-link-sharesMorris Jobke2018-11-0126-500/+893
|\ \ \
| * | | Fixed jsunitJohn Molakvoæ (skjnldsv)2018-11-015-69/+75
| * | | Password policy fix and menu open on first shareJohn Molakvoæ (skjnldsv)2018-11-013-4/+29
| * | | Fix wording, sort 'Add another link' to bottom so it does not confuseJan-Christoph Borchardt2018-11-014-49/+56
| * | | Adjust acceptance tests to changes in link sharesDaniel Calviño Sánchez2018-11-011-21/+18
| * | | Use primary color for share link icon background instead of bland greyJan-Christoph Borchardt2018-11-011-2/+2
| * | | Fix password enforcementJohn Molakvoæ (skjnldsv)2018-11-017-126/+176
| * | | Fix enforce dateJohn Molakvoæ (skjnldsv)2018-11-013-14/+33
| * | | Fix note displayJohn Molakvoæ (skjnldsv)2018-11-016-16/+28
| * | | Copy link outside menuJohn Molakvoæ (skjnldsv)2018-11-015-42/+43
| * | | Migrate link shares to arrayJohn Molakvoæ (skjnldsv)2018-11-018-243/+390
| * | | adjust unit testsBjoern Schiessle2018-11-011-2/+22
| * | | allow to update lables for public link sharesBjoern Schiessle2018-11-012-1/+16
| * | | allow to add labels to sharesBjoern Schiessle2018-11-018-7/+110
| * | | allow to create multiple link shares via share apiBjoern Schiessle2018-10-311-9/+0
* | | | Merge pull request #12188 from nextcloud/revert/9900/revert-wait-for-cronMorris Jobke2018-11-015-76/+12
|\ \ \ \
| * | | | Revert "Wait for cron to finish before running upgrade command"Morris Jobke2018-11-015-76/+12
* | | | | Merge pull request #12196 from nextcloud/revert-12138-and-12138Morris Jobke2018-11-012-4/+3
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Revert "Fix .hidden class specificity, should not be overridable, ref #12138"Julius Härtl2018-11-011-3/+3
| * | | | Revert "make .button inline-block"Julius Härtl2018-11-011-1/+0
|/ / / /
* | | | Merge pull request #12152 from brad2014/bugfix/12151/fix-emailtemplate-list-f...Morris Jobke2018-11-011-2/+3
|\ \ \ \ | |_|_|/ |/| | |
| * | | Fix bug #12151: fix list formatting by correcting malformed htmlbrad20142018-10-301-2/+3
* | | | Merge pull request #12150 from nextcloud/techdebt/noid/ldap-rm-iusertoolsMorris Jobke2018-11-017-179/+110
|\ \ \ \ | |_|/ / |/| | |
| * | | remove app specific IUserTools and consolidate testArthur Schiwon2018-10-307-179/+110
| |/ /
* | | Merge pull request #12180 from nextcloud/sidebar-fixesMorris Jobke2018-11-013-7/+37
|\ \ \
| * | | Fix design of tabs in sidebarJan-Christoph Borchardt2018-11-011-5/+25
| * | | Fix issues with clipboard button for local link in sidebarJan-Christoph Borchardt2018-11-011-2/+8
| * | | Add icon to Versions sidebar tabJan-Christoph Borchardt2018-11-011-0/+4
* | | | Merge pull request #12163 from nextcloud/bugfix/11730/file-share-edit-stateMorris Jobke2018-11-013-1/+40
|\ \ \ \
| * | | | Add tests for edit permission state on file sharesJulius Härtl2018-10-311-0/+31
| * | | | Do not set indeterminate state for file sharesJulius Härtl2018-10-312-1/+9
* | | | | Merge pull request #12162 from nextcloud/file-menu-alignMorris Jobke2018-11-011-2/+13
|\ \ \ \ \
| * | | | | Align file menu below '+' button, fix #5595Jan-Christoph Borchardt2018-10-311-2/+13
| | |_|/ / | |/| | |
* | | | | Merge pull request #12129 from nextcloud/versions-modular-apiMorris Jobke2018-11-0121-120/+798
|\ \ \ \ \
| * | | | | modular versions apiRobin Appelman2018-11-0121-120/+798
* | | | | | Merge pull request #12181 from nextcloud/fix-header-clickabilityRoeland Jago Douma2018-11-011-0/+1
|\ \ \ \ \ \
| * | | | | | Fix header app name clickability issue, fix #12165Jan-Christoph Borchardt2018-11-011-0/+1
| | |_|_|/ / | |/| | | |