summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Cahnge URL for desktop clients directly to pop-upFelix A. Epp2016-12-083-3/+3
* [tx-robot] updated from transifexNextcloud bot2016-12-0826-6/+88
* Increase version string to 11,0,0,6Lukas Reschke2016-12-071-1/+1
* Merge pull request #2549 from nextcloud/increase-version-to-rcLukas Reschke2016-12-071-1/+1
|\
| * Increase versionto 11 RC1Lukas Reschke2016-12-071-1/+1
|/
* Merge pull request #2542 from nextcloud/followup-2516-undefined-providerLukas Reschke2016-12-071-10/+12
|\
| * Make sure $provider is defined when we use itJoas Schilling2016-12-071-10/+12
|/
* [tx-robot] updated from transifexNextcloud bot2016-12-078-80/+216
* Merge pull request #2530 from nextcloud/fix-change-permissions-mail-shares-on...blizzz2016-12-062-1/+4
|\
| * fix type in jsdocArthur Schiwon2016-12-061-1/+1
| * set different permissions if file or folderArthur Schiwon2016-12-061-3/+7
| * set full edit permissionsArthur Schiwon2016-12-061-1/+1
| * fix change permission on mail shares of foldersArthur Schiwon2016-12-061-4/+3
* | Merge pull request #2532 from nextcloud/token-dropdownBjörn Schießle2016-12-062-0/+15
|\ \
| * | hide token configure menu when clicking outside itRobin Appelman2016-12-061-1/+10
| * | hide all other token dropdowns when showing oneRobin Appelman2016-12-061-0/+1
| * | center arrow for token dropdownRobin Appelman2016-12-061-0/+5
|/ /
* | Merge pull request #2524 from nextcloud/fix-db-selectionRoeland Jago Douma2016-12-062-14/+29
|\ \
| * | Fix db selection design and fix #2511John Molakvoæ (skjnldsv)2016-12-062-14/+29
| |/
* | Merge pull request #2519 from nextcloud/404-versions-downloadRoeland Jago Douma2016-12-061-1/+9
|\ \ | |/ |/|
| * Show nice error page for not available versionsMorris Jobke2016-12-051-1/+9
* | Merge pull request #2513 from nextcloud/fix-htaccess-checksRoeland Jago Douma2016-12-063-3/+6
|\ \
| * | Properly check the data dirMorris Jobke2016-12-053-3/+6
| |/
* | Merge pull request #2521 from nextcloud/config-switchesRoeland Jago Douma2016-12-063-1/+15
|\ \
| * | Document updater channel & check for correct PHP version in updaterMorris Jobke2016-12-063-1/+15
* | | [tx-robot] updated from transifexNextcloud bot2016-12-06100-426/+396
|/ /
* | Merge pull request #2520 from nextcloud/replace-stringMorris Jobke2016-12-052-3/+9
|\ \
| * | Check for nextcloud version as wellLukas Reschke2016-12-052-3/+9
* | | Merge pull request #497 from nextcloud/postgres-setup-no-adminMorris Jobke2016-12-052-39/+50
|\ \ \
| * | | handle postgres setup when we cant connect as adminRobin Appelman2016-12-052-39/+50
* | | | Merge pull request #2505 from nextcloud/sudo-mode-provisioning-apiMorris Jobke2016-12-055-7/+130
|\ \ \ \
| * | | | Set last-login-check on basic authRoeland Jago Douma2016-12-052-0/+106
| * | | | Require sudo mode on the provisioning APIJoas Schilling2016-12-053-7/+24
* | | | | Merge pull request #2516 from nextcloud/graceful_no_share_providerMorris Jobke2016-12-051-8/+34
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Handle unavailable share providers more gracefulRoeland Jago Douma2016-12-051-8/+34
| | |/ / | |/| |
* | | | Merge pull request #2509 from nextcloud/sudo-mode-for-app-enablingLukas Reschke2016-12-055-0/+38
|\ \ \ \
| * | | | Add sudo mode to enabling and disabling appsLukas Reschke2016-12-055-0/+38
* | | | | Merge pull request #2484 from nextcloud/fix-wrong-update-of-email-addressChristoph Wurst2016-12-052-7/+28
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | make sure that we only update the email address if it really changedBjoern Schiessle2016-12-022-7/+28
* | | | | Merge pull request #2508 from nextcloud/systemtags-dropdown-styleMorris Jobke2016-12-051-0/+19
|\ \ \ \ \
| * | | | | improve systemtags selector stylingRobin Appelman2016-12-051-0/+19
| | |/ / / | |/| | |
* | | | | Merge pull request #1934 from nextcloud/move-latly-used-tags-to-the-topMorris Jobke2016-12-057-1/+192
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Make sure the object exists before adding it.Joas Schilling2016-11-071-1/+2
| * | | | Also sort the tags in the filterJoas Schilling2016-11-071-0/+35
| * | | | Sort tags by name on the admin pageJoas Schilling2016-11-071-0/+6
| * | | | First list tags the user used latelyJoas Schilling2016-11-075-1/+150
* | | | | Merge pull request #2496 from nextcloud/add-activities-for-favorite-managemetMorris Jobke2016-12-059-23/+605
|\ \ \ \ \
| * | | | | Add tests for favorite actionJoas Schilling2016-12-041-8/+55
| * | | | | Add some generic testsJoas Schilling2016-12-043-0/+248
| * | | | | Add an activity when managing favoritesJoas Schilling2016-12-045-15/+302