|
|
2f3c1703e3
|
Added wsdl folder
|
2013-05-15 11:41:19 +02:00 |
|
Helena Rodriguez
|
ef6cdcb596
|
Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
SWADroid/src/es/ugr/swad/swadroid/model/DataBaseHelper.java
|
2012-10-13 14:34:43 +02:00 |
|
Helena Rodriguez
|
38e345aff1
|
Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
.gitignore
SWADroid/AndroidManifest.xml
SWADroid/project.properties
SWADroid/res/layout/list_items.xml
SWADroid/res/values-es/strings.xml
SWADroid/res/values/strings.xml
SWADroid/res/xml/tables.xml
SWADroid/src/es/ugr/swad/swadroid/Global.java
SWADroid/src/es/ugr/swad/swadroid/SWADMain.java
SWADroid/src/es/ugr/swad/swadroid/model/Course.java
SWADroid/src/es/ugr/swad/swadroid/model/DataBaseHelper.java
SWADroid/src/es/ugr/swad/swadroid/model/Group.java
SWADroid/src/es/ugr/swad/swadroid/modules/Groups.java
SWADroid/src/es/ugr/swad/swadroid/modules/attendance/Attendance.java
|
2012-10-02 20:26:36 +02:00 |
|
|
|
a4d5f11aa4
|
Merged aguilerin/master branch
|
2012-06-27 01:34:03 +02:00 |
|
Antonio Aguilera
|
a350c08256
|
Finished rollcall module
|
2012-06-25 12:31:36 +02:00 |
|
Helena Rodriguez
|
6d86cf18b6
|
Merge branch 'develop' of https://hrguez@github.com/Amab/SWADroid.git
into develop
Conflicts:
SWADroid/gen/es/ugr/swad/swadroid/R.java
|
2012-05-21 12:59:14 +02:00 |
|
|
|
8457e582b4
|
Fixed merge conflicts
|
2012-04-27 22:50:49 +02:00 |
|
Antonio Aguilera
|
8727a61f52
|
Integrated ZXing into SWADroid project
Signed-off-by: Antonio Aguilera <aguilerin@gmail.com>
|
2012-04-18 13:22:10 +02:00 |
|
Helena Rodriguez
|
f9d91caadd
|
Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
SWADroid/gen/es/ugr/swad/swadroid/R.java
|
2012-04-07 11:21:41 +02:00 |
|
|
|
d3271ec05e
|
Added APK to repository
|
2012-01-29 09:54:08 +01:00 |
|
|
|
edebd5d2f4
|
Added new stuff
git-svn-id: https://forja.rediris.es/svn/cusl6-swadroid/trunk@202 5bc14d19-1e4b-4ba2-aa50-860af135f48c
|
2011-11-22 22:27:47 +00:00 |
|
|
|
ba073bf870
|
Bumped version
git-svn-id: https://forja.rediris.es/svn/cusl6-swadroid/trunk@115 5bc14d19-1e4b-4ba2-aa50-860af135f48c
|
2011-11-22 22:09:41 +00:00 |
|
|
|
1747a94e8a
|
Added missing directories
git-svn-id: https://forja.rediris.es/svn/cusl6-swadroid/trunk@65 5bc14d19-1e4b-4ba2-aa50-860af135f48c
|
2011-11-22 22:05:06 +00:00 |
|
|
|
40cca8eb3d
|
Removed SWADroidTest
git-svn-id: https://forja.rediris.es/svn/cusl6-swadroid/trunk@63 5bc14d19-1e4b-4ba2-aa50-860af135f48c
|
2011-11-22 22:04:42 +00:00 |
|
|
|
db24839935
|
Added SWADroidTest project
git-svn-id: https://forja.rediris.es/svn/cusl6-swadroid/trunk@60 5bc14d19-1e4b-4ba2-aa50-860af135f48c
|
2011-11-22 22:04:25 +00:00 |
|
|
|
a6114d1dd8
|
Removed assets directory
git-svn-id: https://forja.rediris.es/svn/cusl6-swadroid/trunk@29 5bc14d19-1e4b-4ba2-aa50-860af135f48c
|
2011-11-22 22:01:35 +00:00 |
|
|
|
1751f4c55f
|
Removed unused stuff
git-svn-id: https://forja.rediris.es/svn/cusl6-swadroid/trunk@25 5bc14d19-1e4b-4ba2-aa50-860af135f48c
|
2011-11-22 22:01:16 +00:00 |
|
|
|
249d7b350a
|
Added forgotten directory gen. Updated .gitignore
git-svn-id: https://forja.rediris.es/svn/cusl6-swadroid/trunk@11 5bc14d19-1e4b-4ba2-aa50-860af135f48c
|
2011-11-22 22:00:19 +00:00 |
|
|
|
10eb075e15
|
Switched IDE from Netbeans to Eclipse. Updated .gitignore
git-svn-id: https://forja.rediris.es/svn/cusl6-swadroid/trunk@10 5bc14d19-1e4b-4ba2-aa50-860af135f48c
|
2011-11-22 22:00:13 +00:00 |
|
|
|
953a07ded0
|
Added .gitignore file
git-svn-id: https://forja.rediris.es/svn/cusl6-swadroid/trunk@9 5bc14d19-1e4b-4ba2-aa50-860af135f48c
|
2011-11-22 22:00:06 +00:00 |
|
