Skip to content

Commit a866de5

Browse files
committed
Merge branch 'reduce_logs' of https://github.com/cesine/FieldDBWebServer into reduce_logs
2 parents e8e0111 + 2b76bde commit a866de5

7 files changed

Lines changed: 63486 additions & 57 deletions

File tree

public/ar_minda_es_elene.png

127 KB
Loading

public/ar_vitsi.png

167 KB
Loading

public/components/fielddb/.bower.json

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "fielddb",
3-
"version": "4.4.22",
3+
"version": "5.5.29",
44
"homepage": "http://fielddb.github.io/FieldDB/",
55
"bugs": {
66
"url": "https://github.com/FieldDB/FieldDB/issues"
@@ -47,6 +47,7 @@
4747
"map_reduce_learnx",
4848
"map_reduce_lexicon",
4949
"couchapp_minified",
50+
"couchapp_prototype",
5051
"docs",
5152
"install_linux_download_and_set_up_fielddb_servers_for_new_developers_quick_start.sh",
5253
"install_mac_download_and_set_up_fielddb_servers_for_new_developers_quick_start.sh",
@@ -66,13 +67,14 @@
6667
],
6768
"dependencies": {},
6869
"main": "fielddb.js",
69-
"_release": "4.4.22",
70+
"devDependencies": {},
71+
"_release": "5.5.29",
7072
"_resolution": {
7173
"type": "version",
72-
"tag": "v4.4.22",
73-
"commit": "90a11b30f345c1375d4d4bbaefaf52dad1b3f510"
74+
"tag": "v5.5.29",
75+
"commit": "6d248da3ef96a0faa7b64cee550a14a167db6f7b"
7476
},
7577
"_source": "https://github.com/OpenSourceFieldlinguistics/bower-fielddb.git",
76-
"_target": "^4.4.22",
78+
"_target": "^5.5.29",
7779
"_originalSource": "fielddb"
7880
}

public/components/fielddb/README.md

Lines changed: 26 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8,33 +8,42 @@ FieldDB was officially launched in Spanish on August 1st 2012 in Patzun, Guatema
88

99
## Client apps/libraries:
1010

11-
There are quite a few client apps which use FieldDB api/corpora. Each project is designed with a particular user type (student, researcher, lab manager, scripter, power user) and context (field, lab, classroom) in mind. Each project has build/install/use instruction and example code in it's own README.md
11+
There are quite a few client apps which use FieldDB api/corpora. Each project is designed with a particular user type (student, researcher, lab manager, scripter, power user) and context (field, lab, classroom) in mind. Each project has build/install/use instruction and example code in it's own README.md
1212

