summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * Fix typo in callback nameDaniel Calviño Sánchez2018-01-091-2/+2
| | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | Merge pull request #7740 from nextcloud/12.0.5-rc1-prepRoeland Jago Douma2018-01-091-2/+2
|\ \ | |/ |/| 12.0.5 RC1
| * 12.0.5 RC1Morris Jobke2018-01-091-2/+2
|/ | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* Merge pull request #7747 from nextcloud/composer_up_12Morris Jobke2018-01-092-11/+19
|\ | | | | Update of composer
| * Update of composerRoeland Jago Douma2018-01-092-11/+19
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Properly catch InvalidTokenException for better error responseMorris Jobke2018-01-092-1/+50
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #7745 from nextcloud/7692_12Morris Jobke2018-01-094-9/+76
|\ \ | | | | | | [stable12] Don't lie about preview types
| * | Only return 1 typeRoeland Jago Douma2018-01-082-7/+20
| | | | | | | | | | | | | | | | | | | | | Throw proper exception if we can't get the mimetype for a preview. Catch it later on so we can just return a not found for the preview. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Don't lie about the preview mimetypeRoeland Jago Douma2018-01-084-7/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For legacy reasons we stored all the previews with a png extention. However we did not put png data in them all the time. This caused the preview endpoints to always report that a preview is a png file. Which was a lie. Since we abstract away from the storage etc in the previewmanager. There is no need anymore to store them as .png files and instead we can use the actual file extention. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #7708 from nextcloud/stable12-7599Morris Jobke2018-01-092-3/+6
|\ \ \ | | | | | | | | [stable12] don't show recurring msg when pages result was turned off
| * | | don't show recurring msg when pages result was turned offArthur Schiwon2018-01-052-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | and only as debug level otherwise. Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | Merge pull request #7684 from nextcloud/backport-ie-fix-invertMorris Jobke2018-01-096-33/+47
|\ \ \ \ | | | | | | | | | | [stable12] Fix inverted app icons on IE11
| * | | | Fix height of table rows in apps management on IE11Julius Härtl2018-01-031-0/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | Remove css invert since we are using svg filters for nowJulius Härtl2018-01-032-9/+4
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | Fix icon rendering in apps management for IE11Julius Härtl2018-01-032-6/+4
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | Invert app icons on IE11 as wellJulius Härtl2018-01-033-20/+40
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | | Merge pull request #7674 from nextcloud/12_7644Morris Jobke2018-01-092-46/+1
|\ \ \ \ \ | | | | | | | | | | | | [stable12] Do no run SyncJob in cron
| * | | | | Do no run SyncJob in cronRoeland Jago Douma2018-01-032-46/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #7184 The SyncJob can be very resource intensive. Since it requests all users on the system to create the system addressbook. In order to do this it creates a vcard for every user and updates the addressbook. There is no need for this job since the proper signals are emitted and handled in the carddav backend to update the addressbook live. Worst comes to worst there is always the occ command to bring the address book in sync again. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | Merge pull request #7666 from ↵Morris Jobke2018-01-093-1/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/stable12-7527-fix-drag-shadow-not-visible-when-dragging-a-file-on-a-narrow-screen [stable12] Fix drag shadow not visible when dragging a file on a narrow screen
| * | | | | | Fix drag shadow not visible when dragging a file on a narrow screenDaniel Calviño Sánchez2018-01-023-1/+6
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a file from the file list is dragged a drag shadow (a copy of the file row that follows the cursor position) is created. The drag shadow element is created as a direct child of the body element, so it needs a higher "z-index" than the one used for the file list to be visible. In narrow screens the "#app-content" uses a "z-index" of 1000 in order to be visible over the "#navigation-bar" when they overlap, so the "z-index" of the drag shadow must be at least 1000 to be visible over the file list. Instead of updating the hardcoded "z-index" it was removed and replaced by CSS rules for ".dragshadow" elements to ease theming. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | | | | | Merge pull request #7742 from ↵Morris Jobke2018-01-092-1/+40
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | nextcloud/stable12-7716-hide-favourite-icon-in-details-view-if-favourite-action-is-not-available [stable12] Hide favourite icon in details view if favourite action is not available
| * | | | | Hide favourite icon in details view if favourite action is not availableDaniel Calviño Sánchez2018-01-082-1/+40
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the favourite icon in the details view is clicked the "Favorite" action is triggered. However, if the action name given to "triggerAction" is not found then the "Download" action is triggered instead. As the "Favorite" action is not available in some file lists (like "Recents") the "Download" action was executed instead in those cases, which was a strange behaviour. Now the favourite icon is hidden if its action is not available. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | | | | [tx-robot] updated from transifexNextcloud bot2018-01-0918-0/+52
| | | | |
* | | | | Merge pull request #7694 from nextcloud/stable12-7611Roeland Jago Douma2018-01-088-65/+57
|\ \ \ \ \ | |/ / / / |/| | | | [stable12] Don't attempt to translate login names to uids when uids are provided
| * | | | test adoption for stable12Arthur Schiwon2018-01-051-3/+5
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | | update autoloaderArthur Schiwon2018-01-042-19/+11
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | | removes invalid tests, adapts another oneArthur Schiwon2018-01-041-33/+0
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | | never translate login names when requiring with a user idArthur Schiwon2018-01-043-22/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | where appropriate, the preLoginNameUsedAsUserName hook should be thrown. Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | | extend tests for status quoArthur Schiwon2018-01-042-0/+19
| | |_|/ | |/| | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | [tx-robot] updated from transifexNextcloud bot2018-01-082-0/+2
| | | |
* | | | Merge pull request #7717 from nextcloud/stable12-7662Roeland Jago Douma2018-01-071-7/+10
|\ \ \ \ | | | | | | | | | | [stable12] throw ServerNotAvailableException when LDAP is caught shutting down
| * | | | throw ServerNotAvailableException when LDAP is caught shutting downArthur Schiwon2018-01-051-7/+10
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | | [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 ↵Morris Jobke2018-01-057-27/+106
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | nextcloud/stable12-fix-scss-webroot-and-url-rewrite [Stable12] fix scss webroot and url rewrite
| * | | | Revert rebaseurl function editJohn Molakvoæ (skjnldsv)2018-01-051-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | Rollback caching fixJohn Molakvoæ (skjnldsv)2018-01-051-3/+4
| | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | Fix faulty path in theming scss generationJulius Härtl2018-01-051-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | Fixup! Proberly detect variable changesJohn Molakvoæ (skjnldsv)2018-01-041-4/+0
| | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | Proberly detect variable changesJohn Molakvoæ (skjnldsv)2018-01-041-0/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | Fixed url rebase with themingJohn Molakvoæ (skjnldsv)2018-01-041-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | Fixed testsJohn Molakvoæ (skjnldsv)2018-01-041-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | Fixed testsJohn Molakvoæ (skjnldsv)2018-01-034-14/+33
| | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | Correctly remove temp test directory treeJohn Molakvoæ (skjnldsv)2018-01-031-1/+13
| | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | Added tests for various installations typesJohn Molakvoæ (skjnldsv)2018-01-032-8/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - With root installation - Core css - App inside server root - Secondary apps directory outside server root - With an installation in a sub directory - Core css - App inside server root - Secondary apps directory outside server root Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | Fixup! getWebdir returnJohn Molakvoæ (skjnldsv)2018-01-031-6/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | Use OC_Util function for app web pathJohn Molakvoæ (skjnldsv)2018-01-031-11/+14
| | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | getWebDir functionJohn Molakvoæ (skjnldsv)2018-01-031-15/+19
| | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | Fixed webroot for scss filesJohn Molakvoæ (skjnldsv)2018-01-033-16/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed tests Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | Fixed scss url rewritingJohn Molakvoæ (skjnldsv)2018-01-031-6/+9
| | |_|/ | |/| | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>