aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #7674 from nextcloud/12_7644Morris Jobke2018-01-092-46/+1
|\
| * Do no run SyncJob in cronRoeland Jago Douma2018-01-032-46/+1
* | Merge pull request #7666 from nextcloud/stable12-7527-fix-drag-shadow-not-vis...Morris Jobke2018-01-093-1/+6
|\ \
| * | Fix drag shadow not visible when dragging a file on a narrow screenDaniel Calviño Sánchez2018-01-023-1/+6
| |/
* | Merge pull request #7742 from nextcloud/stable12-7716-hide-favourite-icon-in-...Morris Jobke2018-01-092-1/+40
|\ \
| * | Hide favourite icon in details view if favourite action is not availableDaniel Calviño Sánchez2018-01-082-1/+40
* | | [tx-robot] updated from transifexNextcloud bot2018-01-0918-0/+52
* | | Merge pull request #7694 from nextcloud/stable12-7611Roeland Jago Douma2018-01-088-65/+57
|\ \ \ | |/ / |/| |
| * | test adoption for stable12Arthur Schiwon2018-01-051-3/+5
| * | update autoloaderArthur Schiwon2018-01-042-19/+11
| * | removes invalid tests, adapts another oneArthur Schiwon2018-01-041-33/+0
| * | never translate login names when requiring with a user idArthur Schiwon2018-01-043-22/+34
| * | extend tests for status quoArthur Schiwon2018-01-042-0/+19
* | | [tx-robot] updated from transifexNextcloud bot2018-01-082-0/+2
* | | Merge pull request #7717 from nextcloud/stable12-7662Roeland Jago Douma2018-01-071-7/+10
|\ \ \
| * | | throw ServerNotAvailableException when LDAP is caught shutting downArthur Schiwon2018-01-051-7/+10
* | | | [tx-robot] updated from transifexNextcloud bot2018-01-078-0/+22
* | | | [tx-robot] updated from transifexNextcloud bot2018-01-0636-154/+388
|/ / /
* | | Merge pull request #7688 from nextcloud/stable12-fix-scss-webroot-and-url-rew...Morris Jobke2018-01-057-27/+106
|\ \ \
| * | | Revert rebaseurl function editJohn Molakvoæ (skjnldsv)2018-01-051-1/+1
| * | | Rollback caching fixJohn Molakvoæ (skjnldsv)2018-01-051-3/+4
| * | | Fix faulty path in theming scss generationJulius Härtl2018-01-051-1/+1
| * | | Fixup! Proberly detect variable changesJohn Molakvoæ (skjnldsv)2018-01-041-4/+0
| * | | Proberly detect variable changesJohn Molakvoæ (skjnldsv)2018-01-041-0/+3
| * | | Fixed url rebase with themingJohn Molakvoæ (skjnldsv)2018-01-041-1/+1
| * | | Fixed testsJohn Molakvoæ (skjnldsv)2018-01-041-1/+1
| * | | Fixed testsJohn Molakvoæ (skjnldsv)2018-01-034-14/+33
| * | | Correctly remove temp test directory treeJohn Molakvoæ (skjnldsv)2018-01-031-1/+13
| * | | Added tests for various installations typesJohn Molakvoæ (skjnldsv)2018-01-032-8/+47
| * | | Fixup! getWebdir returnJohn Molakvoæ (skjnldsv)2018-01-031-6/+2
| * | | Use OC_Util function for app web pathJohn Molakvoæ (skjnldsv)2018-01-031-11/+14
| * | | getWebDir functionJohn Molakvoæ (skjnldsv)2018-01-031-15/+19
| * | | Fixed webroot for scss filesJohn Molakvoæ (skjnldsv)2018-01-033-16/+19
| * | | Fixed scss url rewritingJohn Molakvoæ (skjnldsv)2018-01-031-6/+9
* | | | [tx-robot] updated from transifexNextcloud bot2018-01-0538-8/+274
| |/ / |/| |
* | | [tx-robot] updated from transifexNextcloud bot2018-01-04604-1464/+6824
|/ /
* | Merge pull request #7672 from nextcloud/backport/6977/log-censorRoeland Jago Douma2018-01-032-0/+32
|\ \ | |/ |/|
| * Unit tests for #6977Joas Schilling2018-01-031-0/+26
| * Added additional methods for removal of sensitive infoJohannes Schlichenmaier2018-01-031-0/+6
|/
* Merge pull request #7567 from nextcloud/stable-12_fix7428Morris Jobke2017-12-201-0/+16
|\
| * Don't show users which e-mail address match if they belong to a group we may ...Tobia De Koninck2017-12-191-0/+16
* | Merge pull request #7577 from nextcloud/7361_12Roeland Jago Douma2017-12-191-1/+1
|\ \
| * | check userExists later, saves lookups for appData_INSTANCEID useridsArthur Schiwon2017-12-191-1/+1
|/ /
* | Merge pull request #7568 from nextcloud/stable12-fix-duplicate-session-tokenRoeland Jago Douma2017-12-192-0/+9
|\ \ | |/ |/|
| * Fix duplicate session token after remembered loginChristoph Wurst2017-12-192-0/+9
|/
* Merge pull request #7558 from nextcloud/12-7427Morris Jobke2017-12-1811-22/+74
|\
| * Fix email buttons for white themeMorris Jobke2017-12-1811-22/+74
* | Merge pull request #7464 from nextcloud/cached-mount-info-filepath-12Morris Jobke2017-12-137-3/+115
|\ \
| * | Allow getting the filepath when getting cached mounts by fileidRobin Appelman2017-12-127-3/+115
* | | Merge pull request #7468 from nextcloud/update-user-agent-regex-stable12Morris Jobke2017-12-123-4/+18
|\ \ \ | |/ / |/| |