1313
* The [Prototype](https://github.com/FieldDB/FieldDB/tree/master/backbone_client) This app is where we prototyped all the features needed for collaborative data management of evolving data.<br>
1414
<img src="https://cloud.githubusercontent.com/assets/196199/6283103/08d15ce0-b912-11e4-852c-b4c1d9adb243.png" height="200" />
1515
<img src="https://cloud.githubusercontent.com/assets/196199/6283117/301332ce-b912-11e4-8b7d-99ea1fc83ddf.png" height="200" />
1616
* The [Spreadsheet](https://github.com/FieldDB/FieldDB/tree/master/angular_client/modules/spreadsheet) This is a student project to build an app that can be used with very little training or experience. It is focused on data entry and has only basic search/export/import/customization and can't handle large data sets. It has keybindings like a spreadsheets.
1717
<br>
18-
![screen shot 2015-01-16 at 08 56 53 pm](https://cloud.githubusercontent.com/assets/196199/6282997/7a9048fc-b910-11e4-90f6-709bfa068f1f.png)
18+
19+
<img src="https://cloud.githubusercontent.com/assets/196199/6282997/7a9048fc-b910-11e4-90f6-709bfa068f1f.png" height="200">
20+
1921
* [Dative](https://github.com/jrwdunham/dative) This app is designed for research teams who are going to be searching and cleaning their data, it is the next app to use after you find the Spreadsheet app too limited.
20-
![dative_screenshot](https://raw.githubusercontent.com/jrwdunham/dative/master/dative-screenshot.png)
22+
23+
<img src="https://raw.githubusercontent.com/jrwdunham/dative/master/dative-screenshot.png" height="200">
24+
2125
* The [Psycholinguistics Dashboard](https://github.com/ProjetDeRechercheSurLecriture/DyslexDisorthGame) This app is used to import participant lists and run experiements (games) and view their results.
22-
![screen shot 2014-10-09 at 10 17 51 pm](https://cloud.githubusercontent.com/assets/196199/4587030/b0326662-5023-11e4-91fe-596a4a1aa8d0.png)
26+
27+
<img src="https://cloud.githubusercontent.com/assets/196199/4587030/b0326662-5023-11e4-91fe-596a4a1aa8d0.png" height="200">
28+
2329
* The [Psycholinguistics MontageJS library](https://github.com/ProjetDeRechercheSurLecriture/oprime-montage) This library has functionality for displaying/running and building experiements in the Montage.js framework.
24-
![screen shot 2014-10-03 at 10 13 41 am](https://cloud.githubusercontent.com/assets/196199/4506891/8bad9030-4b07-11e4-9643-7a3e1748e633.png)
30+
31+
<img src="https://cloud.githubusercontent.com/assets/196199/4506891/8bad9030-4b07-11e4-9643-7a3e1748e633.png" height="200">
2532
* The [Activity Feed widget](https://github.com/FieldDB/FieldDB/tree/master/angular_client/modules/activity) This app lets you view the activity feed of a corpus.<br>
33+
2634
<img src="https://cloud.githubusercontent.com/assets/196199/6282469/527dc6b2-b908-11e4-8790-4df19acbd163.png" height="200" />
2735
* The [Learn X app](https://github.com/FieldDB/AndroidLanguageLearningClientForFielddb) This is an Android app which lets you turn your corpus into a collaborative language learning app so that heritage speakers can use field methods to collect stories and analyze them.
28-
![learn_x_tablet](https://f.cloud.github.com/assets/196199/2483261/6c4e6442-b0fe-11e3-93df-e74309100571.png)
36+
37+
<img src="https://f.cloud.github.com/assets/196199/2483261/6c4e6442-b0fe-11e3-93df-e74309100571.png" height="200">
2938
* The Android [Elicitation Session Recorder](https://github.com/FieldDB/AndroidFieldDBElicitationRecorder) This app lets you record video sessions and upload them to the audio server for processing straight from your Android. This was also a student project and has a force closeon Android 4.4.
3039
* The Android [Speech Recognition Trainer App](https://github.com/batumi/AndroidSpeechRecognitionTrainer) This app uses pocketsphinx on Android. It lets native speakers of low resource languages speak training data to their device which is used to build their voice model. Any corpus can be used as training data and as the data grows the user' language model improves and the app can recognize more words. We tested the app on ქართული (Georgian) we had little expectations for the recognition to work or be useable but we have reasonably okay results for SMS messages. This app can also be used for produciton experiments (it presents a visual and text representation which the user should read).<br>
3140
<img src="https://cloud.githubusercontent.com/assets/196199/3277961/25a67bb0-f39d-11e3-8ff2-917b06069261.png" height="200" />
3241
* The [My Dictionary](https://github.com/FieldDB/DictionaryChromeExtension) This is a chrome extension which can be customized for any langauge which has a wiktionary. It is able to look up the word in the wiktionary and display the word's information to you on any website. Useful for browsing Facebook in your heritage language.
33-
![screen shot 2014-07-08 at 3 56 40 pm](https://cloud.githubusercontent.com/assets/196199/6282739/1cb609a0-b90c-11e4-99c1-03a5c4c519e7.png)
42+
<img src="https://cloud.githubusercontent.com/assets/196199/6282739/1cb609a0-b90c-11e4-99c1-03a5c4c519e7.png" height="200">
3443
* The [Lexicon Browser](https://github.com/FieldDB/FieldDBLexicon) This app displays the lexicon of a corpus as a connected graph of morphemes. You can edit the morphemes, and clean the data where the morphemes are used. You can add discussion and linking between morphemes.
35-
![lexicon_browser_dashboard](https://f.cloud.github.com/assets/196199/2366164/8555cb70-a6f3-11e3-93ec-140fcaad2294.png)
44+
<img src="https://f.cloud.github.com/assets/196199/2366164/8555cb70-a6f3-11e3-93ec-140fcaad2294.png" height="200">
3645
* The [Word Cloud Visualizer](https://github.com/FieldDB/FieldDBWordCloudChromeApp) This app uses D3 to display the words in a corpus in a word cloud. You can use this interface to lematize morphemes and play with the data in a frequency oriented way where the most frequent words pop out at the user.
37-
![lexicon_browser2](https://cloud.githubusercontent.com/assets/196199/6282934/6bc5fb10-b90f-11e4-8e4c-8fb9bbf0799f.png)
46+
<img src="https://cloud.githubusercontent.com/assets/196199/6282934/6bc5fb10-b90f-11e4-8e4c-8fb9bbf0799f.png" height="200">
3847
* You can [add others](https://github.com/FieldDB/FieldDB/edit/master/README.md) if there any missing in this list...
3948

4049

@@ -46,14 +55,14 @@ We created two scripts to simplify the process of downloading and building the F
4655
<pre>
4756
$ cd $HOME/Downloads && curl -O --retry 999 --retry-max-time 0 -C - https://raw.githubusercontent.com/FieldDB/FieldDB/master/install_mac_download_and_set_up_fielddb_servers_for_new_developers_quick_start.sh && bash install_mac_download_and_set_up_fielddb_servers_for_new_developers_quick_start.sh
4857
</pre>
49-
* [Linux developer script](https://raw.githubusercontent.com/FieldDB/FieldDB/master/install_linux_download_and_set_up_fielddb_servers_for_new_developers_quick_start.sh)
58+
* [Linux developer script](https://raw.githubusercontent.com/FieldDB/FieldDB/master/install_linux_download_and_set_up_fielddb_servers_for_new_developers_quick_start.sh)
5059
<pre>
5160
$ cd $HOME/Downloads && wget https://raw.githubusercontent.com/FieldDB/FieldDB/master/install_linux_download_and_set_up_fielddb_servers_for_new_developers_quick_start.sh && bash install_linux_download_and_set_up_fielddb_servers_for_new_developers_quick_start.sh
5261
</pre>
5362

5463
## Core webservices:
5564

56-
These are the webservices which the FieldDB clients use, and which make up the complete FieldDB architecture. If you fork the project, you might also be intersted in forking these repositories and adapting them to your needs.
65+
These are the webservices which the FieldDB clients use, and which make up the complete FieldDB architecture. If you fork the project, you might also be intersted in forking these repositories and adapting them to your needs.
5766

5867
* [Authentication webservice](https://github.com/FieldDB/AuthenticationWebService) (for creation of new users and their accounts on the various webservices)
5968
* [FieldDB Webserver](https://github.com/FieldDB/FieldDBWebServer) (for public URLs)
@@ -84,9 +93,9 @@ Advanced way
8493

8594
1. Click on the "Fork" button to create your own copy.
8695
1. Clone the code to your computer
87-
1. You should also try to run the tests `$ npm install` and `$ grunt test` it should say something like `Finished in 10.388 seconds 732 tests, 2308 assertions, 0 failures, 0 skipped`
88-
![screen shot 2015-02-20 at 11 53 50 am](https://cloud.githubusercontent.com/assets/196199/6281625/301ea14c-b8f7-11e4-9682-dfa4a102a722.png)
89-
Then you can also run the entire build `$ grunt travis` to make sure your changes dont affect other parts of the app. If any of these parts errors, ask us for help in the [issue tracker](https://github.com/FieldDB/FieldDB/issues).
96+
1. You should also try to run the tests `$ npm install` and `$ grunt test` it should say something like `Finished in 10.388 seconds 732 tests, 2308 assertions, 0 failures, 0 skipped`
97+
![screen shot 2015-02-20 at 11 53 50 am](https://cloud.githubusercontent.com/assets/196199/6281625/301ea14c-b8f7-11e4-9682-dfa4a102a722.png)
98+
Then you can also run the entire build `$ grunt travis` to make sure your changes dont affect other parts of the app. If any of these parts errors, ask us for help in the [issue tracker](https://github.com/FieldDB/FieldDB/issues).
9099
1. Create a new branch for new fixes or features, this is easier to build a fix/feature specific pull request than if you work in your `master` branch directly.
91100
1. Run `grunt watch` which will run the tests as you make changes.
92101
1. Add failing tests for the change you want to make. Run `grunt test` to see the tests fail.
@@ -114,11 +123,11 @@ s
114123

115124
# Funding
116125

117-
We would like to thank SSHRC Connection Grant (\#611-2012-0001) and SSHRC Standard Research Grant (\#410-2011-2401) which advocates open-source approaches to knowledge mobilization and partially funded the students who have doubled as fieldwork research assistants and interns on the project. We would like to thank numerous other granting agencies which have funded the RAs and TAs who have also contributed to the project as interns. If you have a student/RA who you would like to customize the project for your needs, contact us at support @ lingsync . org
126+
We would like to thank SSHRC Connection Grant (\#611-2012-0001) and SSHRC Standard Research Grant (\#410-2011-2401) which advocates open-source approaches to knowledge mobilization and partially funded the students who have doubled as fieldwork research assistants and interns on the project. We would like to thank numerous other granting agencies which have funded the RAs and TAs who have also contributed to the project as interns. If you have a student/RA who you would like to customize the project for your needs, contact us at support @ lingsync . org
118127

119-
# License
128+
# License
120129

121-
This project is released under the [Apache 2.0](http://www.apache.org/licenses/LICENSE-2.0.html) license, which is an very non-restrictive open source license which basically says you can adapt the code to any use you see fit.
130+
This project is released under the [Apache 2.0](http://www.apache.org/licenses/LICENSE-2.0.html) license, which is an very non-restrictive open source license which basically says you can adapt the code to any use you see fit.
122131

123132
[npm-url]: https://npmjs.org/package/fielddb
124133
[npm-image]: https://badge.fury.io/js/fielddb.svg

public/components/fielddb/bower.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "fielddb",
3-
"version": "4.4.22",
3+
"version": "5.5.29",
44
"homepage": "http://fielddb.github.io/FieldDB/",
55
"bugs": {
66
"url": "https://github.com/FieldDB/FieldDB/issues"
@@ -47,6 +47,7 @@
4747
"map_reduce_learnx",
4848
"map_reduce_lexicon",
4949
"couchapp_minified",
50+
"couchapp_prototype",
5051
"docs",
5152
"install_linux_download_and_set_up_fielddb_servers_for_new_developers_quick_start.sh",
5253
"install_mac_download_and_set_up_fielddb_servers_for_new_developers_quick_start.sh",
@@ -65,5 +66,6 @@
6566
"tests"
6667
],
6768
"dependencies": {},
68-
"main": "fielddb.js"
69+
"main": "fielddb.js",
70+
"devDependencies": {}
6971
}

public/components/fielddb/fielddb.js

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)