Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WorkInProgress - Remove UIKit & cleanup files #324

Merged
merged 29 commits into from
Nov 22, 2018
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
944fc9c
closes #228, closes #127, refs #1 - theming improvements & cleanup
Nov 12, 2018
eda27c9
fixed material-icon path for production builds
Nov 12, 2018
cfd005c
fixed material-icon path for dev & production builds
Nov 12, 2018
b8b1cc2
mobile style fix + gitignore fix
Nov 12, 2018
0b92c00
added FIXME to center-dialog css class
Nov 14, 2018
037fa27
set default value vor v-btn, h2 and flex
Nov 14, 2018
51da0d1
adjusted error page to fit login page
Nov 14, 2018
9736097
added app-store, added getter for user
Nov 16, 2018
2150b96
removed UiKit from phoenix-core
Nov 16, 2018
2355855
WIP: adapting files app to vuetify and cleanup files-app store
Nov 16, 2018
da36e8f
Merge remote-tracking branch 'upstream/master' into feature/UiKit-remove
Nov 16, 2018
a33dc3a
lint-fix & login screen fix
Nov 16, 2018
a2c0ff5
removed loading indicator from tests - oc-loader-spinner is no longer…
Nov 16, 2018
b02f284
added id for filesTable
Nov 16, 2018
5b1907b
Merge branch 'master' into feature/UiKit-remove
scramb Nov 17, 2018
5f36687
added translation tags
Nov 20, 2018
dfd172d
added filter and another missing v-translate
Nov 20, 2018
bcb25a1
refcatored loadFolder function to use vuex store instead of localstorage
Nov 20, 2018
c8ad29d
Merge branch 'master' into feature/UiKit-remove
scramb Nov 20, 2018
5e734e1
enqueue notifications in store & show consecutively
tempelgogo Nov 20, 2018
c358788
example notification: Could not login
tempelgogo Nov 20, 2018
22f879d
added base for addNewFile
Nov 20, 2018
6c72405
lint-fix
Nov 21, 2018
51a5fdc
start working on file-details sidebar - build again & add fileactons-tab
Nov 21, 2018
0b0771a
Fix creating subfolders
DeepDiver1975 Nov 21, 2018
28d342c
Added FileActionsTab and Fixed File-Details
Nov 22, 2018
486757b
Merge branch 'master' into feature/UiKit-remove
scramb Nov 22, 2018
d13a396
Show favorite status based on dav property
DeepDiver1975 Nov 22, 2018
954e588
Bring back other properties
DeepDiver1975 Nov 22, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion apps/files/src/components/Files-App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
</v-flex>
<v-spacer></v-spacer>
<v-flex align-self-center class="text-xs-right" xs1>
<span class="heading">{{ files.length }} Results</span>
<span><translate :translate-n="files.length" translate-plural="%{ files.length } Results">%{ files.length } Result</translate></span>
</v-flex>
<v-menu transition="scale-transition">
<v-btn slot="activator" flat><v-icon large>filter_list</v-icon></v-btn>
Expand Down Expand Up @@ -186,6 +186,8 @@
this.newFolderName = '';
})
.catch(console.error)
} else{
this.createFolder = !this.createFolder
}
},

Expand Down
9 changes: 5 additions & 4 deletions src/components/Menu.vue
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<v-icon>{{ n.iconMaterial }}</v-icon>
</v-list-tile-action>
<v-list-tile-content>
<v-list-tile-title>{{ n.name }}</v-list-tile-title>
<v-list-tile-title v-translate>{{ n.name }}</v-list-tile-title>
</v-list-tile-content>
</v-list-tile>

Expand All @@ -32,7 +32,7 @@
<v-icon>{{ item.icon }}</v-icon>
</v-list-tile-action>
<v-list-tile-content>
<v-list-tile-title>{{ item.title }}</v-list-tile-title>
<v-list-tile-title v-translate>{{ item.title }}</v-list-tile-title>
</v-list-tile-content>
</v-list-tile>
<v-list-tile
Expand All @@ -41,7 +41,7 @@
@click="notImplemented()"
>
<v-list-tile-content>
<v-list-tile-title>{{ subItem.title }}</v-list-tile-title>
<v-list-tile-title v-translate>{{ subItem.title }}</v-list-tile-title>
</v-list-tile-content>

<v-list-tile-action>
Expand All @@ -58,7 +58,7 @@
<v-icon>exit_to_app</v-icon>
</v-list-tile-action>
<v-list-tile-content>
<v-list-tile-title>Exit ownCloud</v-list-tile-title>
<v-list-tile-title>Exit {{ configuration.theme.general.name }}</v-list-tile-title>
scramb marked this conversation as resolved.
Show resolved Hide resolved
</v-list-tile-content>
</v-list-tile>

Expand Down Expand Up @@ -114,6 +114,7 @@ export default {
return this.$root.navItems
},
...mapGetters(['isSidebarVisible']),
...mapGetters(['configuration']),
sidebarIsVisible: {
get () {
return this.isSidebarVisible
Expand Down
3 changes: 1 addition & 2 deletions src/components/Top-Bar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@
v-if="configuration.theme.logo.big"
:src="configuration.theme.logo.big"
:aspect-ratio="1.8"
width="60%"
/>
width="60%"/>
</v-flex>
<span class="font-weight-medium title">{{ configuration.theme.general.name }}</span>
<v-spacer></v-spacer>
Expand Down