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.

Sign up for GitHub

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

Camera fix + Roeselare version #27

Merged
merged 41 commits into from
Jul 19, 2017
Merged

Camera fix + Roeselare version #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
579776d
Fix browse
oxnoctisxo Jul 17, 2017
db21181
Imatating the new design
oxnoctisxo Jul 17, 2017
a7a7312
End of monday 3rd week
oxnoctisxo Jul 17, 2017
7434679
Questions view basics done, question detail todo, menu adjusted
th0rgall Jul 17, 2017
f774162
Question from a JSON are shown now
th0rgall Jul 17, 2017
06cc759
Merge with develop
th0rgall Jul 17, 2017
60c7c63
Fixes
th0rgall Jul 17, 2017
f78695c
EmptyPage and new Story
oxnoctisxo Jul 18, 2017
ed79fa8
Merge & add question answer as story
th0rgall Jul 18, 2017
e41cc4d
Lowercase images for unix systems
th0rgall Jul 18, 2017
a3be432
Fixing of tutorial and empty
oxnoctisxo Jul 18, 2017
f10662d
New small fixes
oxnoctisxo Jul 18, 2017
8256766
Tutorial fixed
oxnoctisxo Jul 18, 2017
d0d9ed8
Colors fixed
oxnoctisxo Jul 18, 2017
f6faa67
Fixed keyboard related issues.
oxnoctisxo Jul 18, 2017
bede886
More questions - most of them taken from the "Mama schrijft boek"
th0rgall Jul 18, 2017
279dd04
Can create text stories now.
oxnoctisxo Jul 18, 2017
d242f5e
Improved text images
oxnoctisxo Jul 18, 2017
ed145db
Fixed detail page for text only
oxnoctisxo Jul 18, 2017
5cef06c
Merge branch 'questions-view-23' of https://github.com/oSoc17/prisma-…
th0rgall Jul 18, 2017
8909f6f
white questions
th0rgall Jul 18, 2017
8aab632
Merge branch 'questions-view-23' of https://github.com/oSoc17/prisma-…
oxnoctisxo Jul 18, 2017
92747a7
Multiple fixes + choosing image from lib
oxnoctisxo Jul 18, 2017
d369b8b
Commit for selecting images
oxnoctisxo Jul 18, 2017
f0fc9da
Forced fix
oxnoctisxo Jul 18, 2017
2fce659
Multiple fixes for the new story page
oxnoctisxo Jul 18, 2017
1a5b066
App compiles to an apk
oxnoctisxo Jul 18, 2017
82fba5b
Many fixes + addition of an alert system
oxnoctisxo Jul 18, 2017
e2c4f05
Ionic config removed from index
th0rgall Jul 19, 2017
775bfc0
Merge branch 'questions-view-23' of https://github.com/oSoc17/prisma-…
th0rgall Jul 19, 2017
48bcc6a
Fixed albums bug
oxnoctisxo Jul 19, 2017
4bb2072
Merge branch 'questions-view-23' of https://github.com/oSoc17/prisma-…
oxnoctisxo Jul 19, 2017
5ffbba5
Added BackEnd connection and a testing place
oxnoctisxo Jul 19, 2017
c7ebf5f
Npm install fixed
oxnoctisxo Jul 19, 2017
051d4ef
Camera promise fix
th0rgall Jul 19, 2017
2e6acb9
erge branch 'questions-view-23' of https://github.com/oSoc17/prisma-f…
th0rgall Jul 19, 2017
fb080b1
Changeg orientation
th0rgall Jul 19, 2017
088ac7b
Back-end linking halfdone
oxnoctisxo Jul 19, 2017
046ec4b
Merge branch 'questions-view-23' of https://github.com/oSoc17/prisma-…
oxnoctisxo Jul 19, 2017
b5e68e5
More camera & file choose fixes
th0rgall Jul 19, 2017
9b982f5
Merge branch 'questions-view-23' of https://github.com/oSoc17/prisma-…
th0rgall Jul 19, 2017
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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,3 +35,4 @@ Thumbs.db
UserInterfaceState.xcuserstate
ionic.config.json
src/assets/img/heritage/
ionic.config.json
15 changes: 9 additions & 6 deletions config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,11 +77,14 @@
<splash height="960" src="resources/ios/splash/Default@2x~iphone.png" width="640" />
<splash height="480" src="resources/ios/splash/Default~iphone.png" width="320" />
</platform>
<plugin name="ionic-plugin-keyboard" spec="~2.2.1" />
<plugin name="cordova-plugin-whitelist" spec="1.3.1" />
<plugin name="cordova-plugin-console" spec="1.0.5" />
<plugin name="cordova-plugin-statusbar" spec="2.2.2" />
<plugin name="cordova-plugin-device" spec="1.1.4" />
<plugin name="cordova-plugin-splashscreen" spec="~4.0.1" />
<engine name="android" spec="^6.2.3" />
<plugin name="cordova-plugin-camera" spec="^2.4.1" />
<plugin name="cordova-plugin-console" spec="^1.0.7" />
<plugin name="cordova-plugin-device" spec="^1.1.6" />
<plugin name="cordova-plugin-filechooser" spec="^1.0.1" />
<plugin name="cordova-plugin-splashscreen" spec="^4.0.3" />
<plugin name="cordova-plugin-statusbar" spec="^2.2.3" />
<plugin name="cordova-plugin-whitelist" spec="^1.3.2" />
<plugin name="ionic-plugin-keyboard" spec="^2.2.1" />
<plugin name="cordova-plugin-camera" spec="^2.4.1" />
</widget>
5 changes: 0 additions & 5 deletions ionic.config.json
View file
Open in desktop

This file was deleted.

249 changes: 249 additions & 0 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading