Compare commits

..

No commits in common. "master" and "V1.8" have entirely different histories.
master ... V1.8

6 changed files with 28 additions and 124 deletions

View File

@ -1,113 +1,29 @@
<component name="ProjectCodeStyleConfiguration"> <component name="ProjectCodeStyleConfiguration">
<code_scheme name="Project" version="173"> <code_scheme name="Project" version="173">
<codeStyleSettings language="XML"> <Objective-C-extensions>
<arrangement> <file>
<rules> <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Import" />
<section> <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Macro" />
<rule> <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Typedef" />
<match> <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Enum" />
<AND> <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Constant" />
<NAME>xmlns:android</NAME> <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Global" />
<XML_ATTRIBUTE /> <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Struct" />
<XML_NAMESPACE>^$</XML_NAMESPACE> <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="FunctionPredecl" />
</AND> <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Function" />
</match> </file>
</rule> <class>
</section> <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Property" />
<section> <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Synthesize" />
<rule> <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InitMethod" />
<match> <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="StaticMethod" />
<AND> <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InstanceMethod" />
<NAME>xmlns:.*</NAME> <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="DeallocMethod" />
<XML_ATTRIBUTE /> </class>
<XML_NAMESPACE>^$</XML_NAMESPACE> <extensions>
</AND> <pair source="cpp" header="h" fileNamingConvention="NONE" />
</match> <pair source="c" header="h" fileNamingConvention="NONE" />
<order>BY_NAME</order> </extensions>
</rule> </Objective-C-extensions>
</section>
<section>
<rule>
<match>
<AND>
<NAME>.*:id</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
</AND>
</match>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>.*:name</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
</AND>
</match>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>name</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>^$</XML_NAMESPACE>
</AND>
</match>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>style</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>^$</XML_NAMESPACE>
</AND>
</match>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>.*</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>^$</XML_NAMESPACE>
</AND>
</match>
<order>BY_NAME</order>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>.*</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
</AND>
</match>
<order>ANDROID_ATTRIBUTE_ORDER</order>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>.*</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>.*</XML_NAMESPACE>
</AND>
</match>
<order>BY_NAME</order>
</rule>
</section>
</rules>
</arrangement>
</codeStyleSettings>
</code_scheme> </code_scheme>
</component> </component>

View File

@ -1,8 +1,5 @@
CHANGELOG CHANGELOG
V1.8:
* Separate video call system from the rest of the application
V 1.7: V 1.7:
* Fix an issue that prevented to create post on user pages * Fix an issue that prevented to create post on user pages
* Cached conversations are accessible even if not connected to the internet * Cached conversations are accessible even if not connected to the internet

2
app/.gitignore vendored
View File

@ -1,4 +1,2 @@
/build /build
/release /release
/normal
/videoCalls

View File

@ -12,8 +12,8 @@ android {
applicationId "org.communiquons.android.comunic.client" applicationId "org.communiquons.android.comunic.client"
minSdkVersion 21 minSdkVersion 21
targetSdkVersion 28 targetSdkVersion 28
versionCode 10 versionCode 9
versionName "1.9" versionName "1.8"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
} }
buildTypes { buildTypes {

View File

@ -1,7 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.communiquons.android.comunic.client">
<application android:usesCleartextTraffic="true" />
</manifest>

View File

@ -335,7 +335,7 @@
<string name="action_hang_up">Raccrocher</string> <string name="action_hang_up">Raccrocher</string>
<string name="action_switch_camera">Changer de caméra</string> <string name="action_switch_camera">Changer de caméra</string>
<string name="action_stop_camera">Arrêter la caméra</string> <string name="action_stop_camera">Arrêter la caméra</string>
<string name="action_save_image_in_gallery">Enregistrer dans la galerie</string> <string name="action_save_image_in_gallery">Enregistrer dans la gallerie</string>
<string name="err_save_image_in_gallery">Une erreur a survenue lors de l\'enregistrement de l\'image dans la gallerie !</string> <string name="err_save_image_in_gallery">Une erreur a survenue lors de l\'enregistrement de l\'image dans la gallerie !</string>
<string name="success_save_image_in_gallery">L\'image a bien été enregistrée dans la gallerie !</string> <string name="success_save_image_in_gallery">L\'image a bien été enregistrée dans la gallerie !</string>
<string name="err_missing_call_config">Configuration des appels vidéos manquante !</string> <string name="err_missing_call_config">Configuration des appels vidéos manquante !</string>