summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Pass template parameters to parent templateJulius Härtl2018-02-272-2/+8
| | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* Merge pull request #8557 from nextcloud/fix-theming-defaultsRoeland Jago Douma2018-02-271-1/+5
|\ | | | | Fix check if theming defaults instance is available
| * Fix check if theming defaults instance is availableMorris Jobke2018-02-271-1/+5
|/ | | | | | | | The check in URLGenerator.php#169 and Server.php#945 are different and thus the DI container could return a \OC_Defaults object which does not provide the wanted method caising a PHP error. Fixes #8420 Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* Merge pull request #8548 from BernieO/patch-1Roeland Jago Douma2018-02-271-3/+3
|\ | | | | fix: change 'sqlite' to 'sqlite3'
| * fix: change 'sqlite' to 'sqlite3'BernieO2018-02-261-3/+3
| | | | | | | | | | | | | | | | @MorrisJobke asked me to open this pull request in the server repo instead of the documentation repo: https://github.com/nextcloud/documentation/pull/690 Text from the documentation pull request: On a fresh Nextcloud 13 Installation the default value for dbtype in config.php is 'sqlite3' (and not 'sqlite'). I also noticed that on previous versions. Despite the fact that Nextcloud 13 also works though, if that value is manually changed to 'sqlite', I would suggest to change that in the documentation to the actually used value created when installing Nextcloud - and that is 'sqlite3'.
* | [tx-robot] updated from transifexNextcloud bot2018-02-27242-1614/+1738
| |
* | Merge pull request #8485 from sagorika1996/renameRoeland Jago Douma2018-02-261-1/+5
|\ \ | | | | | | Rename dialog closed when not active
| * | rename dialog closed when not activeSagorika Das2018-02-211-1/+5
| | | | | | | | | | | | Signed-off-by: Sagorika Das <sagorika1996@gmail.com>
* | | Merge pull request #7933 from nextcloud/update-notification-vuejsJoas Schilling2018-02-2617-193/+6692
|\ \ \ | |_|/ |/| | Migrate Update notifications to Vue.js
| * | Fix appnameMorris Jobke2018-02-261-1/+1
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | Fix unit testsJoas Schilling2018-02-231-1/+21
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | fixup! Add vselect theming into serverJohn Molakvoæ (skjnldsv)2018-02-221-1/+0
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | Add vselect theming into serverJohn Molakvoæ (skjnldsv)2018-02-222-15/+76
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | Ignore the map file tooJoas Schilling2018-02-221-0/+1
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Use mixin for translationsJoas Schilling2018-02-222-48/+22
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Use VueSelect instead of select2Joas Schilling2018-02-226-14/+72
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Move updatenotifications to webpack with .vue fileJoas Schilling2018-02-2212-10706/+6488
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Migrate the app to Vue.jsJoas Schilling2018-02-228-163/+10767
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Rename legacy notification so it's less confusingJoas Schilling2018-02-222-2/+2
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #8359 from nextcloud/swift-v3Morris Jobke2018-02-2610-28/+166
|\ \ \ | | | | | | | | Support swift v3 authentication
| * | | adjust external storage config format to the one used in primary storageRobin Appelman2018-02-262-5/+9
| | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | Kill objectstore CI if we can't create a fileRoeland Jago Douma2018-02-261-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This is more of a hack. But one of the nodes won't properly run this. No sense in waiting 60 minutes Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | Some swift v3 example configRoeland Jago Douma2018-02-261-0/+22
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | Use username + pass in configRoeland Jago Douma2018-02-261-2/+5
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | User proper username + passRoeland Jago Douma2018-02-261-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | Other configRoeland Jago Douma2018-02-261-14/+32
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | Add v3.0 auth runRoeland Jago Douma2018-02-262-1/+6
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | add support for v3 swift authRobin Appelman2018-02-266-15/+94
| | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | Merge pull request #8463 from kyrofa/bugfix/8462/theming_app_outside_rootMorris Jobke2018-02-262-5/+34
|\ \ \ \ | | | | | | | | | | theming: handle not being in the serverroot
| * | | | Remove null checkKyle Fazzari2018-02-251-7/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Kyle Fazzari <kyrofa@ubuntu.com>
| * | | | Add mock to setupKyle Fazzari2018-02-241-16/+4
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Kyle Fazzari <kyrofa@ubuntu.com>
| * | | | theming: handle not being in the serverrootKyle Fazzari2018-02-202-3/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, the theming app assumes it's in the serverroot. However, with Nextcloud's flexibility regarding configurable app paths, this is not a safe assumption to make. If it happens to be an incorrect assumption, the theming app fails to work. Instead of relying on the serverroot, just use the path from the AppManager and utilize relative paths for assets from there. Fix #8462 Signed-off-by: Kyle Fazzari <kyrofa@ubuntu.com>
* | | | | Merge pull request #8541 from nextcloud/translate-permission-error-pageMorris Jobke2018-02-266-16/+34
|\ \ \ \ \ | | | | | | | | | | | | Provide translated error message for permission error
| * | | | | Provide translated error message for permission errorMorris Jobke2018-02-266-16/+34
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | Merge pull request #6481 from nextcloud/occ-app-install-enableMorris Jobke2018-02-261-0/+13
|\ \ \ \ \ \ | | | | | | | | | | | | | | add enable flag to occ app:install
| * | | | | | enable app by default after occ app:installsualko2018-02-261-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Klaus Herberth <klaus@jsxc.org>
| * | | | | | add enable flag to occ app:install (fix #5834)sualko2018-02-261-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Klaus Herberth <klaus@jsxc.org>
* | | | | | | Merge pull request #8455 from nextcloud/proper_mount_type_externalMorris Jobke2018-02-262-3/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Properly set the mount type for external storages
| * | | | | | | Properly set the mount type for external storagesRoeland Jago Douma2018-02-202-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | | | Merge pull request #8355 from nextcloud/fix-comments-num-indexMorris Jobke2018-02-265-12/+202
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix comments (and systemtags) when involving users with numerical ids
| * | | | | | | | fix systemtags event with numeric user idsArthur Schiwon2018-02-141-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | | | | | | tests for systemtags related to numeric user idsArthur Schiwon2018-02-141-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | | | | | | fix creating comments when file is accessible to users with numeric idsArthur Schiwon2018-02-141-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | | | | | | test creating comments with numeric user idsArthur Schiwon2018-02-142-6/+193
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | | | | | Merge pull request #8412 from agates/masterMorris Jobke2018-02-261-1/+1
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | Add mtime and storage_mtime to db:convert-filecache-bigint
| * | | | | | | Add mtime and storage_mtime to db:convert-filecache-bigintAlecks Gates2018-02-171-1/+1
| | | | | | | |
* | | | | | | | Merge pull request #8390 from dasisdormax/masterMorris Jobke2018-02-263-18/+84
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Add indeterminate state to share permission checkbox
| * | | | | | | | Update tests for indeterminate state, fix slashes not being escapedMaximilian Wende2018-02-162-2/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Maximilian Wende <dasisdormax@mailbox.org>
| * | | | | | | | Fix indeterminate checkbox state not showing correctlyMaximilian Wende2018-02-151-8/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also, the checkbox is updated to the correct state while a permission change is in progress. should fix issue #8371 Signed-off-by: Maximilian Wende <dasisdormax@secure.mailbox.org>
| * | | | | | | | Add indeterminate state to 'can edit' share permission checkbox, see #8371Maximilian Wende2018-02-152-9/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Maximilian Wende <dasisdormax@secure.mailbox.org>