Commit graph

38 commits

Author SHA1 Message Date
cek
7790bd9b0b Merge remote-tracking branch 'origin/master' 2015-11-25 12:56:14 +01:00
cek
a3e01a883b rimosso totalmnete dal javascript la parte di upload (passata dentro il prgetto arkiwiupladapi) e aggiunti i metodi per avere RSS e jsonML (H MERDA!) 2015-11-25 12:51:48 +01:00
cri
f47df2afef thumbnail sopra video con fadeoff 2015-09-13 02:43:16 +02:00
cri
8b6b5e2765 thumbnail sopra video con fadeoff 2015-09-13 02:43:10 +02:00
cek
70348f56c3 vaffa 2015-09-13 02:15:40 +02:00
cri
9d9df3c449 Merge branch 'master' of lattuga.net:kiki/arkiwi_boilerplate 2015-09-13 02:07:28 +02:00
cri
9127a80065 template divide dir audio video 2015-09-13 02:06:29 +02:00
cek
a05bd7ced0 Separata la classe arkiwi in assetStore e Aggregator 2015-09-13 01:28:29 +02:00
cek
4e662731d5 Merge remote-tracking branch 'origin/master' 2015-09-13 01:12:21 +02:00
cri
b93523d9a5 add data-type 2015-09-13 01:07:30 +02:00
cri
cdd999114c viz da search 2015-09-13 01:03:33 +02:00
cek
0f7c4de112 blah 2015-09-13 00:41:33 +02:00
cri
a40ac5ca4c wdg list item id works 2015-09-13 00:21:01 +02:00
cri
2b5f0e063b widg explain 2015-09-12 22:32:15 +02:00
cri
fb9a51ca1a add template of mustache for wdg 2015-09-12 22:31:17 +02:00
cri
1b09675301 add js for the widg 2015-09-12 22:29:38 +02:00
cri
2f16eddcd8 new html page for the widgets 2015-09-12 22:28:42 +02:00
cri
e08466526b scritta html 2015-09-12 21:27:53 +02:00
cri
350600b1b9 change direcory to occupy mordor 2015-09-12 20:37:43 +02:00
cek
f76829f2f5 sistemato 2015-09-12 20:32:35 +02:00
cek
c79b67144a Merge remote-tracking branch 'origin/master'
Conflicts:
	app/scripts/arkiwi.js
	app/scripts/main.js
2015-09-12 20:18:43 +02:00
cek
0b813f899f commit 2015-09-12 20:15:55 +02:00
cri
f6e082a268 modifiche stile e cambio cartella letta da arkiwi 2015-09-12 20:14:53 +02:00
cri
1a4b53d3a8 Mergssario
-tracking branch 'refs/remotes/origin/master'
2015-09-12 19:56:32 +02:00
cri
a6d8641bea style di iframe 2015-09-12 19:56:14 +02:00
cek
66eb61e305 Merge remote-tracking branch 'origin/master'
Conflicts:
	app/scripts/arkiwi.js
2015-09-12 19:53:34 +02:00
cek
faf51595fe Modificato il costruttore di Arkiwi differenziando aggregator e assetStore 2015-09-12 19:50:15 +02:00
cri
f0e6df0f11 aggiunto appunti2 2015-09-12 19:48:16 +02:00
cri
310ac6c869 aggiunto appunti 2015-09-12 19:46:53 +02:00
cri
8db90782b1 aggiunti css bootstrap 2015-09-12 18:39:51 +02:00
cri
fc0c1d0298 sincro file con quelle caricate sul server 2015-09-12 18:35:18 +02:00
cri
6f1f9695de aggiunta ignore all tilde 2015-09-12 18:32:58 +02:00
cri
7693a3d3eb aggiunta var diopporco 2015-09-12 18:27:49 +02:00
cek
df6ec1d2ba Aggiunto bootstrap tra le dipendenze 2015-09-12 18:23:06 +02:00
cek
859c2f1c53 Aggiunto .gitignore 2015-09-12 17:55:43 +02:00
cek
f42af2bb6d aggiunto il modulo 'time-grunt' necessario al task 'serve' 2015-08-17 16:06:34 +02:00
cri
82e8e83c03 app abbozzata 2015-08-11 16:48:05 +02:00
7bc390aa4f Init commit 2015-08-11 10:40:19 -04:00