summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | fixup! Add vselect theming into serverJohn Molakvoæ (skjnldsv)2018-02-221-1/+0
| * | | | | | Add vselect theming into serverJohn Molakvoæ (skjnldsv)2018-02-222-15/+76
| * | | | | | Ignore the map file tooJoas Schilling2018-02-221-0/+1
| * | | | | | Use mixin for translationsJoas Schilling2018-02-222-48/+22
| * | | | | | Use VueSelect instead of select2Joas Schilling2018-02-226-14/+72
| * | | | | | Move updatenotifications to webpack with .vue fileJoas Schilling2018-02-2212-10706/+6488
| * | | | | | Migrate the app to Vue.jsJoas Schilling2018-02-228-163/+10767
| * | | | | | Rename legacy notification so it's less confusingJoas Schilling2018-02-222-2/+2
* | | | | | | Merge pull request #8359 from nextcloud/swift-v3Morris Jobke2018-02-2610-28/+166
|\ \ \ \ \ \ \
| * | | | | | | adjust external storage config format to the one used in primary storageRobin Appelman2018-02-262-5/+9
| * | | | | | | Kill objectstore CI if we can't create a fileRoeland Jago Douma2018-02-261-0/+7
| * | | | | | | Some swift v3 example configRoeland Jago Douma2018-02-261-0/+22
| * | | | | | | Use username + pass in configRoeland Jago Douma2018-02-261-2/+5
| * | | | | | | User proper username + passRoeland Jago Douma2018-02-261-2/+2
| * | | | | | | Other configRoeland Jago Douma2018-02-261-14/+32
| * | | | | | | Add v3.0 auth runRoeland Jago Douma2018-02-262-1/+6
| * | | | | | | add support for v3 swift authRobin Appelman2018-02-266-15/+94
* | | | | | | | Merge pull request #8463 from kyrofa/bugfix/8462/theming_app_outside_rootMorris Jobke2018-02-262-5/+34
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove null checkKyle Fazzari2018-02-251-7/+2
| * | | | | | | | Add mock to setupKyle Fazzari2018-02-241-16/+4
| * | | | | | | | theming: handle not being in the serverrootKyle Fazzari2018-02-202-3/+49
* | | | | | | | | Merge pull request #8541 from nextcloud/translate-permission-error-pageMorris Jobke2018-02-266-16/+34
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Provide translated error message for permission errorMorris Jobke2018-02-266-16/+34
* | | | | | | | | | Merge pull request #6481 from nextcloud/occ-app-install-enableMorris Jobke2018-02-261-0/+13
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | enable app by default after occ app:installsualko2018-02-261-3/+3
| * | | | | | | | | | add enable flag to occ app:install (fix #5834)sualko2018-02-261-0/+13
* | | | | | | | | | | Merge pull request #8455 from nextcloud/proper_mount_type_externalMorris Jobke2018-02-262-3/+3
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Properly set the mount type for external storagesRoeland Jago Douma2018-02-202-3/+3
* | | | | | | | | | | | Merge pull request #8355 from nextcloud/fix-comments-num-indexMorris Jobke2018-02-265-12/+202
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | fix systemtags event with numeric user idsArthur Schiwon2018-02-141-1/+2
| * | | | | | | | | | | | tests for systemtags related to numeric user idsArthur Schiwon2018-02-141-3/+3
| * | | | | | | | | | | | fix creating comments when file is accessible to users with numeric idsArthur Schiwon2018-02-141-3/+4
| * | | | | | | | | | | | test creating comments with numeric user idsArthur Schiwon2018-02-142-6/+193
| | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge pull request #8412 from agates/masterMorris Jobke2018-02-261-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Update tests for indeterminate state, fix slashes not being escapedMaximilian Wende2018-02-162-2/+50
| * | | | | | | | | | | | Fix indeterminate checkbox state not showing correctlyMaximilian Wende2018-02-151-8/+11
| * | | | | | | | | | | | Add indeterminate state to 'can edit' share permission checkbox, see #8371Maximilian Wende2018-02-152-9/+24
* | | | | | | | | | | | | Merge pull request #8203 from Cybso/split-move-copyMorris Jobke2018-02-265-11/+54
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Split move and copy operationsRoland Tapken2018-02-155-11/+54
* | | | | | | | | | | | | | Merge pull request #8511 from nextcloud/ext-storage-error-warning-fixMorris Jobke2018-02-263-2/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Updated error messageJohn Molakvoæ (skjnldsv)2018-02-232-4/+2
| * | | | | | | | | | | | | Fixed default urlsJohn Molakvoæ (skjnldsv)2018-02-222-2/+2
| * | | | | | | | | | | | | Show error if no external storage configuredJohn Molakvoæ (skjnldsv)2018-02-222-0/+7
* | | | | | | | | | | | | | Merge pull request #8539 from nextcloud/openstack-304Robin Appelman2018-02-261-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | update php-opencloud/openstack to 3.0.4Robin Appelman2018-02-261-0/+0
| | |_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #8504 from nextcloud/bugfix/noid/well-its-not-an-arrayRoeland Jago Douma2018-02-261-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Dont use $info as array when its not an arrayJoas Schilling2018-02-221-1/+1
| | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #8026 from nextcloud/feature/noid/allow-custom-html-in-htm...Joas Schilling2018-02-265-22/+28
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / |/| | | | | | | | | | | | |