summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Add missing use statement for PublicEmitterSandro Lutz2017-02-071-0/+1
* Fix typo for UserManager variableSandro Lutz2017-02-011-1/+1
* Add check if UserManager is of type PublicEmitter before calling preLogin hookSandro Lutz2017-02-012-2/+6
* Change where preLogin hook gets calledSandro Lutz2017-02-012-3/+4
* Remove preLoginValidation hookSandro Lutz2017-02-012-6/+0
* Fix indentationSandro Lutz2017-02-012-4/+4
* Add preLoginValidation hookSandro Lutz2017-02-012-0/+6
* Merge pull request #2274 from nextcloud/fix-invites-on-readonly-calendarsLukas Reschke2016-12-102-0/+66
|\
| * Overwrite the schedule target calendar with the personal one and create it if...Joas Schilling2016-12-092-0/+66
* | Merge pull request #2598 from nextcloud/fix_2403Lukas Reschke2016-12-101-0/+9
|\ \
| * | Check for app updates on disabled pageRoeland Jago Douma2016-12-091-0/+9
* | | [tx-robot] updated from transifexNextcloud bot2016-12-1014-14/+250
* | | Merge pull request #2590 from nextcloud/postgres-install-failingRoeland Jago Douma2016-12-091-5/+5
|\ \ \
| * | | Lower the role name before using itJoas Schilling2016-12-091-1/+1
| * | | Revert "Quote database and role in queries"Joas Schilling2016-12-091-4/+4
* | | | Merge pull request #2594 from nextcloud/dont-use-cached-infoRoeland Jago Douma2016-12-093-5/+12
|\ \ \ \
| * | | | Don't use cached informations for app versionLukas Reschke2016-12-093-5/+12
| | |/ / | |/| |
* | | | Merge pull request #2596 from nextcloud/nc11-dev-manual-linkJohn Molakvoæ2016-12-092-2/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Fix dev manual link for NC11Christoph Wurst2016-12-092-2/+2
|/ / /
* | | Merge pull request #2587 from nextcloud/theming-app-not-loadedMorris Jobke2016-12-091-1/+1
|\ \ \
| * | | Check if the theming app is loadedJulius Haertl2016-12-091-1/+1
* | | | Merge pull request #2588 from nextcloud/theming-check-emptyBjörn Schießle2016-12-092-1/+4
|\ \ \ \ | |_|/ / |/| | |
| * | | Check if image files for theming are emptyJulius Haertl2016-12-092-1/+4
| |/ /
* | | Merge pull request #2584 from nextcloud/theming-filter-fixJoas Schilling2016-12-091-1/+6
|\ \ \
| * | | Add fallback to FILTER_LANCZOS for icon resizingJulius Haertl2016-12-091-1/+6
| | |/ | |/|
* | | Merge pull request #2582 from nextcloud/callback-alos-on-closeLukas Reschke2016-12-091-1/+15
|\ \ \ | |_|/ |/| |
| * | Fire callback also on pure closing of prompt dialogMorris Jobke2016-12-091-1/+15
* | | Merge pull request #2561 from nextcloud/save-timezone-on-loginblizzz2016-12-094-4/+24
|\ \ \ | |/ / |/| |
| * | Save the timezone on login againJoas Schilling2016-12-084-4/+24
* | | [tx-robot] updated from transifexNextcloud bot2016-12-0914-28/+174
| |/ |/|
* | Merge pull request #2571 from nextcloud/issue-2568-allow-non-subadmins-to-cha...Morris Jobke2016-12-082-2/+3
|\ \
| * | Allow non-subadmins to change their languageJoas Schilling2016-12-081-0/+1
| * | Allow to overwrite the message which we already do in SubadminMiddlewareJoas Schilling2016-12-081-2/+2
|/ /
* | Merge pull request #2565 from nextcloud/direct-desktop-clientsRoeland Jago Douma2016-12-083-3/+3
|\ \
| * | Cahnge URL for desktop clients directly to pop-upFelix A. Epp2016-12-083-3/+3
| |/
* | Merge pull request #2515 from nextcloud/tag-rename-stylingJoas Schilling2016-12-082-3/+11
|\ \
| * | fix rename input positioning in ffRobin Appelman2016-12-061-0/+2
| * | float tooltip over select2 dropdownRobin Appelman2016-12-051-1/+1
| * | fix styling of renaming system tagsRobin Appelman2016-12-051-2/+8
* | | Merge pull request #2545 from nextcloud/fix-popover-widthRoeland Jago Douma2016-12-083-10/+3
|\ \ \
| * | | Fix popover federationScopeMenuJohn Molakvoæ (skjnldsv)2016-12-071-0/+1
| * | | Fix popover margin and widthJohn Molakvoæ (skjnldsv)2016-12-072-10/+2
* | | | Merge pull request #2556 from Lartza/fix-setup-pgsql-quotesRobin Appelman2016-12-081-4/+4
|\ \ \ \
| * | | | Quote database and role in queriesLari Tikkanen2016-12-071-4/+4
* | | | | Merge pull request #2534 from nextcloud/fix-avatar-upload-buttonsRoeland Jago Douma2016-12-081-26/+11
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Fix #2473John Molakvoæ (skjnldsv)2016-12-061-26/+11
* | | | | [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
|/ / / /