diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 092d8e9..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,11 +0,0 @@
-.gitignore
-.vscode/
-ficheros/.vscode
-UMDC/.vscode/
-*~
-pong/.vscode/settings.json
-pong/Pipfile.lock
-pong/Pipfile
-
-ficheros/de_csv_a_md/docs/hoja01.md
-ficheros/de_csv_a_md/site/
diff --git a/.nojekyll b/.nojekyll
new file mode 100644
index 0000000..e69de29
diff --git a/ficheros/de_csv_a_md/site/404.html b/404.html
similarity index 100%
rename from ficheros/de_csv_a_md/site/404.html
rename to 404.html
diff --git a/README.md b/README.md
deleted file mode 100644
index 236df60..0000000
--- a/README.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# Ejercicios Python
-
-## UMDC Un mundo de Código
-### [UMDC 01](https://github.com/mentecatoDev/python/tree/master/UMDC/01)
-### [UMDC 02](https://github.com/mentecatoDev/python/tree/master/UMDC/03)
-### [UMDC 03](https://github.com/mentecatoDev/python/tree/master/UMDC/03)
-
-## [Cadenas](https://github.com/mentecatoDev/python/tree/master/Cadenas)
-## [Ficheros](https://github.com/mentecatoDev/python/tree/master/Ficheros)
-## [Listas](https://github.com/mentecatoDev/python/tree/master/Listas)
-## [Diccionarios](https://github.com/mentecatoDev/python/tree/master/Diccionarios)
\ No newline at end of file
diff --git a/UMDC/01/01a.py b/UMDC/01/01a.py
deleted file mode 100644
index a0037d4..0000000
--- a/UMDC/01/01a.py
+++ /dev/null
@@ -1,27 +0,0 @@
-"""
-Ejercicio 01a.
-
-a) Escribir un ciclo definido para imprimir por pantalla todos los números
-entre 10 y 20.
-
->>> for number in range(10,21):
-... print(number)
-10
-11
-12
-13
-14
-15
-16
-17
-18
-19
-20
-"""
-import doctest
-
-for n in range(10, 21):
- print(n)
-
-
-doctest.testmod()
diff --git a/UMDC/01/01b.py b/UMDC/01/01b.py
deleted file mode 100644
index 2123613..0000000
--- a/UMDC/01/01b.py
+++ /dev/null
@@ -1,22 +0,0 @@
-"""
-Ejercicio 01b
-
-b) Escribir un ciclo definido que salude por pantalla a sus cinco mejores
-amigos/as.
-
->>> for amigo in ["Luis", "José Antonio", "Miguel", "Paco", "Jaime"]:
-... print("Hola", amigo)
-Hola Luis
-Hola José Antonio
-Hola Miguel
-Hola Paco
-Hola Jaime
-
-"""
-
-for amigo in ["Luis", "José Antonio", "Miguel", "Paco", "Jaime"]:
- print("Hola", amigo)
-
-import doctest
-
-doctest.testmod()
diff --git a/UMDC/01/01c.py b/UMDC/01/01c.py
deleted file mode 100644
index f96d497..0000000
--- a/UMDC/01/01c.py
+++ /dev/null
@@ -1,11 +0,0 @@
-"""
-Ejercicio 01c
-
-c) Escribir un programa que use un ciclo definido con rango numérico, que
-pregunte los nombres de sus cinco mejores amigos/as, y los salude.
-"""
-
-
-for n in range(5):
- nombre = input("Introduce tu amigo: ")
- print("Hola", nombre)
diff --git a/UMDC/01/01d.py b/UMDC/01/01d.py
deleted file mode 100644
index e94d66a..0000000
--- a/UMDC/01/01d.py
+++ /dev/null
@@ -1,20 +0,0 @@
-"""
-Ejercicio 01d
-
-d) Escribir un programa que use un ciclo definido con rango numérico, que
-averigüe a cuántos amigos quieren saludar, les pregunte los nombres de esos
-amigos/as, y los salude.
-"""
-
-leyendo = True
-while leyendo:
- numero_amigos = input("Introduce cuántos amigos tienes: ")
- try:
- numero_amigos = int(numero_amigos)
- leyendo = False
- except ValueError:
- print(numero_amigos, "no es un número, prueba de nuevo")
-
-for n in range(numero_amigos):
- nombre = input("Introduce tu amigo: ")
- print("Hola", nombre)
diff --git a/UMDC/01/02.py b/UMDC/01/02.py
deleted file mode 100644
index 3e38304..0000000
--- a/UMDC/01/02.py
+++ /dev/null
@@ -1,30 +0,0 @@
-"""
-Ejercicio 02
-
-Escribir un programa que le pregunte al usuario una cantidad de euros, una
-tasa de interés y un número de años y muestre como resultado el monto final a
-obtener. La fórmula a utilizar es (interés compuesto):
-
-Cf = Ci * (1 + i/100) ^ n
-
-Donde Ci es el capital inicial, i es la tasa de interés y n es el número de
-años a calcular.
-"""
-
-
-def interes_compuesto(ci, x, n):
- return ci * (1 + x / 100) ** n
-
-
-leyendo = True
-while leyendo:
- try:
- capital_inicial = float(input("Introduce el capital inicial: "))
- anios = float(input("Introduce los años : "))
- interes = float(input("Introduce el interés (%): "))
- leyendo = False
- except ValueError:
- print("Error en la introducción de datos\n")
-
-print("Total a pagar: ", interes_compuesto(
- capital_inicial, interes, anios), "euros")
diff --git a/UMDC/01/03.py b/UMDC/01/03.py
deleted file mode 100644
index adbb72a..0000000
--- a/UMDC/01/03.py
+++ /dev/null
@@ -1,22 +0,0 @@
-"""
-Ejercicio 03
-Escribir un programa que convierta un valor dado en grados Fahrenheit a grados
-Celsius. Recordar que la fórmula para la conversión es: F = 9/5 * C + 32.
-"""
-
-
-def fahrenheit_celsius(f):
- return (f - 32)*5/9
-
-
-leyendo = True
-while leyendo:
- try:
- faren = float(input("Introduzca temperatura en grados Fahrenheit: "))
- leyendo = False
- except ValueError:
- print("Introduzca un valor numérico\n")
-
-
-print("La temperatura equivalente en grados Celsius es :",
- fahrenheit_celsius(faren))
diff --git a/UMDC/01/04.py b/UMDC/01/04.py
deleted file mode 100644
index 8d25287..0000000
--- a/UMDC/01/04.py
+++ /dev/null
@@ -1,16 +0,0 @@
-"""
-Ejercicio 04
-
-Utilice el programa anterior para generar una tabla de conversión de
-temperaturas, desde 0º F hasta 120º F, de 10 en 10.
-"""
-
-
-def fahrenheit_celsius(f):
- return (f - 32)*5/9
-
-
-print("Grados Fahrenheit Grados Celsius")
-print("================= ==============")
-for f in range(0, 121, 10):
- print(" ", f, " ", fahrenheit_celsius(f))
diff --git a/UMDC/01/05.py b/UMDC/01/05.py
deleted file mode 100644
index 59af113..0000000
--- a/UMDC/01/05.py
+++ /dev/null
@@ -1,20 +0,0 @@
-"""
-Ejercicio 05
-
-Escribir un programa que imprima todos los números pares entre dos números que
-se le pidan al usuario
-"""
-
-leyendo = True
-while leyendo:
- try:
- inicial = int(input("Introduzca valor inicial: "))
- final = int(input("Introduzca valor final : "))
- leyendo = False
- except ValueError:
- print("Introduzca solo valores numéricos enteros\n")
-
-# Asegura que se comienza con un número par
-inicial += inicial % 2
-for i in range(inicial, final+1, 2):
- print(i)
diff --git a/UMDC/01/06.py b/UMDC/01/06.py
deleted file mode 100644
index 24ca494..0000000
--- a/UMDC/01/06.py
+++ /dev/null
@@ -1,51 +0,0 @@
-"""
-Ejercicio 06
-
-Escribir un programa que reciba un número n por parámetro e imprima los
-primeros números triangulares, junto con su índice.
-Los números triangulares se obtienen mediante la suma de los números naturales
-desde 1 hasta n. Es decir, si se piden los primeros 5 números triangulares, el
-programa debe imprimir:
-
-1 - 1
-2 - 3
-3 - 6
-4 - 10
-5 - 15
-
-Nota: hacerlo usando y sin usar la ecuación n * (n + 1) / 2. ¿Cuál realiza más
-operaciones? (Respuesta: triangularIterativo con diferencia)
-"""
-
-
-def triangular_iterativo(n):
- triangular = 0
- for i in range(1, n+1):
- triangular += i
- return triangular
-
-
-def triangular_calculado(n):
- return int(n * (n+1)/2)
-
-
-leyendo = True
-while leyendo:
- try:
- n = int(input("Introduzca número de triangulares a calcular: "))
- leyendo = False
- except ValueError:
- print("Introduzca solo valores numéricos enteros\n")
-
-for i in range(1, n+1):
- # print (i," - ",triangularIterativo(i))
- triangular_iterativo(i)
-
-
-print("Ya")
-
-for i in range(1, n+1):
- #print(i, " - ", triangular_calculado(i))
- triangular_calculado(i)
-
-print("Otro ya")
diff --git a/UMDC/01/07.py b/UMDC/01/07.py
deleted file mode 100644
index 3363047..0000000
--- a/UMDC/01/07.py
+++ /dev/null
@@ -1,28 +0,0 @@
-"""
-Ejercicio 07
-
-Escribir un programa que tome una cantidad "m" de valores ingresados por el
-usuario, a cada uno le calcule el factorial e imprima el resultado junto con
-el número de orden correspondiente.
-"""
-
-leyendo = True
-while leyendo:
- try:
- m = int(input("Introduzca número factoriales a calcular: "))
- leyendo = False
- except ValueError:
- print("Introduzca solo valores numéricos enteros\n")
-
-for i in range(1, m+1):
- leyendo = True
- while leyendo:
- try:
- n = int(input("Introduzca un número para calcular su factorial: "))
- leyendo = False
- except ValueError:
- print("Introduzca solo valores numéricos enteros\n")
- factorial = 1
- for j in range(2, n+1):
- factorial *= j
- print(i, n, factorial)
diff --git a/UMDC/01/08.py b/UMDC/01/08.py
deleted file mode 100644
index fd60137..0000000
--- a/UMDC/01/08.py
+++ /dev/null
@@ -1,10 +0,0 @@
-"""
-Ejercicio 08
-
-Escribir un programa que imprima por pantalla todas las fichas de dominó, una
-por línea y sin repetir.
-"""
-
-for i in range(7):
- for j in range(i, 7):
- print(i, j)
diff --git a/UMDC/01/09.py b/UMDC/01/09.py
deleted file mode 100644
index 84621e2..0000000
--- a/UMDC/01/09.py
+++ /dev/null
@@ -1,16 +0,0 @@
-"""
-Ejercicio 09
-Modificar el programa anterior para que pueda generar fichas de un juego que
-puede tener números de 0 a n.
-"""
-
-leyendo = True
-while leyendo:
- try:
- n = int(input("Introduzca número máximo del dominó: "))
- leyendo = False
- except ValueError:
- print("Introduzca solo valores numéricos enteros\n")
-for i in range(n+1):
- for j in range(i, n+1):
- print(i, j)
diff --git a/UMDC/01/umdc01.md b/UMDC/01/umdc01.md
deleted file mode 100644
index c0497db..0000000
--- a/UMDC/01/umdc01.md
+++ /dev/null
@@ -1,47 +0,0 @@
-## Un mundo de código 01
-
-
-
-**Ejercicio 01.01.** Ciclos definidos
-
-a) Escribir un ciclo definido para imprimir por pantalla todos los números entre 10 y 20.
-
-b) Escribir un ciclo definido que salude por pantalla a sus cinco mejores amigos/as.
-
-c) Escribir un programa que use un ciclo definido con rango numérico, que pregunte los nombres de sus cinco mejores amigos/as, y los salude.
-
-d) Escribir un programa que use un ciclo definido con rango numérico, que pregunte los nombres de sus seis mejores amigos/as, y los salude.
-
-e) Escribir un programa que use un ciclo definido con rango numérico, que averigue a cuántos amigos quieren saludar, les pregunte los nombres de esos amigos/as, y los salude.
-
-**Ejercicio 01.02.** Escribir un programa que le pregunte al usuario una cantidad de pesos, una tasa de interés y un número de años y muestre como resultado el monto final a obtener. La fórmula a utilizar es:
-
-```
-Cn = C * (1 + x/100) ^ n
-```
-
-Donde `C` es el capital inicial, `x` es la tasa de interés y `n` es el número de años a calcular.
-
-**Ejercicio 01.03.** Escribir un programa que convierta un valor dado en grados Fahrenheit a grados Celsius. Recordar que la fórmula para la conversión es: `F = 9/5 * C + 32`.
-
-**Ejercicio 01.04.** Utilice el programa anterior para generar una tabla de conversión de temperaturas, desde `0º F` hasta `120º F`, de `10` en `10`.
-
-**Ejercicio 01.05.** Escribir un programa que imprima todos los números pares entre dos números que se le pidan al usuario.
-
-**Ejercicio 01.06.** Escribir un programa que reciba un número `n` por parámetro e imprima los primeros `n`números triangulares, junto con su índice. Los números triangulares se obtienen mediante la suma de los números naturales desde 1 hasta `n`. Es decir, si se piden los primeros `5` números triangulares, el programa debe imprimir:
-
-```
-1 - 1
-2 - 3
-3 - 6
-4 - 10
-5 - 15
-```
-
-**Nota**: hacerlo usando y sin usar la ecuación `n ∗ (n + 1) / 2`. ¿Cuál realiza más operaciones?
-
-**Ejercicio 01.07.** Escribir un programa que tome una cantidad `m` de valores ingresados por el usuario, a cada uno le calcule el factorial e imprima el resultado junto con el número de orden correspondiente.
-
-**Ejercicio 01.08.** Escribir un programa que imprima por pantalla todas las fichas de dominó, de una por línea y sin repetir.
-
-**Ejercicio 01.09.** Modificar el programa anterior para que pueda generar fichas de un juego que puede tener números de `0` a `n`.
\ No newline at end of file
diff --git a/UMDC/02/01.py b/UMDC/02/01.py
deleted file mode 100644
index 1825339..0000000
--- a/UMDC/02/01.py
+++ /dev/null
@@ -1,39 +0,0 @@
-"""
-Ejercicio 01
-
-Escribir dos funciones que permitan calcular:
- La cantidad de segundos en un tiempo dado en horas, minutos y segundos.
- La cantidad de horas, minutos y segundos de un tiempo dado en segundos.
-
->>> hms_seg(10, 32, 14)
-37934
-
->>> hms_seg(0, 0, 0)
-1
-
->>> seg_hms(37934)
-(10, 32, 14)
-
->>> sum(2,3)
-6
-
-"""
-
-def sum(a, b):
- return a + b
-
-
-def hms_seg(h, m, s):
- return ((h*60)+m)*60+s
-
-
-def seg_hms(s):
- horas = s//3600
- s = s % 3600
- minutos = s//60
- segundos = s % 60
- return (horas, minutos, segundos)
-
-if __name__ == '__main__':
- import doctest
- doctest.testmod()
\ No newline at end of file
diff --git a/UMDC/02/02.py b/UMDC/02/02.py
deleted file mode 100644
index 57c4b9a..0000000
--- a/UMDC/02/02.py
+++ /dev/null
@@ -1,29 +0,0 @@
-"""
-Ejercicio 02
-
-Usando las funciones del ejercicio anterior, escribir un programa que lea de
-teclado dos tiempos expresados en horas, minutos y segundos; las sume y
-muestre el resultado en horas, minutos y segundos por pantalla.
-"""
-
-from "01.py" import seg_hms, hms_seg
-
-
-
-leyendo = True
-while leyendo:
- try:
- h1 = int(input("Introduce horas 1: "))
- m1 = int(input("Introduce minutos 1: "))
- s1 = int(input("Introduce segundos 1: "))
- h2 = int(input("Introduce horas 2: "))
- m2 = int(input("Introduce minutos 2: "))
- s2 = int(input("Introduce segundos 2: "))
- leyendo = False
-
- except ValueError:
- print("Error en la introducción de datos\n")
-
-(h, m, s) = seg_hms(hms_seg(h1, m1, s1) + hms_seg(h2, m2, s2))
-
-print("La suma es:", h, "horas", m, "minutos y", s, "segundos")
diff --git a/UMDC/02/03.py b/UMDC/02/03.py
deleted file mode 100644
index de53d7a..0000000
--- a/UMDC/02/03.py
+++ /dev/null
@@ -1,41 +0,0 @@
-"""
-Ejercicio 03
-
-Escribir una función que dados cuatro números, devuelva el mayor producto de
-dos de ellos. Por ejemplo, si recibe los números 1, 5, -2, -4 debe devolver 8,
-que es el producto más grande que se puede obtener entre ellos.
-
->>> mayor_producto(1, 5, -2, -4)
-8
-
->>> mayor_producto(-4, -3, -2, -5)
-20
-
->>> mayor_producto(4, -3, -2, -5)
-15
-"""
-
-
-def mayor_producto(n1, n2, n3, n4):
- mayor = n1 * n2
- n1n3 = n1 * n3
- n1n4 = n1 * n4
- n2n3 = n2 * n3
- n2n4 = n2 * n4
- n3n4 = n3 * n4
- if n1n3 > mayor:
- mayor = n1n3
- if n1n4 > mayor:
- mayor = n1n4
- if n2n3 > mayor:
- mayor = n2n3
- if n2n4 > mayor:
- mayor = n2n4
- if n3n4 > mayor:
- mayor = n3n4
- return mayor
-
-if __name__ == '__main__':
- import doctest
- doctest.testmod()
-
diff --git a/UMDC/02/04.py b/UMDC/02/04.py
deleted file mode 100644
index 8976a4e..0000000
--- a/UMDC/02/04.py
+++ /dev/null
@@ -1,129 +0,0 @@
-"""
-Ejercicio 04
-Área de un triángulo en base a sus puntos
-
-a) Escribir una función que dado un vector al origen (definido por sus puntos
-x, y), devuelva la norma del vector, dada por (x^2 + y^2) ^ 1/2
-http://www.ub.edu/glossarimateco/content/norma-de-un-vector
-"""
-
-
-def norma(x, y):
- return (x*x + y*y)**(1/2)
-
-
-"""
-2) Escribir una función que dados dos puntos en el plano (x1, y1 y x2, y2),
-devuelva la resta de ambos (debe devolver un par de valores).
-"""
-
-
-def resta(x1, y1, x2, y2):
- return (x1-x2, y1-y2)
-
-
-"""
-3) Utilizando las funciones anteriores, escribir una función que dados dos
-puntos en el plano (x1, y1 x2, y2), devuelva la distancia entre ambos.
-"""
-
-
-def distancia(x1, y1, x2, y2):
- (x, y) = resta(x1, y1, x2, y2)
- return norma(x, y)
-
-
-"""
-4) Escribir una función que reciba un vector al origen (definido por sus
-puntos x, y) y devuelva un vector equivalente, normalizado (debe devolver
-un par de valores).
-https://es.wikipedia.org/wiki/Vector_unitario
-"""
-
-
-def vector_unitario(x, y):
- n = norma(x, y)
- return (x/n, y/n)
-
-
-"""
-5) Utilizando las funciones anteriores ( 2) y 4) ), escribir una función que
-dados dos puntos en el plano (x1, y1 y x2, y2), devuelva el vector dirección
-unitario correspondiente a la recta que los une.
-"""
-
-
-def vector_unitario2(x1, y1, x2, y2):
- (x, y) = resta(x2, y2, x1, y1)
- return vector_unitario(x, y)
-
-
-"""
-6) Escribir una función que reciba un punto (x, y), una dirección unitaria de
-una recta (dx, dy) y un punto perteneciente a esa recta (cx, cy) y devuelva
-la proyección del punto sobre la recta.
-(Notas.- Una recta puede estar definida por dos puntos o bien por un vector y
-un punto de la misma)
-
-Diseño del algoritmo:
-Al punto a proyectar (x, y) restarle el punto de la recta (cx, cy)
-Obtener la matriz de proyección P, dada por:
- p11 = dx^2, p12 = p21 = dx * dy, p22 = dy^2
-Multiplicar la matriz P por el punto obtenido en el paso 1:
- rx = p11 * x + p12 * y, ry = p21 * x + p22 * y
-Al resultado obtenido sumar el punto restado en el paso 1, y devolverlo.
-"""
-
-
-def proyeccion(x, y, dx, dy, cx, cy):
- (t1, t2) = resta(x, y, cx, cy)
- p11 = dx*dx
- p12 = dx*dy
- p21 = p12
- p22 = dy*dy
- rx = p11*t1 + p12*t2
- ry = p21*t1 + p22*t2
- rx += cx
- ry += cy
- return (rx, ry)
-
-
-"""
-7) Escribir una función que calcule el área de un triángulo a partir de su
-base y su altura.
-"""
-
-
-def area_triangulo(b, h):
- return b*h/2
-
-
-"""
-8) Utilizando las funciones anteriores escribir una función que reciba tres
-puntos en el plano (x1, y1, x2, y2 y x3, y3) y devuelva el área del
-triángulo correspondiente.
-"""
-
-
-def area_vectorial(x1, y1, x2, y2, x3, y3):
- (dos_uno_x, dos_uno_y) = resta(x2, y2, x1, y1)
- (dos_tres_x, dos_tres_y) = resta(x3, y3, x1, y1)
- area = dos_uno_x*dos_tres_y - dos_uno_y*dos_tres_x
- if area < 0:
- area = -area
- return area/2
-
-
-def area_proyeccion(x1, y1, x2, y2, x3, y3):
- base = distancia(x1, y1, x3, y3)
- (dx, dy) = vector_unitario2(x1, y1, x3, y3)
- (px, py) = proyeccion(x2, y2, dx, dy, x3, y3)
- altura = distancia(x2, y2, px, py)
- return area_triangulo(base, altura)
-
-
-
-print(6 / (area_proyeccion(0, 0, 2, 0, 1 ,2) - 2))
-
-
-print(6 / (area_vectorial(0, 0, 2, 0, 1 ,2) - 2))
diff --git a/UMDC/02/umdc02.md b/UMDC/02/umdc02.md
deleted file mode 100644
index 7ad607c..0000000
--- a/UMDC/02/umdc02.md
+++ /dev/null
@@ -1,37 +0,0 @@
-## Un mundo de código 02
-
-
-
-**Ejercicio 01.10.** Escribir dos funciones que permitan calcular:
-
-- La cantidad de segundos en un tiempo dado en horas, minutos y segundos.
-- La cantidad de horas, minutos y segundos de un tiempo dado en segundos.
-
-**Ejercicio 01.11.** Usando las funciones del ejercicio anterior, escribir un programa que lea de teclado dos tiempos expresados en horas, minutos y segundos; las sume y muestre el resultado en horas, minutos y segundos por pantalla.
-
-**Ejercicio 01.12.** Escribir una función que dados cuatro números, devuelva el mayor producto de dos de ellos. Por ejemplo, si recibe los números `1`, `5`, `-2`, `-4` debe devolver `8`, que es el producto más grande que se puede obtener entre ellos.
-
-**Ejercicio 01.13** Área de un triángulo en base a sus puntos:
-
-1) Escribir una función que dado un vector al origen (definido por sus puntos `x`, `y`), devuelva la norma del vector, dada por `(x^2 + y^2) ^ 1/2`
-
-2) Escribir una función que dados dos puntos en el plano (`x1`, `y1` y `x2`, `y2`), devuelva la resta de ambos (debe devolver un par de valores).
-
-3) Utilizando las funciones anteriores, escribir una función que dados dos puntos en el plano (`x1`, `y1` y`x2`, `y2`), devuelva la distancia entre ambos.
-
-4) Escribir una función que reciba un vector al origen (definido por sus puntos `x`, `y`) y devuelva un vector equivalente, normalizado (debe devolver un par de valores).
-
-5) Utilizando las funciones anteriores (`b` y `d`), escribir una función que dados dos puntos en el plano (`x1`, `y1` y `x2`, `y2`), devuelva el vector dirección unitario correspondiente a la recta que los une.
-
-6) Escribir una función que reciba un punto `(x, y)`, una dirección unitaria de una recta `(dx, dy)` y un punto perteneciente a esa recta `(cx, cy)` y devuelva la proyección del punto sobre la recta.
-
-**Diseño del algoritmo:**
-
-1. Al punto a proyectar `(x, y)` restarle el punto de la recta `(cx, cy)`
-2. Obtener la matriz de proyección `P`, dada por: `p11 = dx^2`, `p12 = p21 = dx * dy`, `p22 = dy^2`.
-3. Multiplicar la matriz `P` por el punto obtenido en el paso 1: `rx = p11 * x + p12 * y`, `ry = p21 * x + p22 * y`.
-4. Al resultado obtenido sumar el punto restado en el paso 1, y devolverlo.
-
-7) Escribir una función que calcule el área de un triángulo a partir de su base y su altura.
-
-8) Utilizando las funciones anteriores escribir una función que reciba tres puntos en el plano (`x1`, `y1`,`x2`, `y2` y `x3`, `y3`) y devuelva el área del triángulo correspondiente.
\ No newline at end of file
diff --git a/UMDC/03/01.py b/UMDC/03/01.py
deleted file mode 100644
index 547b417..0000000
--- a/UMDC/03/01.py
+++ /dev/null
@@ -1,65 +0,0 @@
-"""
-3.1. Escribir funciones que resuelvan los siguientes problemas:
-
- Dado un número entero n, indicar si es o no par.
- Dado un número entero n, indicar si es o no primo.
-
-
-"""
-
-def par(n):
- """
- >>> par(10)
- True
-
- >>> par(11)
- False
-
- >>> par(1)
- False
-
- >>> par(0)
- True
-
- >>> par(-10)
- True
- """
- return not(n % 2)
-
-def primo(n):
- """
- >>> primo(10)
- False
-
- >>> primo(5)
- True
-
- >>> primo(1)
- True
-
- >>> primo(0)
- False
-
- >>> primo(17)
- True
-
- >>> primo(100)
- False
-
- >>> primo(51)
- False
-
- """
-
- if not n:
- return False
- prim = True
- for i in range(2, int(n**(1//2))):
- if not(n % i):
- prim = False
- return prim
-
-
-if __name__ == "__main__":
- import doctest
- doctest.testmod()
diff --git a/UMDC/03/02.py b/UMDC/03/02.py
deleted file mode 100644
index b7d2a9e..0000000
--- a/UMDC/03/02.py
+++ /dev/null
@@ -1,33 +0,0 @@
-"""
-Ejercicio 02
-
-Escribir una implementación propia de la función abs, que devuelva el valor
-absoluto de cualquier valor que reciba.
-
-
-
-
-"""
-
-
-def abs(n):
- """
- TEST:
-
- >>> abs(5)
- 5
-
- >>> abs(-5)
- 5
-
- >>> abs(0)
- 0
- """
-
- if n < 0:
- n = -n
- return n
-
-if __name__ == '__main__':
- import doctest
- doctest.testmod()
\ No newline at end of file
diff --git a/UMDC/03/03.py b/UMDC/03/03.py
deleted file mode 100644
index e93b8e3..0000000
--- a/UMDC/03/03.py
+++ /dev/null
@@ -1,31 +0,0 @@
-"""
-Ejercicio 03
-
-Escribir un programa que reciba una a una las notas del usuario,
-preguntando a cada paso si desea ingresar más notas, e imprimiendo el
-promedio correspondiente.
-"""
-
-print("Introduzca sus notas")
-print("====================")
-i = 0
-total = 0
-masNotas = True
-while masNotas:
- leyendo = True
- while leyendo:
- try:
- n = float(input("Introduzca nota : "))
- leyendo = False
- except ValueError:
- print("Introduzca un valor numérico")
- total += n
- i += 1
- leyendo = True
- while leyendo:
- respuesta = input("¿Otra nota? (S/N)")
- if (respuesta in "SNsn") and len(respuesta) == 1:
- leyendo = False
- if respuesta in "Nn":
- masNotas = False
-print("Su promedio es de", total / i, "puntos")
diff --git a/UMDC/03/04.py b/UMDC/03/04.py
deleted file mode 100644
index 06bf507..0000000
--- a/UMDC/03/04.py
+++ /dev/null
@@ -1,56 +0,0 @@
-"""
-Ejercicio 04
-
-Escribir una función que reciba un número entero k e imprima su
-descomposición en factores primos.
-
->>> fact_primos(24)
-1
-2
-2
-2
-3
-
->>> fact_primos(100)
-1
-2
-2
-5
-5
-
->>> fact_primos(12)
-1
-2
-2
-3
-
->>> fact_primos(11)
-1
-11
-
->>> fact_primos(1)
-1
-
->>> fact_primos(0)
-1
-
-"""
-
-
-def fact_primos(n):
- if n < 2:
- print(1)
- else:
- i = 2
- print(1)
- while (n/2 + 1) > i:
- if n % i == 0:
- print(i)
- n //= i
- else:
- i += 1
- print(n)
-
-if __name__ == '__main__':
- import doctest
- doctest.testmod()
diff --git a/UMDC/03/05.py b/UMDC/03/05.py
deleted file mode 100644
index a80ce72..0000000
--- a/UMDC/03/05.py
+++ /dev/null
@@ -1,80 +0,0 @@
-"""
-Ejercicio 05
-
-Manejo de contraseñas
-Escribir un programa que contenga una contraseña inventada, que le pregunte
-al usuario la contraseña, y no le permita continuar hasta que la haya
-ingresado correctamente.
-"""
-from time import sleep
-
-"""
-contrasena = "contra"
-while True:
- con = input("Contraseña : ")
- if con == contrasena:
- print("Contraseña correcta")
- break
- else:
- print("Contraseña errónea")
-
-
-Modificar el programa anterior para que solamente permita una cantidad fija de
-intentos.
-
-
-
-contrasena = "contra"
-intentos = 3
-while intentos:
- con = input("Contraseña : ")
- if con == contrasena:
- print("Contraseña correcta")
- break
- else:
- print("Contraseña errónea")
- intentos -= 1
-
-
-Modificar el programa anterior para que después de cada intento agregue una
-pausa cada vez mayor, utilizando la función sleep del módulo time.
-"""
-
-contrasena = "contra"
-maxIntentos = 5
-intentos = maxIntentos
-while intentos != 0:
- con = input("Contraseña : ")
- if con == contrasena:
- print("Contraseña correcta")
- break
- else:
- print("Contraseña errónea")
- intentos -= 1
- if intentos > 0:
- sleep(10-int(10/maxIntentos*intentos))
- print(10-int(10/maxIntentos*intentos))
-
-"""
-Modificar el programa anterior para que sea una función que devuelva si
-el usuario ingresó o no la contraseña correctamente, mediante un valor
-booleano (True o False).
-"""
-
-
-def passwords():
- from time import sleep
- contrasena = "contra"
- maxIntentos = 5
- intentos = maxIntentos
- while intentos != 0:
- con = input("Contraseña : ")
- if con == contrasena:
- print("Contraseña correcta")
- return True
- else:
- print("Contraseña errónea")
- intentos -= 1
- if intentos > 0:
- sleep(10-int(10/maxIntentos*intentos))
- return False
diff --git a/UMDC/03/06.py b/UMDC/03/06.py
deleted file mode 100644
index 790a8d1..0000000
--- a/UMDC/03/06.py
+++ /dev/null
@@ -1,26 +0,0 @@
-"""
-Ejercicio 06
-
-Utilizando la función randrange del módulo random, escribir un programa que
-obtenga un número aleatorio secreto, y luego permita al usuario ingresar
-números y le indique sin son menores o mayores que el número a adivinar,
-hasta que el usuario ingrese el número correcto.
-"""
-from random import randrange
-
-n = randrange(10)
-while True:
- leyendo = True
- while leyendo:
- try:
- adivina = int(input("Adivina el número: "))
- leyendo = False
- except ValueError:
- print("Introduzca un valor numérico")
- if adivina == n:
- print("¡¡ Ese es !!")
- break
- elif adivina < n:
- print("El número es más alto")
- else:
- print("El número es más bajo")
diff --git a/UMDC/03/07.py b/UMDC/03/07.py
deleted file mode 100644
index 0871ffd..0000000
--- a/UMDC/03/07.py
+++ /dev/null
@@ -1,28 +0,0 @@
-"""
-Ejercicio 07
-
-Algoritmo de Euclides
-Implementar en python el algoritmo de Euclides para calcular el máximo común
-divisor de dos números n y m, dado por los siguientes pasos.
-Teniendo n y m, se obtiene r, el resto de la división entera de m/n.
-Si r es cero, n es el mcd de los valores iniciales.
-Se reemplaza m ← n, n ← r, y se vuelve al primer paso.
-Hacer un seguimiento del algoritmo implementado para los siguientes pares de
-números: (15,9);(9,15); (10,8); (12,6).
-"""
-
-
-def euclides(m, n):
- if m < n:
- cambio = m
- m = n
- n = cambio
- r = m % n
- while r != 0:
- m = n
- n = r
- r = m % n
- return n
-
-
-print(euclides(15, 9), euclides(9, 15), euclides(10, 8), euclides(12, 6))
diff --git a/UMDC/03/08a.py b/UMDC/03/08a.py
deleted file mode 100644
index 9fb44db..0000000
--- a/UMDC/03/08a.py
+++ /dev/null
@@ -1,29 +0,0 @@
-"""
-Ejercicio 08a
-
-Potencias de dos
-a) Escribir una función es_potencia_de_dos que reciba como parámetro un
-número natural, y devuelva True si el número es una potencia de 2, y False
-en caso contrario.
-"""
-
-
-def es_potencia_de_dos(n):
- while n != 1:
- if (n % 2) == 0:
- n = n / 2
- else:
- return False
- return True
-
-
-def es_potencia_de_dos_2(n):
- from math import log2
- exp = log2(n)
- return (exp == int(exp))
-
-
-print(es_potencia_de_dos(1), es_potencia_de_dos_2(1))
-print(es_potencia_de_dos(2), es_potencia_de_dos_2(2))
-print(es_potencia_de_dos(59), es_potencia_de_dos_2(59))
-print(es_potencia_de_dos(256), es_potencia_de_dos_2(256))
diff --git a/UMDC/03/08b.py b/UMDC/03/08b.py
deleted file mode 100644
index dd6f091..0000000
--- a/UMDC/03/08b.py
+++ /dev/null
@@ -1,30 +0,0 @@
-"""
-Ejercicio 08b
-
-Potencias de 2
-b) Escribir una función que, dados dos números naturales pasados como
-parámetros, devuelva la suma de todas las potencias de 2 que hay en el rango
-formado por esos números (0 si no hay ninguna potencia de 2 entre los dos).
-Utilizar la función es_potencia_de_dos, descrita en el punto anterior.
-"""
-
-
-def es_potencia_de_dos(n):
- while n != 1:
- if (n % 2) == 0:
- n = n / 2
- else:
- return False
- return True
-
-
-def suma_potencias_de_2(a, b):
- suma = 0
- for n in range(a, b+1):
- if es_potencia_de_dos(n):
- suma += n
- return suma
-
-
-print(suma_potencias_de_2(6, 15))
-print(suma_potencias_de_2(17, 30))
diff --git a/UMDC/03/09a.py b/UMDC/03/09a.py
deleted file mode 100644
index 5e3adca..0000000
--- a/UMDC/03/09a.py
+++ /dev/null
@@ -1,21 +0,0 @@
-"""
-Ejercicio 09a
-
-Números perfectos y números amigos
-
-a) Escribir una función que devuelva la suma de todos los divisores de un
-número n, sin incluirlo.
-"""
-
-
-def suma_divisores(n):
- suma = 1
- for i in range(2, n//2+1):
- if n % i == 0:
- suma += i
- return suma
-
-
-print(suma_divisores(6))
-print(suma_divisores(1))
-print(suma_divisores(0))
diff --git a/UMDC/03/09b.py b/UMDC/03/09b.py
deleted file mode 100644
index 3b41fda..0000000
--- a/UMDC/03/09b.py
+++ /dev/null
@@ -1,26 +0,0 @@
-"""
-Ejercicio 09b
-
-Números perfectos y números amigos
-
-b) Usando la función anterior, escribir una función que imprima los primeros m números tales que la suma de sus divisores sea igual a sí mismo (es decir los primeros m números perfectos).
-"""
-
-
-def suma_divisores(n):
- suma = 1
- for i in range(2, n//2+1):
- if n % i == 0:
- suma += i
-
-
-def perfecto(m):
- n = 1
- for i in range(m):
- while n != suma_divisores(n):
- n += 1
- print(n)
- n += 1
-
-
-perfecto(5)
diff --git a/UMDC/03/09cd.py b/UMDC/03/09cd.py
deleted file mode 100644
index a00fba7..0000000
--- a/UMDC/03/09cd.py
+++ /dev/null
@@ -1,36 +0,0 @@
-"""
-Ejercicio 09cd
-
-Números perfectos y números amigos
-
-c) Usando la primera función, escribir una función que imprima las primeras m
-parejas de números(a,b), tales que la suma de los divisores de a es igual a b
-y la suma de los divisores de b es igual a a(es decir las primeras m parejas
-de números amigos).
-"""
-
-
-def suma_divisores(n):
- suma = 1
- for i in range(2, n//2+1):
- if n % i == 0:
- suma += i
- return suma
-
-
-def perfectos(m):
- a = 0
- for i in range(m):
- while True:
- a += 1
- b = suma_divisores(a)
- if suma_divisores(b) == a and a != b and a < b:
- print(a, b)
- break
-
-
-perfectos(6)
-
-"""
-d) Proponer optimizaciones a las funciones anteriores para disminuir el tiempo de ejecución.
-"""
diff --git a/UMDC/03/10.py b/UMDC/03/10.py
deleted file mode 100644
index 96c5e4f..0000000
--- a/UMDC/03/10.py
+++ /dev/null
@@ -1,27 +0,0 @@
-"""
-Ejercicio 10
-
-Escribir un programa que le pida al usuario que ingrese una sucesión de
-números naturales (primero uno, luego otro, y así hasta que el usuario
-ingrese -1 como condición de salida). Al final, el programa debe imprimir
-cuántos números fueron ingresados, la suma total de los valores y el
-promedio.
-"""
-
-i = 0
-total = 0
-while True:
- leyendo = True
- while leyendo:
- try:
- n = float(input("Introduzca un número :"))
- leyendo = False
- except ValueError:
- print("Introduzca un valor numérico")
- if n == -1:
- break
- else:
- total += n
- i += 1
-print("Se ingresaron", i, "números que suman", total)
-print("El promedio es de: ", total / i)
diff --git a/UMDC/03/11a.py b/UMDC/03/11a.py
deleted file mode 100644
index ebb7b18..0000000
--- a/UMDC/03/11a.py
+++ /dev/null
@@ -1,20 +0,0 @@
-"""
-Ejercicio 11a
-
-Escribir una función que reciba dos números como parámetros, y devuelva
-cuántos múltiplos del primero hay, que sean menores que el segundo.
-
-a) Implementarla utilizando un ciclo for, desde el primer número hasta el
-segundo.
-"""
-
-
-def numMulFor(m, n):
- numMul = 0
- for i in range(m, n+1):
- if i % m == 0:
- numMul += 1
- return numMul
-
-
-print(numMulFor(12, 360))
diff --git a/UMDC/03/11bc.py b/UMDC/03/11bc.py
deleted file mode 100644
index 8a9e149..0000000
--- a/UMDC/03/11bc.py
+++ /dev/null
@@ -1,27 +0,0 @@
-"""
-Ejercicio 11bc
-
-Escribir una función que reciba dos números como parámetros, y devuelva
-cuántos múltiplos del primero hay, que sean menores que el segundo.
-b) Implementarla utilizando un ciclo while, que multiplique el primer número
-hasta que sea mayor que el segundo.
-"""
-
-
-def num_mul(m, n):
- i = 1
- mul = m
- while mul <= n:
- i += 1
- mul *= i
- return (i-1)
-
-
-print(num_mul(12, 360))
-
-"""
-c) Comparar ambas implementaciones: ¿Cuál es más clara? ¿Cuál realiza menos
-operaciones?
-
-La primera es más clara pero la segunda es manifiestamente más rápida.
-"""
diff --git a/UMDC/03/12.py b/UMDC/03/12.py
deleted file mode 100644
index 63a8952..0000000
--- a/UMDC/03/12.py
+++ /dev/null
@@ -1,36 +0,0 @@
-"""
-Ejercicio 12
-
-Escribir una función que reciba un número natural e imprima todos los números
-que hay hasta ese número.
-
->>> primos(20)
-1
-2
-3
-5
-7
-11
-13
-17
-19
-
-"""
-
-
-def primos(n):
- print(1)
- if n >= 2:
- print(2)
- for i in range(3, n+1):
- primo = True
- for j in range(2, i):
- if i % j == 0:
- primo = False
- break
- if primo:
- print(i)
-
-if __name__ == "__main__":
- import doctest
- doctest.testmod()
diff --git a/UMDC/03/13.py b/UMDC/03/13.py
deleted file mode 100644
index 9f219a7..0000000
--- a/UMDC/03/13.py
+++ /dev/null
@@ -1,18 +0,0 @@
-"""
-Ejercicio 13
-
-Escribir una función que reciba un dígito y un número natural, y decida
-numéricamente si el dígito se encuentra en la notación decimal del segundo.
-"""
-
-
-def digitoEn(d, n):
- while n:
- if n % 10 == d:
- return True
- n = n // 10
- return False
-
-
-print(digitoEn(7, 89343733), digitoEn(7, 0), digitoEn(7, 7),
- digitoEn(7, 700), digitoEn(7, 897), digitoEn(7, 8980))
diff --git a/UMDC/03/14.py b/UMDC/03/14.py
deleted file mode 100644
index c83ae43..0000000
--- a/UMDC/03/14.py
+++ /dev/null
@@ -1,36 +0,0 @@
-"""
-Ejercicio 14
-
-Escribir una función que dada la cantidad de ejercicios de un examen, y el
-porcentaje necesario de ejercicios bien resueltos necesario para aprobar
-dicho examen, revise un grupo de examenes. Para ello, en cada paso debe
-preguntar la cantidad de ejercicios resueltos por el alumno, indicando con un
-valor centinela que no hay más examenes a revisar. Debe mostrar por pantalla
-el porcentaje correspondiente a la cantidad de ejercicios resueltos respecto
-a la cantidad de ejercicios del examen y una leyenda que indique si aprobó o
-no.
-"""
-
-
-def examen(numEje, porcentaje):
- while True:
- leyendo = True
- while leyendo:
- try:
- resueltos = float(input("Número de ejercicios resueltos",
- "(-1 para terminar): "))
- leyendo = False
- except ValueError:
- print("Introduzca una cantidad numérica")
- if resueltos == -1:
- return
- else:
- nota = 100/numEje * resueltos
- print("El % de ejercicios resueltos es", 100/numEje * resueltos)
- if nota < porcentaje:
- print("Suspendido")
- else:
- print("Aprobado")
-
-
-examen(50, 25)
diff --git a/UMDC/03/15.py b/UMDC/03/15.py
deleted file mode 100644
index 9f77541..0000000
--- a/UMDC/03/15.py
+++ /dev/null
@@ -1,20 +0,0 @@
-"""
-Ejercicio 15
-
-Escribir una función que reciba por parámetro una dimensión n, e imprima la
-matriz identidad correspondiente a esa dimensión.
-"""
-
-
-def matrizIdentidad(m):
- for i in range(m):
- linea = ""
- for j in range(m):
- if i == j:
- linea += "1 "
- else:
- linea += "0 "
- print(linea[:-1])
-
-
-matrizIdentidad(5)
diff --git a/UMDC/03/16a.py b/UMDC/03/16a.py
deleted file mode 100644
index dc7afe7..0000000
--- a/UMDC/03/16a.py
+++ /dev/null
@@ -1,20 +0,0 @@
-"""
-Ejercicio 16a
-
-Escribir funciones que permitan encontrar:
-
-a) El máximo o mínimo de un polinomio de segundo grado (dados los
-coeficientes a, b y c), indicando si es un máximo o un mínimo.
-http://es.wikihow.com/encontrar-f%C3%A1cilmente-el-valor-m%C3%A1ximo-o-m%C3%ADnimo-de-una-funci%C3%B3n-cuadr%C3%A1tica
-"""
-
-
-def maxmin(a, b, c):
- if a > 0:
- return (-(b**2)/(4*a) + c, "máximo")
- else:
- return (-(b**2)/(4*a) + c, "mínimo")
-
-
-(valor, Mm) = maxmin(-1, 1, 1)
-print("Es un", Mm, "y su valor es", valor)
diff --git a/UMDC/03/16b.py b/UMDC/03/16b.py
deleted file mode 100644
index 4fa579e..0000000
--- a/UMDC/03/16b.py
+++ /dev/null
@@ -1,30 +0,0 @@
-"""
-Ejercicio 16b
-
-Escribir funciones que permitan encontrar:
-
-b) Las raíces (reales o complejas) de un polinomio de segundo grado.
-Nota: validar que las operaciones puedan efectuarse antes de realizarlas
-(no dividir por cero, ni calcular la raiz de un número negativo).
-"""
-
-
-def raices(a, b, c):
- h = b*b - 4*a*c
- if h < 0:
- imaginaria = True
- h = -h
- else:
- imaginaria = False
- rh = h ** (1/2)
- if imaginaria:
- r1r = -b/(2*a)
- r1i = rh/(2*a)
- r2r = r1r
- r2i = -r1i
- else:
- r1r = (-b + rh)/(2*a)
- r1i = 0
- r2r = (-b - rh)/(2*a)
- r2i = 0
- return (r1r, r1i, r2r, r2i)
diff --git a/UMDC/03/16c.py b/UMDC/03/16c.py
deleted file mode 100644
index 0e05e42..0000000
--- a/UMDC/03/16c.py
+++ /dev/null
@@ -1,33 +0,0 @@
-"""
-Ejercicio 16c
-
-Escribir funciones que permitan encontrar:
-
-c) La intersección de dos rectas (dadas las pendientes y ordenada al origen
-de cada recta). Nota: validar que no sean dos rectas con la misma pendiente,
-antes de efectuar la operación.
-"""
-
-
-def raices(a, b, c):
- h = b*b - 4*a*c
- if h < 0:
- imaginaria = True
- h = -h
- else:
- imaginaria = False
- rh = h ** (1/2)
- if imaginaria:
- r1r = -b/(2*a)
- r1i = rh/(2*a)
- r2r = r1r
- r2i = -r1i
- else:
- r1r = (-b + rh)/(2*a)
- r1i = 0
- r2r = (-b - rh)/(2*a)
- r2i = 0
- return (r1r, r1i, r2r, r2i)
-
-
-print(raices(1, -5, 6))
diff --git a/UMDC/03/17a.py b/UMDC/03/17a.py
deleted file mode 100644
index be103e3..0000000
--- a/UMDC/03/17a.py
+++ /dev/null
@@ -1,25 +0,0 @@
-"""
-Ejercicio 17a
-
-Escribir funciones que resuelvan los siguientes problemas:
-
-a) Dado un año indicar si es bisiesto. Nota: un año es bisiesto si es un
-número divisible por 4, pero no si es divisible por 100, excepto que también
-sea divisible por 400.
-"""
-
-
-def bisiesto(anio):
- if anio % 4:
- return False
- else:
- if anio % 100:
- return True
- else:
- if anio % 400:
- return False
- else:
- return True
-
-
-print(bisiesto(2017), bisiesto(2016), bisiesto(1800), bisiesto(2000))
diff --git a/UMDC/03/17b.py b/UMDC/03/17b.py
deleted file mode 100644
index c901d2d..0000000
--- a/UMDC/03/17b.py
+++ /dev/null
@@ -1,38 +0,0 @@
-"""
-Ejercicio 17b
-
-Escribir funciones que resuelvan los siguientes problemas:
-
-b) Dado un mes, devolver la cantidad de dias correspondientes.
-"""
-
-
-def bisiesto(anio):
- if anio % 4:
- return False
- else:
- if anio % 100:
- return True
- else:
- if anio % 400:
- return False
- else:
- return True
-
-
-def dias_mes(mes, anio):
- if mes in (1, 3, 5, 7, 8, 10, 12):
- return 31
- elif mes in (4, 6, 9, 11):
- return 30
- elif mes == 2:
- if bisiesto(anio):
- return 29
- else:
- return 28
- else:
- return -1
-
-
-print(dias_mes(1, 2016), dias_mes(11, 2016),
- dias_mes(2, 2016), dias_mes(2, 2017))
diff --git a/UMDC/03/17c.py b/UMDC/03/17c.py
deleted file mode 100644
index 4205903..0000000
--- a/UMDC/03/17c.py
+++ /dev/null
@@ -1,49 +0,0 @@
-"""
-Ejercicio 17c
-
-Escribir funciones que resuelvan los siguientes problemas:
-c) Dada una fecha (dia, mes, año), indicar si es válida o no.
-"""
-
-
-def bisiesto(anio):
- if anio % 4:
- return False
- else:
- if anio % 100:
- return True
- else:
- if anio % 400:
- return False
- else:
- return True
-
-
-def dias_mes(mes, anio):
- if mes in (1, 3, 5, 7, 8, 10, 12):
- return 31
- elif mes in (4, 6, 9, 11):
- return 30
- elif mes == 2:
- if bisiesto(anio):
- return 29
- else:
- return 28
- else:
- return -1
-
-
-def validar_fecha(dia, mes, anio):
- dm = dias_mes(mes, anio)
- if dm == -1:
- return -1
- if dm < dia:
- return False
- elif mes > 12:
- return False
- else:
- return True
-
-
-print(validar_fecha(29, 2, 2016), validar_fecha(29, 2, 2017),
- validar_fecha(3, 13, 2016), validar_fecha(5, 6, 1967))
diff --git a/UMDC/03/17d.py b/UMDC/03/17d.py
deleted file mode 100644
index 60be031..0000000
--- a/UMDC/03/17d.py
+++ /dev/null
@@ -1,56 +0,0 @@
-"""
-Ejercicio 17b
-
-Escribir funciones que resuelvan los siguientes problemas:
-
-d) Dada una fecha, indicar los dias que faltan hasta fin de mes.
-"""
-
-
-def bisiesto(anio):
- if anio % 4:
- return False
- else:
- if anio % 100:
- return True
- else:
- if anio % 400:
- return False
- else:
- return True
-
-
-def dias_mes(mes, anio):
- if mes in (1, 3, 5, 7, 8, 10, 12):
- return 31
- elif mes in (4, 6, 9, 11):
- return 30
- elif mes == 2:
- if bisiesto(anio):
- return 29
- else:
- return 28
- else:
- return -1
-
-
-def validar_fecha(dia, mes, anio):
- dm = dias_mes(mes, anio)
- if dm == -1:
- return -1
- if dm < dia:
- return False
- elif mes > 12:
- return False
- else:
- return True
-
-
-def dias_faltan(dia, mes, anio):
- if validar_fecha(dia, mes, anio):
- return dias_mes(mes, anio)-dia
- else:
- return -1
-
-
-print(dias_faltan(1, 1, 2000))
diff --git a/UMDC/03/17e.py b/UMDC/03/17e.py
deleted file mode 100644
index ff5facf..0000000
--- a/UMDC/03/17e.py
+++ /dev/null
@@ -1,70 +0,0 @@
-"""
-Ejercicio 17e
-
-Escribir funciones que resuelvan los siguientes problemas:
-e) Dada una fecha, indicar los dias que faltan hasta fin de año.
-"""
-
-
-def bisiesto(anio):
- if anio % 4:
- return False
- else:
- if anio % 100:
- return True
- else:
- if anio % 400:
- return False
- else:
- return True
-
-
-def dias_mes(mes, anio):
- if mes in (1, 3, 5, 7, 8, 10, 12):
- return 31
- elif mes in (4, 6, 9, 11):
- return 30
- elif mes == 2:
- if bisiesto(anio):
- return 29
- else:
- return 28
- else:
- return -1
-
-
-def validar_fecha(dia, mes, anio):
- dm = dias_mes(mes, anio)
- if dm == -1:
- return -1
- if dm < dia:
- return False
- elif mes > 12:
- return False
- else:
- return True
-
-
-def dias_faltan(dia, mes, anio):
- if validar_fecha(dia, mes, anio):
- return dias_mes(mes, anio)-dia
- else:
- return -1
-
-
-print(dias_faltan(1, 1, 2000))
-
-
-def dias_fin_anio(dia, mes, anio):
- if validar_fecha(dia, mes, anio):
- dias = 0
- for m in range(mes+1, 12+1):
- dias += dias_mes(m, anio)
- dias += dias_faltan(dia, mes, anio)
- return dias
- else:
- return -1
-
-
-print(dias_fin_anio(31, 12, 2000), dias_fin_anio(30, 11, 2000),
- dias_fin_anio(1, 1, 2015), dias_fin_anio(1, 1, 2016))
diff --git a/UMDC/03/17f.py b/UMDC/03/17f.py
deleted file mode 100644
index 03f04a0..0000000
--- a/UMDC/03/17f.py
+++ /dev/null
@@ -1,81 +0,0 @@
-"""
-Ejercicio 17f
-
-Escribir funciones que resuelvan los siguientes problemas:
-f) Dada una fecha, indicar la cantidad de dias transcurridos en ese año hasta
-esa fecha.
-"""
-
-
-def bisiesto(anio):
- if anio % 4:
- return False
- else:
- if anio % 100:
- return True
- else:
- if anio % 400:
- return False
- else:
- return True
-
-
-def dias_mes(mes, anio):
- if mes in (1, 3, 5, 7, 8, 10, 12):
- return 31
- elif mes in (4, 6, 9, 11):
- return 30
- elif mes == 2:
- if bisiesto(anio):
- return 29
- else:
- return 28
- else:
- return -1
-
-
-def validar_fecha(dia, mes, anio):
- dm = dias_mes(mes, anio)
- if dm == -1:
- return -1
- if dm < dia:
- return False
- elif mes > 12:
- return False
- else:
- return True
-
-
-def dias_faltan(dia, mes, anio):
- if validar_fecha(dia, mes, anio):
- return dias_mes(mes, anio)-dia
- else:
- return -1
-
-
-print(dias_faltan(1, 1, 2000))
-
-
-def dias_fin_anio(dia, mes, anio):
- if validar_fecha(dia, mes, anio):
- dias = 0
- for m in range(mes+1, 12+1):
- dias += dias_mes(m, anio)
- dias += dias_faltan(dia, mes, anio)
- return dias
- else:
- return -1
-
-
-def dias_principio(dia, mes, anio):
- if validar_fecha(dia, mes, anio):
- if bisiesto(anio):
- return 365 - dias_fin_anio(dia, mes, anio)
- else:
- return 364 - dias_fin_anio(dia, mes, anio)
- else:
- return -1
-
-
-print(dias_principio(31, 12, 2000), dias_principio(30, 11, 2000),
- dias_principio(1, 1, 2015), dias_principio(1, 1, 2016))
diff --git a/UMDC/03/17g.py b/UMDC/03/17g.py
deleted file mode 100644
index ce55196..0000000
--- a/UMDC/03/17g.py
+++ /dev/null
@@ -1,99 +0,0 @@
-"""
-Ejercicio 17g
-
-Escribir funciones que resuelvan los siguientes problemas:
-
-g) Dadas dos fechas (dia1, mes1, año1, dia2, mes2, año2), indicar el tiempo
-transcurrido entre ambas, en años, meses y dias. Nota: en todos los casos,
-involucrar las funciones escritas previamente cuando sea posible.
-"""
-
-
-def bisiesto(anio):
- """Devuelve True si el anio es bisiesto."""
- if anio % 4:
- return False
- else:
- if anio % 100:
- return True
- else:
- if anio % 400:
- return False
- else:
- return True
-
-
-def dias_mes(mes, anio):
- """Devuelve los días de cualquier mes teniendo en cuenta el anio."""
- if mes in (1, 3, 5, 7, 8, 10, 12):
- return 31
- elif mes in (4, 6, 9, 11):
- return 30
- elif mes == 2:
- if bisiesto(anio):
- return 29
- else:
- return 28
- else:
- return -1
-
-
-def validar_fecha(dia, mes, anio):
- dm = dias_mes(mes, anio)
- if dm == -1:
- return -1
- if dm < dia:
- return False
- elif mes > 12:
- return False
- else:
- return True
-
-
-def dias_faltan(dia, mes, anio):
- if validar_fecha(dia, mes, anio):
- return dias_mes(mes, anio)-dia
- else:
- return -1
-
-
-print(dias_faltan(1, 1, 2000))
-
-
-def dias_fin_anio(dia, mes, anio):
- if validar_fecha(dia, mes, anio):
- dias = 0
- for m in range(mes+1, 12+1):
- dias += dias_mes(m, anio)
- dias += dias_faltan(dia, mes, anio)
- return dias
- else:
- return -1
-
-
-def dias_principio(dia, mes, anio):
- if validar_fecha(dia, mes, anio):
- if bisiesto(anio):
- return 365 - dias_fin_anio(dia, mes, anio)
- else:
- return 364 - dias_fin_anio(dia, mes, anio)
- else:
- return -1
-
-
-def dias_transcurridos(dia1, mes1, anio1, dia2, mes2, anio2):
- if anio1 == anio2:
- total = -dias_principio(dia1, mes1, anio1) + \
- dias_principio(dia2, mes2, anio2)
- else:
- total = dias_fin_anio(dia1, mes1, anio1) + \
- dias_principio(dia2, mes2, anio2)+1
- for a in range(anio1+1, anio2):
- if bisiesto(a):
- total += 366
- else:
- total += 365
- return total
-
-
-print(dias_transcurridos(1, 1, 2001, 31, 12, 2002))
diff --git a/UMDC/03/18.py b/UMDC/03/18.py
deleted file mode 100644
index 5445287..0000000
--- a/UMDC/03/18.py
+++ /dev/null
@@ -1,42 +0,0 @@
-"""
-Ejercicio 18
-
-Suponiendo que el primer dia del año fue lunes, escribir una función que
-reciba un número con el dia del año(de 1 a 366) y devuelva el dia de la semana
-que le toca. Por ejemplo: si recibe 3 debe devolver miércoles, si recibe 9
-debe devolver martes’.
-
->>> dia_semana(3)
-'miércoles'
-
->>> dia_semana(9)
-'martes'
-
->>> dia_semana(0)
-'domingo'
-
->>>
-"""
-
-
-def dia_semana(dia):
- semana = dia % 7
- if semana == 0:
- return "domingo"
- elif semana == 1:
- return "lunes"
- elif semana == 2:
- return "martes"
- elif semana == 3:
- return "miércoles"
- elif semana == 4:
- return "jueves"
- elif semana == 5:
- return "viernes"
- else:
- return "sabado"
-
-
-if __name__ == '__main__':
- import doctest
- doctest.testmod()
diff --git a/UMDC/03/19.py b/UMDC/03/19.py
deleted file mode 100644
index 876e9f8..0000000
--- a/UMDC/03/19.py
+++ /dev/null
@@ -1,55 +0,0 @@
-"""
-Ejercicio 19
-
-Escribir un programa que reciba como entrada un año escrito en números
-arábigos y muestre por pantalla el mismo año escrito en números romanos.
-"""
-
-
-def romano(anio):
- roma = ""
- for i in range(anio//1000):
- roma += "M"
- anio %= 1000
- d = anio // 100
- anio %= 100
- if d == 9:
- roma += "CM"
- elif d >= 5:
- roma += "D"
- for i in range(d-5):
- roma += "C"
- elif d == 4:
- roma += "CD"
- elif d <= 3:
- for i in range(d):
- roma += "C"
- d = anio // 10
- anio %= 10
- if d == 9:
- roma += "XC"
- elif d >= 5:
- roma += "L"
- for i in range(d-5):
- roma += "X"
- elif d == 4:
- roma += "XL"
- elif d <= 3:
- for i in range(d):
- roma += "X"
- d = anio
- if d == 9:
- roma += "IX"
- elif d >= 5:
- roma += "V"
- for i in range(d-5):
- roma += "I"
- elif d == 4:
- roma += "IV"
- elif d <= 3:
- for i in range(d):
- roma += "I"
- return roma
-
-
-print(romano(2019))
diff --git a/UMDC/03/20.py b/UMDC/03/20.py
deleted file mode 100644
index 4e96cd9..0000000
--- a/UMDC/03/20.py
+++ /dev/null
@@ -1,87 +0,0 @@
-"""
-Ejercicio 20
-
-Programa de astrologia: el usuario debe ingresar el dia y mes de su cumpleaños
-y el programa le debe decir a qué signo corresponde.
-
-Nota:
- Aries: 21 de marzo al 20 de abril.
- Tauro: 21 de abril al 21 de mayo.
- Geminis: 22 de mayo al 21 de junio.
- Cancer: 22 de junio al 23 de julio.
- Leo: 24 de julio al 23 de agosto.
- Virgo: 24 de agosto al 23 de septiembre.
- Libra: 24 de septiembre al 23 de octubre.
- Escorpio: 24 de octubre al 22 de noviembre.
- Sagitario: 23 de noviembre al 21 de diciembre.
- Capricornio: 22 de diciembre al 20 de enero.
- Acuario: 21 de enero al 19 de febrero.
- Piscis: 20 de febrero al 20 de marzo.
-"""
-
-
-def astro(dia, mes):
- if mes == 1:
- if dia >= 21:
- return "Acuario"
- else:
- return "Capricornio"
- elif mes == 2:
- if dia >= 20:
- return "Piscis"
- else:
- return "Acuario"
- elif mes == 3:
- if dia >= 21:
- return "Aries"
- else:
- return "Piscis"
- elif mes == 4:
- if dia >= 21:
- return "Tauro"
- else:
- return "Aries"
- elif mes == 5:
- if dia >= 22:
- return "Géminis"
- else:
- return "Tauro"
- elif mes == 6:
- if dia >= 22:
- return "Cáncer"
- else:
- return "Géminis"
- elif mes == 7:
- if dia >= 24:
- return "Leo"
- else:
- return "Cáncer"
- elif mes == 8:
- if dia >= 24:
- return "Virgo"
- else:
- return "Leo"
- elif mes == 9:
- if dia >= 24:
- return "Libra"
- else:
- return "Virgo"
- elif mes == 10:
- if dia >= 24:
- return "Escorpio"
- else:
- return "Libra"
- elif mes == 11:
- if dia >= 23:
- return "Sagitario"
- else:
- return "Escorpio"
- elif mes == 12:
- if dia >= 22:
- return "Capricornio"
- else:
- return "Sagitario"
-
-
-print(astro(5, 6), astro(29, 12), astro(23, 2),
- astro(15, 4), astro(29, 5), astro(13, 5))
diff --git a/UMDC/04/01.py b/UMDC/04/01.py
deleted file mode 100644
index 5243e04..0000000
--- a/UMDC/04/01.py
+++ /dev/null
@@ -1,37 +0,0 @@
-"""
-1.- Escribir una función que reciba una tupla de elementos e indique si se
-encuentran ordenados de menor a mayor o no.
-
->>> tupla1 = (1,2,3,4,5,6,6,7,8,9,10)
->>> test_sorted(tupla1)
-True
-
->>> tupla2 = (1,2,3,5,4,6,7,8,9,10)
->>> test_sorted(tupla2)
-False
-
->>> tupla3 = ()
->>> test_sorted(tupla3)
--1
-
->>> tupla4 = (5,)
->>> test_sorted(tupla4)
-True
-"""
-
-
-def test_sorted(tupla):
- if tupla == ():
- return -1
- previous = tupla[0]
- for item in tupla:
- if previous <= item:
- previous = item
- else:
- return False
- return True
-
-
-if __name__ == "__main__":
- import doctest
- doctest.testmod()
diff --git a/UMDC/04/02a.py b/UMDC/04/02a.py
deleted file mode 100644
index 039b3d6..0000000
--- a/UMDC/04/02a.py
+++ /dev/null
@@ -1,20 +0,0 @@
-"""
-a) Escribir una función que indique si dos fichas de dominó encajan o no.
-Las fichas son recibidas en dos tuplas, por ejemplo: (3,4) y (5,4).
-
->>> domino((1, 2), (3, 2))
-True
->>> domino((1, 2), (3, 5))
-False
->>> domino((1, 2), (3, 1))
-True
-"""
-
-def domino(token_1, token_2):
- return (token_1[0] == token_2[0] or token_1[0] == token_2[1]
- or token_1[1] == token_2[0] or token_1[1] == token_2[1])
-
-
-if __name__ == "__main__":
- import doctest
- doctest.testmod()
diff --git a/UMDC/04/02b.py b/UMDC/04/02b.py
deleted file mode 100644
index dfce6fd..0000000
--- a/UMDC/04/02b.py
+++ /dev/null
@@ -1,25 +0,0 @@
-"""
-b) Escribir una función que indique si dos fichas de dominó encajan o no.
-Las fichas son recibidas en una cadena, por ejemplo: 3-4 2-5.
-Nota: utilizar la función split de las cadenas.
-
->>> domino("1-2 3-2")
-True
->>> domino("1-2 3-5")
-False
->>> domino("1-2 3-1")
-True
-"""
-
-
-def domino(token):
- token = token.split()
- token_1 = token[0].split("-")
- token_2 = token[1].split("-")
- return (token_1[0] == token_2[0] or token_1[0] == token_2[1]
- or token_1[1] == token_2[0] or token_1[1] == token_2[1])
-
-
-if __name__ == "__main__":
- import doctest
- doctest.testmod()
diff --git a/UMDC/04/03a.py b/UMDC/04/03a.py
deleted file mode 100644
index 691aa06..0000000
--- a/UMDC/04/03a.py
+++ /dev/null
@@ -1,25 +0,0 @@
-"""
-
-a) Escribir una función que reciba una tupla con nombres, y para cada nombre
-retorne una lista con un menasaje para cada nombre del tipo:
-"Estimado [nombre],vote por mí".
-
->>> campaign(("José", "Ango", "Juana", "Luis", "Paco"))
-['Estimado José, vote por mí',\
- 'Estimado Ango, vote por mí',\
- 'Estimado Juana, vote por mí',\
- 'Estimado Luis, vote por mí',\
- 'Estimado Paco, vote por mí']
-"""
-
-
-def campaign(names):
- messages = []
- for name in names:
- messages.append("Estimado %s, vote por mí" % name)
- return messages
-
-
-if __name__ == "__main__":
- import doctest
- doctest.testmod()
diff --git a/UMDC/04/03b.py b/UMDC/04/03b.py
deleted file mode 100644
index 368dd42..0000000
--- a/UMDC/04/03b.py
+++ /dev/null
@@ -1,28 +0,0 @@
-"""
-b) Escribir una función que reciba una tupla con nombres, una posición
-de origen p y una cantidad n, e imprima el mensaje anterior para los n
-nombres que se encuentran a partir de la posición p.
-
->>> campaign(("José", "Ango", "Juana", "Luis", "Paco"), 2, 3)
-['Estimado Juana, vote por mí',\
- 'Estimado Luis, vote por mí',\
- 'Estimado Paco, vote por mí']
-
-"""
-
-
-def campaign(names, pos, num):
- messages = []
- for i in range(pos, pos + num):
- messages.append("Estimado %s, vote por mí" % names[i])
- return messages
-
-
-if __name__ == "__main__":
- import doctest
- doctest.testmod()
-
-
-
-
-
diff --git a/UMDC/04/03c.py b/UMDC/04/03c.py
deleted file mode 100644
index b33c7ea..0000000
--- a/UMDC/04/03c.py
+++ /dev/null
@@ -1,39 +0,0 @@
-"""
-c) Modificar las funciones anteriores para que tengan en cuenta el género del
-destinatario, para ello, deberán recibir una tupla de tuplas, conteniendo el
-nombre y el género.
-
->>> campaign_3a((("H", "José"), ("H", "Ango"), ("M", "Juana"), ("H", "Luis"),
-... ("H", "Paco")))
-['Estimado José, vote por mí',\
- 'Estimado Ango, vote por mí',\
- 'Estimada Juana, vote por mí',\
- 'Estimado Luis, vote por mí',\
- 'Estimado Paco, vote por mí']
-
->>> campaign_3b((("H", "José"), ("H", "Ango"), ("M", "Juana"), ("H", "Luis"),
-... ("H", "Paco")),1, 2)
-['Estimado Ango, vote por mí',\
- 'Estimada Juana, vote por mí']
-"""
-
-
-def campaign_3a(names):
- messages = []
- for name in names:
- messages.append("Estimad" + ("o" if name[0] == "H" else "a") +
- " %s, vote por mí" % name[1])
- return messages
-
-
-def campaign_3b(names, pos, num):
- messages = []
- for i in range(pos, pos + num):
- messages.append("Estimad" + ("o" if names[i][0] == "H" else "a") +
- " %s, vote por mí" % names[i][1])
- return messages
-
-
-if __name__ == "__main__":
- import doctest
- doctest.testmod()
diff --git a/UMDC/04/04a.py b/UMDC/04/04a.py
deleted file mode 100644
index 002b382..0000000
--- a/UMDC/04/04a.py
+++ /dev/null
@@ -1,24 +0,0 @@
-
-"""
-4.- Vectores
-
-a) Escribir una función que reciba dos vectores y devuelva su
-producto escalar.
-
->>> scalar((1, 4), (6, 2))
-14
->>> scalar((1, 4, 5), (6, 2, 3))
-29
-"""
-
-
-def scalar(x, y):
- p = list()
- for i in range(len(x)):
- p.append(x[i]*y[i])
- return sum(p)
-
-
-if __name__ == "__main__":
- import doctest
- doctest.testmod()
diff --git a/UMDC/04/04b.py b/UMDC/04/04b.py
deleted file mode 100644
index c5eb890..0000000
--- a/UMDC/04/04b.py
+++ /dev/null
@@ -1,27 +0,0 @@
-"""
-b) Escribir una función que reciba dos vectores y devuelva si son o no
-ortogonales.
-
->>> ortogonal((1, 4), (6, 2))
-False
->>> ortogonal((1, 4, 5), (6, 2, 3))
-False
->>> ortogonal((1, 0, 0), (0, 1, 1))
-True
-"""
-
-
-def scalar(x, y):
- p = list()
- for i in range(len(x)):
- p.append(x[i]*y[i])
- return sum(p)
-
-
-def ortogonal(x, y):
- return scalar(x, y) == 0
-
-
-if __name__ == "__main__":
- import doctest
- doctest.testmod()
diff --git a/UMDC/04/04c.py b/UMDC/04/04c.py
deleted file mode 100644
index 17099bb..0000000
--- a/UMDC/04/04c.py
+++ /dev/null
@@ -1,23 +0,0 @@
-"""
-c) Escribir una función que reciba dos vectores y devuelva si son paralelos o no.
-
->>> parallel((3, -1), (-9, 3))
-True
->>> parallel((2, 2, -1), (4, 4, -2))
-True
->>> parallel((2, 2, -1), (4, 4, 1))
-False
-"""
-
-
-def parallel(x, y):
- k = x[0]/y[0]
- for i in range(1, len(x)):
- if k != x[i]/y[i]:
- return False
- return True
-
-
-if __name__ == "__main__":
- import doctest
- doctest.testmod()
diff --git a/UMDC/04/04d.py b/UMDC/04/04d.py
deleted file mode 100644
index 3223195..0000000
--- a/UMDC/04/04d.py
+++ /dev/null
@@ -1,19 +0,0 @@
-"""
-d) Escribir una función que reciba un vector y devuelva su norma.
->>> magnitude((3,4))
-5.0
->>> magnitude((3,4,5))
-7.0710678118654755
-"""
-
-
-def magnitude(x):
- sum = 0
- for i in range(len(x)):
- sum += x[i] * x[i]
- return sum ** (1/2)
-
-
-if __name__ == "__main__":
- import doctest
- doctest.testmod()
\ No newline at end of file
diff --git a/cadenas/01a.py b/cadenas/01a.py
deleted file mode 100644
index 4fb2c80..0000000
--- a/cadenas/01a.py
+++ /dev/null
@@ -1,25 +0,0 @@
-"""
-Ejercicio 01a
-
-Escribir funciones que dada una cadena de caracteres:
-
-a) Retorne los dos primeros caracteres.
-
-### TESTS
-
->>> cad = 'En un lugar de la Mancha de cuyo nombre no quiero acordarme'
->>> dos(cad)
-'En'
-
->>> dos('Esta es una cadena')
-'Es'
-"""
-
-
-def dos(cad):
- return cad[:2]
-
-
-if __name__ == '__main__':
- import doctest
- doctest.testmod()
diff --git a/cadenas/01b.py b/cadenas/01b.py
deleted file mode 100644
index b80b0f2..0000000
--- a/cadenas/01b.py
+++ /dev/null
@@ -1,27 +0,0 @@
-"""
-Ejercicio 01b
-
-Escribir funciones que dada una cadena de caracteres:
-
-cad = "En un lugar de la Mancha de cuyo nombre no quiero acordarme"
-
-b) Imprima los tres últimos caracteres.
-
-### TESTS
-
->>> cad = 'En un lugar de la Mancha de cuyo nombre no quiero acordarme'
->>> tres(cad)
-'rme'
-
->>> tres('Rosa ha vuelto de la oscuridad')
-'dad'
-"""
-
-
-def tres(cad):
- return(cad[-3:])
-
-
-if __name__ == '__main__':
- import doctest
- doctest.testmod()
diff --git a/cadenas/01c.py b/cadenas/01c.py
deleted file mode 100644
index a4e1090..0000000
--- a/cadenas/01c.py
+++ /dev/null
@@ -1,37 +0,0 @@
-"""
-Ejercicio 01c
-
-Escribir funciones que dada una cadena de caracteres:
-
-cad = "En un lugar de la Mancha de cuyo nombre no quiero acordarme"
-
-c) Retorne dicha cadena cada dos caracteres. Ej.: "recta" imprime "rca"
-
-### TESTS
-
->>> cad = 'En un lugar de la Mancha de cuyo nombre no quiero acordarme'
->>> cada_dos(cad)
-'E nlgrd aMnh ecy oben ueoaodre'
-
->>> cada_dos("recta")
-'rca'
-
->>> cada_dos_2(cad)
-'E nlgrd aMnh ecy oben ueoaodre'
-"""
-
-
-def cada_dos(cad):
- cadena = ""
- for i in range(0, len(cad), 2):
- cadena += cad[i]
- return(cadena)
-
-
-def cada_dos_2(cad):
- return(cad[::2])
-
-
-if __name__ == '__main__':
- import doctest
- doctest.testmod()
diff --git a/cadenas/01d.py b/cadenas/01d.py
deleted file mode 100644
index f90ca85..0000000
--- a/cadenas/01d.py
+++ /dev/null
@@ -1,40 +0,0 @@
-"""
-Ejercicio 01d
-
-Escribir funciones que dada una cadena de caracteres:
-
-cad = "En un lugar de la Mancha de cuyo nombre no quiero acordarme"
-
-d) Retorne dicha cadena en sentido inverso.
-
-Ej.: '¡Hola mundo!' debe imprimir '!odnum aloH¡'
-
-### TESTS
-
->>> cad = 'En un lugar de la Mancha de cuyo nombre no quiero acordarme'
->>> inversa(cad)
-'emradroca oreiuq on erbmon oyuc ed ahcnaM al ed ragul nu nE'
-
->>> inversa("¡Hola mundo!")
-'!odnum aloH¡'
-
->>> inversa_2(cad)
-'emradroca oreiuq on erbmon oyuc ed ahcnaM al ed ragul nu nE'
-
-"""
-
-
-def inversa(cad):
- salida = ""
- for i in range(len(cad)-1, -1, -1):
- salida += cad[i]
- return(salida)
-
-
-def inversa_2(cad):
- return(cad[::-1])
-
-
-if __name__ == '__main__':
- import doctest
- doctest.testmod()
diff --git a/cadenas/01e.py b/cadenas/01e.py
deleted file mode 100644
index 066d075..0000000
--- a/cadenas/01e.py
+++ /dev/null
@@ -1,42 +0,0 @@
-"""
-Ejercicio 01e
-
-Escribir funciones que dada una cadena de caracteres:
-
-
-e) Imprima la cadena en un sentido y en sentido inverso.
-
-Ej: reflejo imprime reflejoojelfer.
-
-### TESTS
-
->>> cad = "En un lugar de la Mancha"
->>> reflejo(cad)
-'En un lugar de la ManchaahcnaM al ed ragul nu nE'
->>> reflejo('reflejo')
-'reflejoojelfer'
->>> reflejo_2('reflejo')
-'reflejoojelfer'
-"""
-
-
-def reflejo(cad):
- salida = cad
- for i in range(len(cad)-1, -1, -1):
- salida += cad[i]
- return(salida)
-
-
-def reflejo_2(cad):
- return(cad + cad[::-1])
-
-
-cad = "En un lugar de la Mancha de cuyo nombre no quiero acordarme"
-reflejo(cad)
-reflejo("reflejo")
-reflejo_2("reflejo")
-
-
-if __name__ == '__main__':
- import doctest
- doctest.testmod()
diff --git a/cadenas/02a.py b/cadenas/02a.py
deleted file mode 100644
index 9fdcc02..0000000
--- a/cadenas/02a.py
+++ /dev/null
@@ -1,54 +0,0 @@
-"""
-Ejercicio 02a
-
-Escribir funciones que dada una cadena y un carácter:
-
-a) Inserte el carácter entre cada letra de la cadena. Ej: separar y , debería
-devolver s,e,p,a,r,a,r
-
-### TESTS
-
->>> cad = "En un lugar de la Mancha"
-
->>> separar(cad)
-'E,n, ,u,n, ,l,u,g,a,r, ,d,e, ,l,a, ,M,a,n,c,h,a'
-
->>> separar2(cad, 0)
-'En un lugar de la Mancha'
-
->>> separar2(cad, 24)
-'E,n, ,u,n, ,l,u,g,a,r, ,d,e, ,l,a, ,M,a,n,c,h,a'
-
->>> separar2(cad, 100)
-'E,n, ,u,n, ,l,u,g,a,r, ,d,e, ,l,a, ,M,a,n,c,h,a'
-
->>> separar2("separar", 2)
-'s,e,parar'
-"""
-
-
-def separar(cad):
- salida = ""
- for letra in cad:
- salida += letra + ","
- return salida[:-1]
-
-
-def separar2(cad, rmax):
- if rmax == 0:
- return cad
- salida = ""
- rep = 0
- for i in range(len(cad)-1):
- salida = salida + cad[i] + ","
- rep += 1
- if rep == rmax:
- salida = salida + cad[i+1:]
- return salida
- salida += cad[len(cad)-1]
- return salida
-
-
-if __name__ == '__main__':
- import doctest
- doctest.testmod()
diff --git a/cadenas/02b.py b/cadenas/02b.py
deleted file mode 100644
index d95ade0..0000000
--- a/cadenas/02b.py
+++ /dev/null
@@ -1,57 +0,0 @@
-"""
-Ejercicio 02b
-
-Escribir funciones que dada una cadena y un carácter:
-
-b) Reemplace todos los espacios por el carácter. Ej: mi archivo de texto.txt y
-_ debería devolver mi_archivo_de_texto.txt
-
-### TESTS
-
->>> cad = 'En un lugar de la Mancha'
->>> cambiar(cad, "_")
-'En_un_lugar_de_la_Mancha'
-
->>> cambiar2(cad, "_", 0)
-'En un lugar de la Mancha'
-
->>> cambiar2(cad, "_", 100)
-'En_un_lugar_de_la_Mancha'
-
->>> cambiar2(cad, "_", 2)
-'En_un_lugar de la Mancha'
-
-"""
-
-
-def cambiar(cad, car):
- salida = ""
- for letra in cad:
- if letra == " ":
- salida += car
- else:
- salida += letra
- return salida
-
-
-def cambiar2(cad, car, rmax):
- if rmax == 0:
- return cad
- salida = ""
- rep = 0
- long = len(cad)
- for i in range(long):
- if cad[i] == " ":
- salida += car
- rep += 1
- if rep == rmax:
- salida += cad[i+1:]
- break
- else:
- salida += cad[i]
- return salida
-
-
-if __name__ == '__main__':
- import doctest
- doctest.testmod()
diff --git a/cadenas/02c.py b/cadenas/02c.py
deleted file mode 100644
index 34181b2..0000000
--- a/cadenas/02c.py
+++ /dev/null
@@ -1,53 +0,0 @@
-"""
-Ejercicio 02b
-
-Escribir funciones que dada una cadena y un carácter:
-
-c) Reemplace todos los dígitos en la cadena por el carácter "X".
-Ej: su clave es: 1540 y X debería devolver su clave es: XXXX
-
-### TESTS
-
->>> cambiar_x("su clave es: 1540")
-'su clave es: XXXX'
->>> cambiar_x2("su clave es: 1540", 0)
-'su clave es: 1540'
->>> cambiar_x2("su clave es: 1540", 2)
-'su clave es: XX40'
->>> cambiar_x2("su clave es: 1540", 10)
-'su clave es: XXXX'
-"""
-
-
-def cambiar_x(cad):
- salida = ""
- digitos = "0123456789"
- for letra in cad:
- if letra in digitos:
- salida += "X"
- else:
- salida += letra
- return salida
-
-
-def cambiar_x2(cad, rmax):
- if rmax == 0:
- return cad
- salida = ""
- rep = 0
- digitos = "0123456789"
- for i in range(len(cad)):
- if cad[i] in digitos:
- salida += "X"
- rep += 1
- if rep == rmax:
- salida += cad[i+1:]
- break
- else:
- salida += cad[i]
- return salida
-
-
-if __name__ == '__main__':
- import doctest
- doctest.testmod()
diff --git a/cadenas/02d.py b/cadenas/02d.py
deleted file mode 100644
index d3c54fe..0000000
--- a/cadenas/02d.py
+++ /dev/null
@@ -1,109 +0,0 @@
-"""
-Ejercicio 02d
-
-Escribir funciones que dada una cadena y un carácter:
-
-d) Inserte el carácter cada 3 dígitos en la cadena.
-Ej. 2552552550 y . debería devolver 255.255.255.0
-
-### TESTS
-
->>> puntos("", ".")
-''
->>> puntos("2", ".")
-'2'
->>> puntos("25", ".")
-'25'
->>> puntos("255", ".")
-'255'
->>> puntos("2552552550", ".")
-'255.255.255.0'
->>> puntos("25525525525", ".")
-'255.255.255.25'
->>> puntos("255255255255", ".")
-'255.255.255.255'
-
->>> puntos2("", ".", 1)
-''
->>> puntos2("2", ".", 1)
-'2'
->>> puntos2("25", ".", 1)
-'25'
->>> puntos2("255", ".", 1)
-'255'
->>> puntos2("2552552550", ".", 1)
-'255.2552550'
->>> puntos2("25525525525", ".", 1)
-'255.25525525'
->>> puntos2("255255255255", ".", 1)
-'255.255255255'
-
->>> puntos2("", ".", 3)
-''
->>> puntos2("2", ".", 3)
-'2'
->>> puntos2("25", ".", 3)
-'25'
->>> puntos2("255", ".", 3)
-'255'
->>> puntos2("2552552550", ".", 3)
-'255.255.255.0'
->>> puntos2("25525525525", ".", 3)
-'255.255.255.25'
->>> puntos2("255255255255", ".", 3)
-'255.255.255.255'
-
->>> puntos2("", ".", 7)
-''
->>> puntos2("2", ".", 7)
-'2'
->>> puntos2("25", ".", 7)
-'25'
->>> puntos2("255", ".", 7)
-'255'
->>> puntos2("2552552550", ".", 7)
-'255.255.255.0'
->>> puntos2("25525525525", ".", 7)
-'255.255.255.25'
->>> puntos2("255255255255", ".", 7)
-'255.255.255.255'
-"""
-
-
-def puntos(cad, car):
- if cad == "":
- return cad
- salida = ""
- numero_puntos = len(cad)//3
- for veces in range(numero_puntos):
- for trio in range(3):
- salida += cad[veces*3 + trio]
- salida += car
- salida += cad[numero_puntos*3:]
- if salida[-1] == car:
- salida = salida[:-1]
- return salida
-
-
-def puntos2(cad, car, rmax):
- if rmax == 0 or cad == "":
- return cad
- salida = ""
- long = len(cad)
- if rmax > long//3:
- numero_puntos = long//3
- else:
- numero_puntos = rmax
- for veces in range(numero_puntos):
- for trio in range(3):
- salida += cad[veces*3 + trio]
- salida += car
- salida += cad[numero_puntos*3:]
- if salida[-1] == car:
- return salida[:-1]
- return salida
-
-
-if __name__ == '__main__':
- import doctest
- doctest.testmod()
diff --git a/cadenas/03.py b/cadenas/03.py
deleted file mode 100644
index 1e091c2..0000000
--- a/cadenas/03.py
+++ /dev/null
@@ -1,8 +0,0 @@
-"""
-Ejercicio 3
-
-Modificar las funciones anteriores, para que reciban un parámetro que indique
-la cantidad máxima de reemplazos o inserciones a realizar.
-"""
-
-# Ver versión 2 de cada una de ellas en las soluciones anteriores
diff --git a/cadenas/04.py b/cadenas/04.py
deleted file mode 100644
index 75916fe..0000000
--- a/cadenas/04.py
+++ /dev/null
@@ -1,72 +0,0 @@
-"""
-Ejercicio 4
-
-Escribir una función que reciba una cadena que contiene un largo número entero
-y devuelva una cadena con el número y las separaciones de miles. Por ejemplo,
-si recibe 1234567890, debe devolver 1.234.567.890
-
-### TESTS
-
->>> puntua("1234567890")
-'1.234.567.890'
-
->>> puntua1("1234567890")
-'1.234.567.890'
-
->>> puntua2("1234567890")
-'1.234.567.890'
-
->>> puntua3("1234567890")
-'1.234.567.890'
-
-"""
-
-import locale
-
-
-def puntua(cad):
- """DocString
- """
- long = len(cad)
- primeros = long % 3
- if primeros > 0:
- salida = cad[0:primeros]+"."
- else:
- salida = ""
- for i in range(0, (long//3)*3, 3):
- salida = salida + cad[primeros+i:primeros+i+3] + "."
- return salida[:-1]
-
-
-def puntua1(cad):
- """DocString
- """
- try:
- return '{0:,}'.format(int(cad)).replace(",", ".")
- except TypeError:
- return -1
-
-
-def puntua2(cad):
- """DocString
- """
- locale.setlocale(locale.LC_ALL, '')
- try:
- return locale.format_string("%d", int(cad), grouping=True)
- except TypeError:
- return -1
-
-
-def puntua3(cad):
- """DocString
- """
- locale.setlocale(locale.LC_ALL, '')
- try:
- return '{:n}'.format(int(cad))
- except TypeError:
- return -1
-
-
-if __name__ == '__main__':
- import doctest
- doctest.testmod()
diff --git a/cadenas/05a.py b/cadenas/05a.py
deleted file mode 100644
index 4fb7bfa..0000000
--- a/cadenas/05a.py
+++ /dev/null
@@ -1,60 +0,0 @@
-"""
-Ejercicio 5a
-
-Escribir una función que dada una cadena de caracteres, devuelva:
-
-a) La primera letra de cada palabra. Por ejemplo, si recibe Universal Serial
-Bus debe devolver USB.
-
-### TESTS
-
->>> siglas1(" Universal Serial Bus ")
-'USB'
->>> siglas2(" Universal Serial Bus ")
-'USB'
->>> siglas3(" Universal Serial Bus ")
-'USB'
-"""
-
-
-def siglas1(cad):
- if cad == '':
- return ''
- cad = " " + cad.strip()
- sig = ""
- i = 0
- while i != -1:
- i += 1
- if cad[i] != " ":
- sig = sig + cad[i]
- i = cad.find(" ", i)
- return sig
-
-
-def siglas2(cad):
- if cad == '':
- return ''
- cad = " " + cad.strip()
- sig = ""
- i = 0
- while i != -1:
- cad = cad[i+1:]
- if cad[0] != " ":
- sig = sig + cad[0]
- i = cad.find(" ")
- return sig
-
-
-def siglas3(cad):
- if cad == '':
- return ''
- palabras = cad.split()
- sig = ''
- for palabra in palabras:
- sig = sig + palabra[0]
- return sig
-
-
-if __name__ == '__main__':
- import doctest
- doctest.testmod()
diff --git a/cadenas/05b.py b/cadenas/05b.py
deleted file mode 100644
index 703deb6..0000000
--- a/cadenas/05b.py
+++ /dev/null
@@ -1,32 +0,0 @@
-"""
-Ejercicio 5a
-
-Escribir una función que dada una cadena de caracteres, devuelva:
-
-b) Dicha cadena con la primera letra de cada palabra en mayúsculas. Por
-ejemplo, si recibe 'república argentina' debe devolver 'República Argentina'.
-
-### TESTS
-
->>> mayus('La confianza pública en ellos tendrá que ser destruida '\
- 'completamente para acabar realmente con ellos')
-'La Confianza Pública En Ellos Tendrá Que Ser Destruida Completamente\
- Para Acabar Realmente Con Ellos'
-"""
-
-
-def mayus(cad):
- cad = cad.strip() + " "
- sig = ""
- i = cad.find(" ")
- while i != -1:
- if i != 0:
- sig = sig + cad[0:i].capitalize() + " "
- cad = cad[i+1:]
- i = cad.find(" ")
- return sig[:-1]
-
-
-if __name__ == '__main__':
- import doctest
- doctest.testmod()
\ No newline at end of file
diff --git a/cadenas/05c.py b/cadenas/05c.py
deleted file mode 100644
index 77c2e46..0000000
--- a/cadenas/05c.py
+++ /dev/null
@@ -1,44 +0,0 @@
-"""
-Ejercicio 5c
-
-Escribir una función que dada una cadena de caracteres, devuelva:
-
-c) Las palabras que comiencen con la letra A. Por ejemplo, si recibe "Antes de
-ayer" debe devolver "Antes ayer".
-
-### TESTS
-
->>> aes(" Antes de fdfff Antonio ayer ")
-'Antes Antonio ayer'
-
->>> aes_2(" Antes de fdfff Antonio ayer ")
-'Antes Antonio ayer'
-"""
-
-
-def aes(cad):
- cad = " " + cad.strip() + " "
- i = cad.find(" ")
- sig = ""
- while i != -1:
- cad = cad[1:]
- encontrado = cad.find(" ")
- if (encontrado != -1) and (cad[0] in "aAáÁ"):
- sig = sig + cad[0:encontrado] + " "
- cad = cad[encontrado:]
- i = cad.find(" ")
- return sig[:-1]
-
-
-def aes_2(cad):
- palabras = cad.split()
- salida = ''
- for palabra in palabras:
- if palabra[0] in 'aAáÁ':
- salida += ' ' + palabra
- return salida[1:]
-
-
-if __name__ == '__main__':
- import doctest
- doctest.testmod()
diff --git a/cadenas/06a.py b/cadenas/06a.py
deleted file mode 100644
index 95e493d..0000000
--- a/cadenas/06a.py
+++ /dev/null
@@ -1,26 +0,0 @@
-"""
-Ejercicio 6a
-
-Escribir funciones que dada una cadena de caracteres:
-
-a) Devuelva solamente las letras consonantes. Por ejemplo, si recibe
-'Algoritmos o logaritmos' debe devolver 'lgrtms lgrtms'.
-
-### TESTS
-
->>> consonantes('Algoritmos o logaritmos')
-'lgrtms lgrtms'
-"""
-
-
-def consonantes(cad):
- consonante = ""
- for letra in cad:
- if letra not in "aeiouAEIOUáéíóúÁÉÍÓÚ":
- consonante += letra
- return consonante
-
-
-if __name__ == '__main__':
- import doctest
- doctest.testmod()
diff --git a/cadenas/06b.py b/cadenas/06b.py
deleted file mode 100644
index 3591ba1..0000000
--- a/cadenas/06b.py
+++ /dev/null
@@ -1,26 +0,0 @@
-"""
-Ejercicio 6b
-
-Escribir funciones que dada una cadena de caracteres:
-
-b) Devuelva solamente las letras vocales. Por ejemplo, si recibe "sin
-consonantes" debe devolver "i ooae".
-
-### TESTS
-
->>> vocales("Sin consonantes murciélago Guadalajara San Sebastián")
-'i ooae uiéao uaaaaa a eaiá'
-"""
-
-
-def vocales(cad):
- consonantes = ""
- for letra in cad:
- if letra in "aeiouáéíóúAEIOUÁÉÍÓÚ ":
- consonantes += letra
- return consonantes
-
-
-if __name__ == '__main__':
- import doctest
- doctest.testmod()
diff --git a/cadenas/06c.py b/cadenas/06c.py
deleted file mode 100644
index 4f8cf04..0000000
--- a/cadenas/06c.py
+++ /dev/null
@@ -1,33 +0,0 @@
-"""
-Ejercicio 6c
-
-Escribir funciones que dada una cadena de caracteres:
-
-c) Reemplace cada vocal por su siguiente vocal. Por ejemplo, si recibe
-'vestuario' debe devolver 'vistaerou'.
-
-
-### TESTS
-
->>> revocaliza('vestuario')
-'vistaerou'
-
->>> revocaliza('vestUariO')
-'vistAeroU'
-"""
-
-
-def revocaliza(cad):
- revoca = ""
- voc = "aeiouaAEIOUA"
- for car in cad:
- if car in "aeiouAEIOU":
- revoca += voc[voc.find(car)+1]
- else:
- revoca += car
- return revoca
-
-
-if __name__ == '__main__':
- import doctest
- doctest.testmod()
diff --git a/cadenas/06d.py b/cadenas/06d.py
deleted file mode 100644
index 00961f0..0000000
--- a/cadenas/06d.py
+++ /dev/null
@@ -1,44 +0,0 @@
-"""
-Ejercicio 6d
-
-Escribir funciones que dada una cadena de caracteres:
-d) Indique si se trata de un palíndromo. Por ejemplo, anita lava la tina es un
-palíndromo (se lee igual de izquierda a derecha que de derecha a izquierda).
-
-### TESTS
-
->>> palindromo('el bar es iman o zona miserable')
-True
-
->>> palindromo('anytalava la tina')
-False
-
->>> palindromo_2('antalava la tina')
-False
-
->>> palindromo_2('anita la gorda lagartona no traga la droga latina')
-True
-"""
-
-
-def palindromo(cad):
- cad_limpia = ""
- for car in cad:
- if car != " ":
- cad_limpia += car
- tramo1 = len(cad_limpia)//2
- tramo2 = tramo1 - (len(cad_limpia)+1) % 2
- return cad_limpia[:tramo1] == cad_limpia[:tramo2:-1]
-
-
-def palindromo_2(cad):
- cad_limpia = ""
- for car in cad:
- if car != " ":
- cad_limpia += car
- return cad_limpia == cad_limpia[::-1]
-
-
-if __name__ == '__main__':
- import doctest
- doctest.testmod()
diff --git a/cadenas/07a.py b/cadenas/07a.py
deleted file mode 100644
index 694cf31..0000000
--- a/cadenas/07a.py
+++ /dev/null
@@ -1,36 +0,0 @@
-"""
-Ejercicio 7a
-
-Escribir funciones que dadas dos cadenas de caracteres:
-
-a) Indique si la segunda cadena es una subcadena de la primera. Por ejemplo,
-"cadena" es una subcadena de "subcadena".
-
-### TESTS
-
->>> subcadena("subcadena", "cadena")
-True
-
->>> subcadena("subcalena", "cadena")
-False
-
->>> subcadena_2("subcadena", "cadena")
-True
-
->>> subcadena_2("subcalena", "cadena")
-False
-
-"""
-
-
-def subcadena(cad, subcad):
- return cad.find(subcad) != -1
-
-
-def subcadena_2(cad, subcad):
- return subcad in cad
-
-
-if __name__ == '__main__':
- import doctest
- doctest.testmod()
diff --git a/cadenas/07b.py b/cadenas/07b.py
deleted file mode 100644
index 2743240..0000000
--- a/cadenas/07b.py
+++ /dev/null
@@ -1,28 +0,0 @@
-"""
-Ejercicio 7a
-
-Escribir funciones que dadas dos cadenas de caracteres:
-
-b) Devuelva la que sea anterior en orden alfábetico. Por ejemplo, si recibe
-"kde" y "gnome" debe devolver "gnome".
-
-### TESTS
-
->>> alfa("kde", "gnome")
-'gnome'
-
->>> alfa('Sole', 'Fran')
-'Fran'
-"""
-
-
-def alfa(cad1, cad2):
- if cad1 < cad2:
- return cad1
- else:
- return cad2
-
-
-if __name__ == '__main__':
- import doctest
- doctest.testmod()
diff --git a/cadenas/08.py b/cadenas/08.py
deleted file mode 100644
index 929e9d3..0000000
--- a/cadenas/08.py
+++ /dev/null
@@ -1,25 +0,0 @@
-"""
-Ejercicio 8
-
-Escribir una función que reciba una cadena de unos y ceros (es decir, un
-número en representación binaria) y devuelva el valor decimal correspondiente.
-
-### TESTS
-
->>> bin_to_dec("11000100")
-196
-"""
-
-
-def bin_to_dec(num):
- dec = 0
- for car in num:
- dec *= 2
- if car == "1":
- dec += 1
- return dec
-
-
-if __name__ == '__main__':
- import doctest
- doctest.testmod()
diff --git a/cadenas/cadenas.ipynb b/cadenas/cadenas.ipynb
deleted file mode 100644
index ba89a3e..0000000
--- a/cadenas/cadenas.ipynb
+++ /dev/null
@@ -1,1064 +0,0 @@
-{
- "cells": [
- {
- "cell_type": "markdown",
- "metadata": {},
- "source": [
- "## Ejercicios de Cadenas"
- ]
- },
- {
- "cell_type": "markdown",
- "metadata": {},
- "source": [
- "Ejercicio 6.8.1. Escribir funciones que dada una cadena de caracteres:"
- ]
- },
- {
- "cell_type": "code",
- "execution_count": null,
- "metadata": {},
- "outputs": [
- {
- "evalue": "Error: Jupyter cannot be started. Error attempting to locate jupyter: Error: Module 'notebook' not installed.",
- "output_type": "error"
- }
- ],
- "source": [
- "cad = \"En un lugar de la Mancha de cuyo nombre no quiero acordarme\""
- ]
- },
- {
- "cell_type": "code",
- "execution_count": null,
- "metadata": {},
- "outputs": [],
- "source": []
- },
- {
- "cell_type": "markdown",
- "metadata": {},
- "source": [
- "a) Imprima los dos primeros caracteres."
- ]
- },
- {
- "cell_type": "code",
- "execution_count": null,
- "metadata": {
- "collapsed": true
- },
- "outputs": [],
- "source": [
- "def dos(cad):\n",
- " \"\"\" DocString\n",
- " \"\"\"\n",
- " print(cad[:2])\n"
- ]
- },
- {
- "cell_type": "code",
- "execution_count": null,
- "metadata": {
- "collapsed": false
- },
- "outputs": [],
- "source": [
- "dos(cad)"
- ]
- },
- {
- "cell_type": "markdown",
- "metadata": {},
- "source": [
- "b) Imprima los tres últimos caracteres."
- ]
- },
- {
- "cell_type": "code",
- "execution_count": null,
- "metadata": {
- "collapsed": true
- },
- "outputs": [],
- "source": [
- "def tres(cad):\n",
- " \"\"\" DocString\n",
- " \"\"\"\n",
- " print(cad[-3:])\n"
- ]
- },
- {
- "cell_type": "code",
- "execution_count": null,
- "metadata": {
- "collapsed": false
- },
- "outputs": [],
- "source": [
- "tres(cad)"
- ]
- },
- {
- "cell_type": "markdown",
- "metadata": {},
- "source": [
- "c) Imprima dicha cadena cada dos caracteres. Ej.: recta debería imprimir rca"
- ]
- },
- {
- "cell_type": "code",
- "execution_count": null,
- "metadata": {
- "collapsed": true
- },
- "outputs": [],
- "source": [
- "def cada_dos(cad):\n",
- " \"\"\" DocString\n",
- " \"\"\"\n",
- " cadena = \"\"\n",
- " for i in range(0, len(cad), 2):\n",
- " cadena += cad[i]\n",
- " print(cadena)\n",
- " \n",
- "def cada_dos_2(cad):\n",
- " \"\"\" DocString\n",
- " \"\"\"\n",
- " print(cad[::2])\n",
- "\n",
- " "
- ]
- },
- {
- "cell_type": "code",
- "execution_count": null,
- "metadata": {
- "collapsed": false
- },
- "outputs": [],
- "source": [
- "cada_dos(cad)\n",
- "cada_dos(\"recta\")\n",
- "cada_dos_2(cad)"
- ]
- },
- {
- "cell_type": "markdown",
- "metadata": {},
- "source": [
- "d) Dicha cadena en sentido inverso. Ej.: ¡Hola mundo! debe imprimir !odnum aloH¡"
- ]
- },
- {
- "cell_type": "code",
- "execution_count": null,
- "metadata": {
- "collapsed": true
- },
- "outputs": [],
- "source": [
- "def inversa(cad):\n",
- " \"\"\" DocString\n",
- " \"\"\"\n",
- " salida = \"\"\n",
- " for i in range(len(cad)-1, -1, -1):\n",
- " salida += cad[i]\n",
- " print(salida)\n",
- "\n",
- "def inversa_2(cad):\n",
- " \"\"\" DocString\n",
- " \"\"\"\n",
- " print(cad[::-1])"
- ]
- },
- {
- "cell_type": "code",
- "execution_count": null,
- "metadata": {
- "collapsed": false
- },
- "outputs": [],
- "source": [
- "inversa(cad)\n",
- "inversa(\"¡Hola mundo!\")\n",
- "inversa_2(cad)"
- ]
- },
- {
- "cell_type": "markdown",
- "metadata": {},
- "source": [
- "e) Imprima la cadena en un sentido y en sentido inverso. Ej: reflejo imprime reflejoojelfer."
- ]
- },
- {
- "cell_type": "code",
- "execution_count": null,
- "metadata": {
- "collapsed": true
- },
- "outputs": [],
- "source": [
- "def reflejo(cad):\n",
- " \"\"\" DocString\n",
- " \"\"\"\n",
- " salida = cad\n",
- " for i in range(len(cad)-1, -1, -1):\n",
- " salida += cad[i]\n",
- " print(salida)\n",
- "\n",
- "def reflejo_2(cad):\n",
- " \"\"\" DocString\n",
- " \"\"\"\n",
- " print(cad + cad[::-1])\n"
- ]
- },
- {
- "cell_type": "code",
- "execution_count": null,
- "metadata": {
- "collapsed": false
- },
- "outputs": [],
- "source": [
- "reflejo(cad)\n",
- "reflejo(\"reflejo\")\n",
- "reflejo_2(\"reflejo\")"
- ]
- },
- {
- "cell_type": "markdown",
- "metadata": {},
- "source": [
- "Ejercicio 6.8.2. Escribir funciones que dada una cadena y un caracter:"
- ]
- },
- {
- "cell_type": "markdown",
- "metadata": {},
- "source": [
- "a) Inserte el caracter entre cada letra de la cadena. Ej: separar y , debería devolver s,e,p,a,r,a,r"
- ]
- },
- {
- "cell_type": "code",
- "execution_count": null,
- "metadata": {
- "collapsed": false
- },
- "outputs": [],
- "source": [
- "def separar(cad):\n",
- " \"\"\" DocString\n",
- " \"\"\"\n",
- " salida = \"\"\n",
- " for letra in cad:\n",
- " salida = salida + letra + \",\"\n",
- " return salida[:len(salida)-1]\n",
- "\n",
- "def separar2(cad, rmax):\n",
- " \"\"\" DocString\n",
- " \"\"\"\n",
- " if rmax == 0:\n",
- " return cad\n",
- " salida = \"\"\n",
- " rep = 0\n",
- " for i in range(len(cad)-1):\n",
- " salida = salida + cad[i] + \",\"\n",
- " rep += 1\n",
- " if rep == rmax:\n",
- " salida = salida + cad[i+1:]\n",
- " return salida\n",
- " salida += cad[len(cad)-1]\n",
- " return salida"
- ]
- },
- {
- "cell_type": "code",
- "execution_count": null,
- "metadata": {
- "collapsed": false
- },
- "outputs": [],
- "source": [
- "print(separar(cad))\n",
- "print(separar2(cad,0))\n",
- "print(separar2(cad,57))\n",
- "print(separar2(cad,100))\n",
- "print(separar2(\"separar\",2))"
- ]
- },
- {
- "cell_type": "code",
- "execution_count": null,
- "metadata": {},
- "outputs": [],
- "source": []
- },
- {
- "cell_type": "markdown",
- "metadata": {},
- "source": [
- "b) Reemplace todos los espacios por el carácter. Ej: mi archivo de texto.txt y \\_ debería devolver mi\\_archivo\\_de\\_texto.txt"
- ]
- },
- {
- "cell_type": "code",
- "execution_count": null,
- "metadata": {
- "collapsed": true
- },
- "outputs": [],
- "source": [
- "def cambiar(cad, car):\n",
- " \"\"\"DocString\n",
- " \"\"\"\n",
- " salida = \"\"\n",
- " for letra in cad:\n",
- " if letra == \" \":\n",
- " salida += car\n",
- " else:\n",
- " salida += letra\n",
- " return salida\n",
- "\n",
- "\n",
- "\n",
- "def cambiar2(cad, car, rmax):\n",
- " \"\"\"DocString\n",
- " \"\"\"\n",
- " if rmax == 0:\n",
- " return cad\n",
- " salida = \"\"\n",
- " rep = 0\n",
- " long = len(cad)\n",
- " for i in range(long):\n",
- " if cad[i] == \" \":\n",
- " salida += car\n",
- " rep += 1\n",
- " if rep == rmax:\n",
- " salida += cad[i+1:]\n",
- " break\n",
- " else:\n",
- " salida += cad[i]\n",
- " return salida\n"
- ]
- },
- {
- "cell_type": "code",
- "execution_count": null,
- "metadata": {
- "collapsed": false
- },
- "outputs": [],
- "source": [
- "print(cambiar(cad,\"_\"))\n",
- "print(cambiar2(cad,\"_\",0))\n",
- "print(cambiar2(cad,\"_\",100))\n",
- "print(cambiar2(cad,\"_\",2))"
- ]
- },
- {
- "cell_type": "code",
- "execution_count": null,
- "metadata": {},
- "outputs": [],
- "source": []
- },
- {
- "cell_type": "markdown",
- "metadata": {},
- "source": [
- "c) Reemplace todos los dígitos en la cadena por el carácter. Ej: su clave es: 1540 y X debería devolver su clave es: XXXX"
- ]
- },
- {
- "cell_type": "code",
- "execution_count": null,
- "metadata": {
- "collapsed": true
- },
- "outputs": [],
- "source": [
- "def cambiar_x(cad):\n",
- " \"\"\"DocString\n",
- " \"\"\"\n",
- " salida = \"\"\n",
- " digitos = \"0123456789\"\n",
- " for letra in cad:\n",
- " if letra in digitos:\n",
- " salida += \"X\"\n",
- " else:\n",
- " salida += letra\n",
- " return salida\n",
- "\n",
- "def cambiar_x2(cad, rmax):\n",
- " \"\"\"DocString\n",
- " \"\"\"\n",
- " if rmax == 0:\n",
- " return cad\n",
- " salida = \"\"\n",
- " rep = 0\n",
- " digitos = \"0123456789\"\n",
- " for i in range(len(cad)):\n",
- " if cad[i] in digitos:\n",
- " salida += \"X\"\n",
- " rep += 1\n",
- " if rep == rmax:\n",
- " salida += cad[i+1:]\n",
- " break\n",
- " else:\n",
- " salida += cad[i]\n",
- " return salida"
- ]
- },
- {
- "cell_type": "code",
- "execution_count": null,
- "metadata": {
- "collapsed": false
- },
- "outputs": [],
- "source": [
- "print(cambiar_x(\"su clave es: 1540\"))\n",
- "print(cambiar_x2(\"su clave es: 1540\",0))\n",
- "print(cambiar_x2(\"su clave es: 1540\",2))\n",
- "print(cambiar_x2(\"su clave es: 1540\",10))"
- ]
- },
- {
- "cell_type": "markdown",
- "metadata": {},
- "source": [
- "d) Inserte el caracter cada 3 dígitos en la cadena. Ej. 2552552550 y . debería devolver 255.255.255.0"
- ]
- },
- {
- "cell_type": "code",
- "execution_count": null,
- "metadata": {
- "collapsed": false
- },
- "outputs": [],
- "source": [
- "def puntos(cad):\n",
- " \"\"\"DocString\n",
- " \"\"\"\n",
- " if cad == \"\":\n",
- " return cad\n",
- " salida = \"\"\n",
- " numero_puntos=len(cad)//3\n",
- " for veces in range(numero_puntos):\n",
- " for trio in range(3):\n",
- " salida += cad[veces*3+trio]\n",
- " salida += \".\"\n",
- " salida += cad[numero_puntos*3:]\n",
- " if salida[-1] == \".\":\n",
- " salida = salida[:-1] \n",
- " return salida\n",
- "\n",
- "def puntos2(cad,rmax):\n",
- " \"\"\"DocString\n",
- " \"\"\"\n",
- " if rmax == 0 or cad == \"\":\n",
- " return cad\n",
- " salida = \"\"\n",
- " long = len(cad)\n",
- " if rmax > long//3:\n",
- " numero_puntos = long//3\n",
- " else:\n",
- " numero_puntos = rmax\n",
- " for veces in range(numero_puntos):\n",
- " for trio in range(3):\n",
- " salida += cad[veces*3 + trio]\n",
- " salida += \".\" \n",
- " salida += cad[numero_puntos*3:]\n",
- " if salida[-1] == \".\":\n",
- " return salida[:-1]\n",
- " return salida"
- ]
- },
- {
- "cell_type": "code",
- "execution_count": null,
- "metadata": {
- "collapsed": false
- },
- "outputs": [],
- "source": [
- "print(puntos(\"\"))\n",
- "print(puntos(\"2\"))\n",
- "print(puntos(\"25\"))\n",
- "print(puntos(\"255\"))\n",
- "print(puntos(\"2552552550\"))\n",
- "print(puntos(\"25525525525\"))\n",
- "print(puntos(\"255255255255\"))\n",
- "\n",
- "print(puntos2(\"\",1))\n",
- "print(puntos2(\"2\",1))\n",
- "print(puntos2(\"25\",1))\n",
- "print(puntos2(\"255\",1))\n",
- "print(puntos2(\"2552552550\",1))\n",
- "print(puntos2(\"25525525525\",1))\n",
- "print(puntos2(\"255255255255\",1))\n",
- "\n",
- "print(puntos2(\"\",3))\n",
- "print(puntos2(\"2\",3))\n",
- "print(puntos2(\"25\",3))\n",
- "print(puntos2(\"255\",3))\n",
- "print(puntos2(\"2552552550\",3))\n",
- "print(puntos2(\"25525525525\",3))\n",
- "print(puntos2(\"255255255255\",3))\n",
- "\n",
- "print(puntos2(\"\",7))\n",
- "print(puntos2(\"2\",7))\n",
- "print(puntos2(\"25\",7))\n",
- "print(puntos2(\"255\",7))\n",
- "print(puntos2(\"2552552550\",7))\n",
- "print(puntos2(\"25525525525\",7))\n",
- "print(puntos2(\"255255255255\",7))"
- ]
- },
- {
- "cell_type": "markdown",
- "metadata": {},
- "source": [
- "Ejercicio 6.8.3. Modificar las funciones anteriores, para que reciban un parámetro que indique la cantidad máxima de reemplazos o inserciones a realizar."
- ]
- },
- {
- "cell_type": "markdown",
- "metadata": {
- "collapsed": true
- },
- "source": [
- "Ver versión 2 de cada una de ellas en las soluciones anteriores"
- ]
- },
- {
- "cell_type": "markdown",
- "metadata": {},
- "source": [
- "Ejercicio 6.8.4. Escribir una función que reciba una cadena que contiene un largo número entero y devuelva una cadena con el número y las separaciones de miles. Por ejemplo, si recibe 1234567890, debe devolver 1.234.567.890."
- ]
- },
- {
- "cell_type": "code",
- "execution_count": null,
- "metadata": {
- "collapsed": false
- },
- "outputs": [],
- "source": [
- "import locale\n",
- "\n",
- "def puntua1(cad):\n",
- " \"\"\"DocString\n",
- " \"\"\"\n",
- " try:\n",
- " return '{0:,}'.format(int(cad)).replace(\",\", \".\")\n",
- " except TypeError:\n",
- " return -1\n",
- "\n",
- "def puntua2(cad):\n",
- " \"\"\"DocString\n",
- " \"\"\"\n",
- " locale.setlocale(locale.LC_ALL, '')\n",
- " try:\n",
- " return locale.format(\"%d\", int(cad), grouping=True)\n",
- " except TypeError:\n",
- " return -1\n",
- "\n",
- "def puntua3(cad):\n",
- " \"\"\"DocString\n",
- " \"\"\"\n",
- " locale.setlocale(locale.LC_ALL, '')\n",
- " try:\n",
- " return '{:n}'.format(int(cad))\n",
- " except TypeError:\n",
- " return -1\n",
- "\n",
- "def puntua4(cad):\n",
- " \"\"\"DocString\n",
- " \"\"\"\n",
- " long = len(cad)\n",
- " primeros = long % 3\n",
- " if primeros > 0:\n",
- " salida = cad[0:primeros]+\".\"\n",
- " else:\n",
- " salida = \"\"\n",
- " for i in range(long//3):\n",
- " salida = salida + cad[primeros+i*3:primeros+i*3+3] + \".\"\n",
- " return salida[:-1]\n"
- ]
- },
- {
- "cell_type": "code",
- "execution_count": null,
- "metadata": {
- "collapsed": false,
- "scrolled": true
- },
- "outputs": [],
- "source": [
- "print(puntua1(\"1234567890\"))\n",
- "print(puntua2(\"1234567890\"))\n",
- "print(puntua3(\"1234567890\"))\n",
- "print(puntua4(\"1234567890\"))"
- ]
- },
- {
- "cell_type": "markdown",
- "metadata": {},
- "source": [
- "Ejercicio 6.8.5. Escribir una función que dada una cadena de caracteres, devuelva:"
- ]
- },
- {
- "cell_type": "markdown",
- "metadata": {},
- "source": [
- "a) La primera letra de cada palabra. Por ejemplo, si recibe Universal Serial Bus debe devolver USB."
- ]
- },
- {
- "cell_type": "code",
- "execution_count": null,
- "metadata": {
- "collapsed": true
- },
- "outputs": [],
- "source": [
- "def siglas1(cad):\n",
- " \"\"\" DocString\n",
- " \"\"\"\n",
- " cad = \" \" + cad.strip()\n",
- " sig = \"\"\n",
- " while True:\n",
- " i = cad.find(\" \")\n",
- " if i != -1:\n",
- " cad = cad[i+1:]\n",
- " if cad[0] == \" \":\n",
- " continue\n",
- " else:\n",
- " sig = sig + cad[0]\n",
- " else:\n",
- " return sig\n",
- "\n",
- "def siglas2(cad):\n",
- " \"\"\"DocString\n",
- " \"\"\"\n",
- " cad = \" \" + cad.strip()\n",
- " sig = \"\"\n",
- " i = cad.find(\" \")\n",
- " while i != -1:\n",
- " cad = cad[i+1:]\n",
- " if cad[0] != \" \":\n",
- " sig = sig + cad[0]\n",
- " i = cad.find(\" \")\n",
- " return sig"
- ]
- },
- {
- "cell_type": "code",
- "execution_count": null,
- "metadata": {
- "collapsed": false
- },
- "outputs": [],
- "source": [
- "print(siglas1(\" Universal Serial Bus \"))\n",
- "print(siglas2(\" Universal Serial Bus \"))"
- ]
- },
- {
- "cell_type": "markdown",
- "metadata": {},
- "source": [
- "b) Dicha cadena con la primera letra de cada palabra en mayúsculas. Por ejemplo, si recibe república argentina debe devolver República Argentina."
- ]
- },
- {
- "cell_type": "code",
- "execution_count": null,
- "metadata": {
- "collapsed": true
- },
- "outputs": [],
- "source": [
- "def mayus(cad):\n",
- " \"\"\"DocString\n",
- " \"\"\"\n",
- " cad = cad.strip()+ \" \"\n",
- " sig = \"\"\n",
- " i = cad.find(\" \")\n",
- " while i != -1:\n",
- " if i != 0:\n",
- " sig = sig + cad[0:i].capitalize() + \" \"\n",
- " cad = cad[i+1:]\n",
- " i = cad.find(\" \")\n",
- " return sig[:-1]"
- ]
- },
- {
- "cell_type": "code",
- "execution_count": null,
- "metadata": {
- "collapsed": false
- },
- "outputs": [],
- "source": [
- "print(mayus(\"La confianza pública en ellos tendrá que ser destruida completamente para acabar realmente con ellos\"))"
- ]
- },
- {
- "cell_type": "markdown",
- "metadata": {},
- "source": [
- "c) Las palabras que comiencen con la letra A. Por ejemplo, si recibe Antes de ayer debe devolver Antes ayer."
- ]
- },
- {
- "cell_type": "code",
- "execution_count": null,
- "metadata": {
- "collapsed": true
- },
- "outputs": [],
- "source": [
- "def aes(cad):\n",
- " \"\"\"DocString\"\"\"\n",
- " cad = \" \" + cad.strip() + \" \"\n",
- " i = cad.find(\" \")\n",
- " sig = \"\"\n",
- " while i != -1:\n",
- " cad = cad[1:]\n",
- " encontrado = cad.find(\" \")\n",
- " if (encontrado != -1) and (cad[0] in \"aA\"): \n",
- " sig = sig + cad[0:encontrado] + \" \"\n",
- " cad = cad[encontrado:]\n",
- " i = cad.find(\" \")\n",
- " return sig[:-1]"
- ]
- },
- {
- "cell_type": "code",
- "execution_count": null,
- "metadata": {
- "collapsed": false
- },
- "outputs": [],
- "source": [
- "print(aes(\" Antes de fdfff Antonio ayer \"))"
- ]
- },
- {
- "cell_type": "code",
- "execution_count": null,
- "metadata": {},
- "outputs": [],
- "source": []
- },
- {
- "cell_type": "markdown",
- "metadata": {},
- "source": [
- "Ejercicio 6.8.6. Escribir funciones que dada una cadena de caracteres:"
- ]
- },
- {
- "cell_type": "markdown",
- "metadata": {},
- "source": [
- "a) Devuelva solamente las letras consonantes. Por ejemplo, si recibe algoritmos o logaritmos debe devolver lgrtms."
- ]
- },
- {
- "cell_type": "code",
- "execution_count": null,
- "metadata": {
- "collapsed": true
- },
- "outputs": [],
- "source": [
- "def consonantes(cad):\n",
- " \"\"\"DocString\"\"\"\n",
- " consonante = \"\"\n",
- " for letra in cad:\n",
- " if letra not in \"aeiouAEIOU\":\n",
- " consonante += letra\n",
- " return consonante"
- ]
- },
- {
- "cell_type": "code",
- "execution_count": null,
- "metadata": {
- "collapsed": false
- },
- "outputs": [],
- "source": [
- "print(consonantes(\"Algoritmos, logaritmos\"))"
- ]
- },
- {
- "cell_type": "markdown",
- "metadata": {},
- "source": [
- "b) Devuelva solamente las letras vocales. Por ejemplo, si recibe sin consonantes debe devolver i ooae."
- ]
- },
- {
- "cell_type": "code",
- "execution_count": null,
- "metadata": {
- "collapsed": true
- },
- "outputs": [],
- "source": [
- "def vocales(cad):\n",
- " \"\"\"DocString\"\"\"\n",
- " consonantes = \"\"\n",
- " for letra in cad:\n",
- " if letra in \"aeiouAEIOU \":\n",
- " consonantes += letra\n",
- " return consonantes"
- ]
- },
- {
- "cell_type": "code",
- "execution_count": null,
- "metadata": {
- "collapsed": false
- },
- "outputs": [],
- "source": [
- "print(vocales(\"sin consonantes murcielago Guadalajara san sebastian\"))"
- ]
- },
- {
- "cell_type": "markdown",
- "metadata": {},
- "source": [
- "c) Reemplace cada vocal por su siguiente vocal. Por ejemplo, si recibe vestuario debe devolver vistaerou."
- ]
- },
- {
- "cell_type": "code",
- "execution_count": null,
- "metadata": {
- "collapsed": true
- },
- "outputs": [],
- "source": [
- "def revocaliza(cad):\n",
- " \"\"\"DocString\"\"\"\n",
- " revoca = \"\"\n",
- " voc = \"aeiouaAEIOUA\"\n",
- " for car in cad:\n",
- " if car in \"aeiouAEIOU\":\n",
- " revoca += voc[voc.find(car)+1]\n",
- " else:\n",
- " revoca += car\n",
- " return revoca"
- ]
- },
- {
- "cell_type": "code",
- "execution_count": null,
- "metadata": {
- "collapsed": false
- },
- "outputs": [],
- "source": [
- "print (revocaliza(\"vestUariO\"))"
- ]
- },
- {
- "cell_type": "markdown",
- "metadata": {},
- "source": [
- "d) Indique si se trata de un palíndromo. Por ejemplo, anita lava la tina es un palíndromo (se lee igual de izquierda a derecha que de derecha a izquierda)."
- ]
- },
- {
- "cell_type": "code",
- "execution_count": null,
- "metadata": {
- "collapsed": false
- },
- "outputs": [],
- "source": [
- "def palindromo(cad):\n",
- " \"\"\"DocString\"\"\"\n",
- " cad_limpia = \"\"\n",
- " for car in cad:\n",
- " if car != \" \":\n",
- " cad_limpia += car\n",
- " tramo1 = len(cad_limpia)//2\n",
- " tramo2 = tramo1 - (len(cad_limpia)+1)%2\n",
- " return cad_limpia[:tramo1] == cad_limpia[:tramo2:-1]\n",
- "\n",
- "def palindromo_2(cad):\n",
- " cad_limpia = \"\"\n",
- " for car in cad:\n",
- " if car != \" \":\n",
- " cad_limpia += car\n",
- " return cad_limpia == cad_limpia[::-1]"
- ]
- },
- {
- "cell_type": "code",
- "execution_count": null,
- "metadata": {
- "collapsed": false
- },
- "outputs": [],
- "source": [
- "print(palindromo(\"antalava la tina\"))\n",
- "print(palindromo_2(\"anytalava la tina\"))"
- ]
- },
- {
- "cell_type": "markdown",
- "metadata": {},
- "source": [
- "Ejercicio 6.8.7. Escribir funciones que dadas dos cadenas de caracteres:"
- ]
- },
- {
- "cell_type": "markdown",
- "metadata": {},
- "source": [
- "a) Indique si la segunda cadena es una subcadena de la primera. Por ejemplo, cadena es una subcadena de subcadena."
- ]
- },
- {
- "cell_type": "code",
- "execution_count": null,
- "metadata": {
- "collapsed": false
- },
- "outputs": [],
- "source": [
- "def subcadena(cad, subcad):\n",
- " \"\"\"DocString\n",
- " \"\"\"\n",
- " return cad.find(subcad) != -1\n",
- "\n",
- "def subcadena_2(cad, subcad):\n",
- " \"\"\" DocString\n",
- " \"\"\"\n",
- " return subcad in cad"
- ]
- },
- {
- "cell_type": "code",
- "execution_count": null,
- "metadata": {
- "collapsed": false
- },
- "outputs": [],
- "source": [
- "print(subcadena(\"subcadena\",\"cadena\"))\n",
- "print(subcadena_2(\"subcadena\",\"cadena\"))\n"
- ]
- },
- {
- "cell_type": "markdown",
- "metadata": {},
- "source": [
- "b) Devuelva la que sea anterior en orden alfábetico. Por ejemplo, si recibe kde y gnome debe devolver gnome."
- ]
- },
- {
- "cell_type": "code",
- "execution_count": null,
- "metadata": {
- "collapsed": true
- },
- "outputs": [],
- "source": [
- "def alfa(cad1, cad2):\n",
- " \"\"\"DocString\n",
- " \"\"\"\n",
- " if cad1 < cad2:\n",
- " return cad1\n",
- " else:\n",
- " return cad2\n"
- ]
- },
- {
- "cell_type": "code",
- "execution_count": null,
- "metadata": {
- "collapsed": false
- },
- "outputs": [],
- "source": [
- "print(alfa(\"kde\",\"gnome\"))"
- ]
- },
- {
- "cell_type": "markdown",
- "metadata": {
- "collapsed": true
- },
- "source": [
- "Ejercicio 6.8.8. Escribir una función que reciba una cadena de unos y ceros (es decir, un número en representación binaria) y devuelva el valor decimal correspondiente."
- ]
- },
- {
- "cell_type": "code",
- "execution_count": null,
- "metadata": {
- "collapsed": false
- },
- "outputs": [],
- "source": [
- "def bin_to_dec(num):\n",
- " \"\"\"DocString\n",
- " \"\"\"\n",
- " dec = 0\n",
- " for car in num:\n",
- " dec *= 2\n",
- " if car == \"1\":\n",
- " dec += 1\n",
- " return dec"
- ]
- },
- {
- "cell_type": "code",
- "execution_count": null,
- "metadata": {
- "collapsed": false
- },
- "outputs": [],
- "source": [
- "print(bin_to_dec(\"11000100\"))"
- ]
- }
- ],
- "metadata": {
- "anaconda-cloud": {},
- "kernelspec": {
- "display_name": "Python [conda root]",
- "language": "python",
- "name": "conda-root-py"
- },
- "language_info": {
- "codemirror_mode": {
- "name": "ipython",
- "version": 3
- },
- "file_extension": ".py",
- "mimetype": "text/x-python",
- "name": "python",
- "nbconvert_exporter": "python",
- "pygments_lexer": "ipython3",
- "version": "3.5.2"
- }
- },
- "nbformat": 4,
- "nbformat_minor": 1
-}
\ No newline at end of file
diff --git a/ficheros/de_csv_a_md/site/css/base.css b/css/base.css
similarity index 100%
rename from ficheros/de_csv_a_md/site/css/base.css
rename to css/base.css
diff --git a/ficheros/de_csv_a_md/site/css/bootstrap-3.3.7.css b/css/bootstrap-3.3.7.css
similarity index 100%
rename from ficheros/de_csv_a_md/site/css/bootstrap-3.3.7.css
rename to css/bootstrap-3.3.7.css
diff --git a/ficheros/de_csv_a_md/site/css/bootstrap-3.3.7.min.css b/css/bootstrap-3.3.7.min.css
similarity index 100%
rename from ficheros/de_csv_a_md/site/css/bootstrap-3.3.7.min.css
rename to css/bootstrap-3.3.7.min.css
diff --git a/ficheros/de_csv_a_md/site/css/font-awesome-4.7.0.css b/css/font-awesome-4.7.0.css
similarity index 100%
rename from ficheros/de_csv_a_md/site/css/font-awesome-4.7.0.css
rename to css/font-awesome-4.7.0.css
diff --git a/ficheros/de_csv_a_md/site/css/font-awesome-4.7.0.min.css b/css/font-awesome-4.7.0.min.css
similarity index 100%
rename from ficheros/de_csv_a_md/site/css/font-awesome-4.7.0.min.css
rename to css/font-awesome-4.7.0.min.css
diff --git a/ficheros/de_csv_a_md/site/css/highlight.css b/css/highlight.css
similarity index 100%
rename from ficheros/de_csv_a_md/site/css/highlight.css
rename to css/highlight.css
diff --git a/diccionarios/01.py b/diccionarios/01.py
deleted file mode 100644
index ed6c2d1..0000000
--- a/diccionarios/01.py
+++ /dev/null
@@ -1,30 +0,0 @@
-"""
-Ejercicio 01
-
-Escribir un programa que lea las palabras de un fichero words.txt
-(http://www.pythonlearn.com/code3/words.txt) y las almacene como claves en un
-diccionario. No importan los valores.
-Posteriormente leer palabras desde teclado y utilizar el operador in como una
-forma rápida de comprobar si las palabras están dentro del diccionario o no.
-"""
-
-try:
- fhandle = open("words.txt")
-except IOError:
- print("El fichero no existe")
- exit()
-
-text = fhandle.read()
-fhandle.close()
-word_list = text.split()
-dictionary = dict()
-for word in word_list:
- dictionary[word] = dictionary.get(word, 0) + 1
-
-word = input("Introduzca una palabra (* para fin): ")
-while word != "*":
- if word in dictionary:
- print("La palabra %s SÍ está en el texto" % word)
- else:
- print("La palabra %s NO está en el texto" % word)
- word = input("Introduzca una palabra (* para fin): ")
diff --git a/diccionarios/02.py b/diccionarios/02.py
deleted file mode 100644
index 3335084..0000000
--- a/diccionarios/02.py
+++ /dev/null
@@ -1,25 +0,0 @@
-"""
-Ejercicio 02
-
-Escribe un programa que contabilice cada mensaje de correo electrónico
-por el día de la semana en que se envió. El proceso buscará líneas que
-comiencen con "From " mirarán la tercera palabra de la línea y registrará
-la cuenta para cada día de la semana. Al final del programa visualizar
-los totales de cada día.
-"""
-try:
- fhandle = open(input("Introduzca el nombre del fichero: "))
-except IOError:
- print("El fichero no existe")
- exit()
-days_of_the_week = dict()
-for line in fhandle:
- if line.startswith("From "):
- day = line.split()[2]
- days_of_the_week[day] = days_of_the_week.get(day, 0) + 1
-day_es = ["Lunes ", "Martes ", "Miércoles", "Jueves ",
- "Viernes ", "Sábado ", "Domingo "]
-day_en = ["Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"]
-for day in range(7):
- if day_en[day] in days_of_the_week:
- print("%s : %3d" % (day_es[day], days_of_the_week[day_en[day]]))
diff --git a/diccionarios/03.py b/diccionarios/03.py
deleted file mode 100644
index 9ae9fd2..0000000
--- a/diccionarios/03.py
+++ /dev/null
@@ -1,20 +0,0 @@
-"""
-Ejercicio 03
-
-Escribir un programa que lea un log de correo construya un histograma usando
-un diccionario para contar cuántos mensajes se recibieron de cada dirección
-de correo electrónico y visualice los resultados.
-"""
-
-try:
- fhandle = open(input("Introduzca el nombre del fichero: "))
-except IOError:
- print("El fichero no existe")
- exit()
-mails = dict()
-for line in fhandle:
- if line.startswith("From "):
- line = line.split()
- mails[line[1]] = mails.get(line[1],0) + 1
-for mail in mails:
- print(mail, mails[mail])
diff --git a/diccionarios/04.py b/diccionarios/04.py
deleted file mode 100644
index bf385cf..0000000
--- a/diccionarios/04.py
+++ /dev/null
@@ -1,29 +0,0 @@
-"""
-Ejercicio 4
-===========
-Añadir código al programa anterior para averiguar quién tiene más mensajes en
-el fichero.
-Después de leer todos los datos y esté creado el diccionario buscar a través
-de él, usando un bucle máximo (ver la sección
-[https://books.trinket.io/pfe/05-iterations.html] maximumloop) para
-encontrar quién tiene más mensajes y mostrar en pantalla cuántos mensajes
-tenía esa persona.
-"""
-try:
- fhandle = open(input("Introduzca el nombre del fichero: "))
-except IOError:
- print("El fichero no existe")
- exit()
-mails = dict()
-for line in fhandle:
- if line.startswith("From "):
- line = line.split()
- mails[line[1]] = mails.get(line[1],0) + 1
-max = 0
-mail = ""
-for mail in mails:
- if mails[mail] > max:
- max = mails[mail];
- max_mail = mail;
-print(max_mail, mails[max_mail])
-
diff --git a/diccionarios/05.py b/diccionarios/05.py
deleted file mode 100644
index d6b8052..0000000
--- a/diccionarios/05.py
+++ /dev/null
@@ -1,19 +0,0 @@
-"""
-Ejercicio 5
-===========
-En esta ocasión hay que registrar el nombre de dominio (en lugar de la
-dirección), es decir, desde dónde se enviaron los mensajes en lugar de
-de quién vino. Al final mostrar el contenido del diccionario.
-"""
-try:
- fhandle = open(input("Introduzca el nombre del fichero: "))
-except IOError:
- print("El fichero no existe")
- exit()
-domains = dict()
-for line in fhandle:
- if line.startswith("From "):
- domain = line.split()[1].split("@")[1]
- domains[domain] = domains.get(domain, 0) + 1
-for line in domains:
- print(line, domains[line])
diff --git a/diccionarios/mbox-short.txt b/diccionarios/mbox-short.txt
deleted file mode 100644
index 684a920..0000000
--- a/diccionarios/mbox-short.txt
+++ /dev/null
@@ -1,1910 +0,0 @@
-From stephen.marquard@uct.ac.za Sat Jan 5 09:14:16 2008
-Return-Path:
-Received: from murder (mail.umich.edu [141.211.14.90])
- by frankenstein.mail.umich.edu (Cyrus v2.3.8) with LMTPA;
- Sat, 05 Jan 2008 09:14:16 -0500
-X-Sieve: CMU Sieve 2.3
-Received: from murder ([unix socket])
- by mail.umich.edu (Cyrus v2.2.12) with LMTPA;
- Sat, 05 Jan 2008 09:14:16 -0500
-Received: from holes.mr.itd.umich.edu (holes.mr.itd.umich.edu [141.211.14.79])
- by flawless.mail.umich.edu () with ESMTP id m05EEFR1013674;
- Sat, 5 Jan 2008 09:14:15 -0500
-Received: FROM paploo.uhi.ac.uk (app1.prod.collab.uhi.ac.uk [194.35.219.184])
- BY holes.mr.itd.umich.edu ID 477F90B0.2DB2F.12494 ;
- 5 Jan 2008 09:14:10 -0500
-Received: from paploo.uhi.ac.uk (localhost [127.0.0.1])
- by paploo.uhi.ac.uk (Postfix) with ESMTP id 5F919BC2F2;
- Sat, 5 Jan 2008 14:10:05 +0000 (GMT)
-Message-ID: <200801051412.m05ECIaH010327@nakamura.uits.iupui.edu>
-Mime-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Received: from prod.collab.uhi.ac.uk ([194.35.219.182])
- by paploo.uhi.ac.uk (JAMES SMTP Server 2.1.3) with SMTP ID 899
- for ;
- Sat, 5 Jan 2008 14:09:50 +0000 (GMT)
-Received: from nakamura.uits.iupui.edu (nakamura.uits.iupui.edu [134.68.220.122])
- by shmi.uhi.ac.uk (Postfix) with ESMTP id A215243002
- for ; Sat, 5 Jan 2008 14:13:33 +0000 (GMT)
-Received: from nakamura.uits.iupui.edu (localhost [127.0.0.1])
- by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11) with ESMTP id m05ECJVp010329
- for ; Sat, 5 Jan 2008 09:12:19 -0500
-Received: (from apache@localhost)
- by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11/Submit) id m05ECIaH010327
- for source@collab.sakaiproject.org; Sat, 5 Jan 2008 09:12:18 -0500
-Date: Sat, 5 Jan 2008 09:12:18 -0500
-X-Authentication-Warning: nakamura.uits.iupui.edu: apache set sender to stephen.marquard@uct.ac.za using -f
-To: source@collab.sakaiproject.org
-From: stephen.marquard@uct.ac.za
-Subject: [sakai] svn commit: r39772 - content/branches/sakai_2-5-x/content-impl/impl/src/java/org/sakaiproject/content/impl
-X-Content-Type-Outer-Envelope: text/plain; charset=UTF-8
-X-Content-Type-Message-Body: text/plain; charset=UTF-8
-Content-Type: text/plain; charset=UTF-8
-X-DSPAM-Result: Innocent
-X-DSPAM-Processed: Sat Jan 5 09:14:16 2008
-X-DSPAM-Confidence: 0.8475
-X-DSPAM-Probability: 0.0000
-
-Details: http://source.sakaiproject.org/viewsvn/?view=rev&rev=39772
-
-Author: stephen.marquard@uct.ac.za
-Date: 2008-01-05 09:12:07 -0500 (Sat, 05 Jan 2008)
-New Revision: 39772
-
-Modified:
-content/branches/sakai_2-5-x/content-impl/impl/src/java/org/sakaiproject/content/impl/ContentServiceSqlOracle.java
-content/branches/sakai_2-5-x/content-impl/impl/src/java/org/sakaiproject/content/impl/DbContentService.java
-Log:
-SAK-12501 merge to 2-5-x: r39622, r39624:5, r39632:3 (resolve conflict from differing linebreaks for r39622)
-
-----------------------
-This automatic notification message was sent by Sakai Collab (https://collab.sakaiproject.org/portal) from the Source site.
-You can modify how you receive notifications at My Workspace > Preferences.
-
-
-
-From louis@media.berkeley.edu Fri Jan 4 18:10:48 2008
-Return-Path:
-Received: from murder (mail.umich.edu [141.211.14.97])
- by frankenstein.mail.umich.edu (Cyrus v2.3.8) with LMTPA;
- Fri, 04 Jan 2008 18:10:48 -0500
-X-Sieve: CMU Sieve 2.3
-Received: from murder ([unix socket])
- by mail.umich.edu (Cyrus v2.2.12) with LMTPA;
- Fri, 04 Jan 2008 18:10:48 -0500
-Received: from icestorm.mr.itd.umich.edu (icestorm.mr.itd.umich.edu [141.211.93.149])
- by sleepers.mail.umich.edu () with ESMTP id m04NAbGa029441;
- Fri, 4 Jan 2008 18:10:37 -0500
-Received: FROM paploo.uhi.ac.uk (app1.prod.collab.uhi.ac.uk [194.35.219.184])
- BY icestorm.mr.itd.umich.edu ID 477EBCE3.161BB.4320 ;
- 4 Jan 2008 18:10:31 -0500
-Received: from paploo.uhi.ac.uk (localhost [127.0.0.1])
- by paploo.uhi.ac.uk (Postfix) with ESMTP id 07969BB706;
- Fri, 4 Jan 2008 23:10:33 +0000 (GMT)
-Message-ID: <200801042308.m04N8v6O008125@nakamura.uits.iupui.edu>
-Mime-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Received: from prod.collab.uhi.ac.uk ([194.35.219.182])
- by paploo.uhi.ac.uk (JAMES SMTP Server 2.1.3) with SMTP ID 710
- for ;
- Fri, 4 Jan 2008 23:10:10 +0000 (GMT)
-Received: from nakamura.uits.iupui.edu (nakamura.uits.iupui.edu [134.68.220.122])
- by shmi.uhi.ac.uk (Postfix) with ESMTP id 4BA2F42F57
- for ; Fri, 4 Jan 2008 23:10:10 +0000 (GMT)
-Received: from nakamura.uits.iupui.edu (localhost [127.0.0.1])
- by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11) with ESMTP id m04N8vHG008127
- for ; Fri, 4 Jan 2008 18:08:57 -0500
-Received: (from apache@localhost)
- by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11/Submit) id m04N8v6O008125
- for source@collab.sakaiproject.org; Fri, 4 Jan 2008 18:08:57 -0500
-Date: Fri, 4 Jan 2008 18:08:57 -0500
-X-Authentication-Warning: nakamura.uits.iupui.edu: apache set sender to louis@media.berkeley.edu using -f
-To: source@collab.sakaiproject.org
-From: louis@media.berkeley.edu
-Subject: [sakai] svn commit: r39771 - in bspace/site-manage/sakai_2-4-x/site-manage-tool/tool/src: bundle java/org/sakaiproject/site/tool
-X-Content-Type-Outer-Envelope: text/plain; charset=UTF-8
-X-Content-Type-Message-Body: text/plain; charset=UTF-8
-Content-Type: text/plain; charset=UTF-8
-X-DSPAM-Result: Innocent
-X-DSPAM-Processed: Fri Jan 4 18:10:48 2008
-X-DSPAM-Confidence: 0.6178
-X-DSPAM-Probability: 0.0000
-
-Details: http://source.sakaiproject.org/viewsvn/?view=rev&rev=39771
-
-Author: louis@media.berkeley.edu
-Date: 2008-01-04 18:08:50 -0500 (Fri, 04 Jan 2008)
-New Revision: 39771
-
-Modified:
-bspace/site-manage/sakai_2-4-x/site-manage-tool/tool/src/bundle/sitesetupgeneric.properties
-bspace/site-manage/sakai_2-4-x/site-manage-tool/tool/src/java/org/sakaiproject/site/tool/SiteAction.java
-Log:
-BSP-1415 New (Guest) user Notification
-
-----------------------
-This automatic notification message was sent by Sakai Collab (https://collab.sakaiproject.org/portal) from the Source site.
-You can modify how you receive notifications at My Workspace > Preferences.
-
-
-
-From zqian@umich.edu Fri Jan 4 16:10:39 2008
-Return-Path:
-Received: from murder (mail.umich.edu [141.211.14.25])
- by frankenstein.mail.umich.edu (Cyrus v2.3.8) with LMTPA;
- Fri, 04 Jan 2008 16:10:39 -0500
-X-Sieve: CMU Sieve 2.3
-Received: from murder ([unix socket])
- by mail.umich.edu (Cyrus v2.2.12) with LMTPA;
- Fri, 04 Jan 2008 16:10:39 -0500
-Received: from ghostbusters.mr.itd.umich.edu (ghostbusters.mr.itd.umich.edu [141.211.93.144])
- by panther.mail.umich.edu () with ESMTP id m04LAcZw014275;
- Fri, 4 Jan 2008 16:10:38 -0500
-Received: FROM paploo.uhi.ac.uk (app1.prod.collab.uhi.ac.uk [194.35.219.184])
- BY ghostbusters.mr.itd.umich.edu ID 477EA0C6.A0214.25480 ;
- 4 Jan 2008 16:10:33 -0500
-Received: from paploo.uhi.ac.uk (localhost [127.0.0.1])
- by paploo.uhi.ac.uk (Postfix) with ESMTP id C48CDBB490;
- Fri, 4 Jan 2008 21:10:31 +0000 (GMT)
-Message-ID: <200801042109.m04L92hb007923@nakamura.uits.iupui.edu>
-Mime-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Received: from prod.collab.uhi.ac.uk ([194.35.219.182])
- by paploo.uhi.ac.uk (JAMES SMTP Server 2.1.3) with SMTP ID 906
- for ;
- Fri, 4 Jan 2008 21:10:18 +0000 (GMT)
-Received: from nakamura.uits.iupui.edu (nakamura.uits.iupui.edu [134.68.220.122])
- by shmi.uhi.ac.uk (Postfix) with ESMTP id 7D13042F71
- for ; Fri, 4 Jan 2008 21:10:14 +0000 (GMT)
-Received: from nakamura.uits.iupui.edu (localhost [127.0.0.1])
- by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11) with ESMTP id m04L927E007925
- for ; Fri, 4 Jan 2008 16:09:02 -0500
-Received: (from apache@localhost)
- by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11/Submit) id m04L92hb007923
- for source@collab.sakaiproject.org; Fri, 4 Jan 2008 16:09:02 -0500
-Date: Fri, 4 Jan 2008 16:09:02 -0500
-X-Authentication-Warning: nakamura.uits.iupui.edu: apache set sender to zqian@umich.edu using -f
-To: source@collab.sakaiproject.org
-From: zqian@umich.edu
-Subject: [sakai] svn commit: r39770 - site-manage/branches/sakai_2-5-x/site-manage-tool/tool/src/webapp/vm/sitesetup
-X-Content-Type-Outer-Envelope: text/plain; charset=UTF-8
-X-Content-Type-Message-Body: text/plain; charset=UTF-8
-Content-Type: text/plain; charset=UTF-8
-X-DSPAM-Result: Innocent
-X-DSPAM-Processed: Fri Jan 4 16:10:39 2008
-X-DSPAM-Confidence: 0.6961
-X-DSPAM-Probability: 0.0000
-
-Details: http://source.sakaiproject.org/viewsvn/?view=rev&rev=39770
-
-Author: zqian@umich.edu
-Date: 2008-01-04 16:09:01 -0500 (Fri, 04 Jan 2008)
-New Revision: 39770
-
-Modified:
-site-manage/branches/sakai_2-5-x/site-manage-tool/tool/src/webapp/vm/sitesetup/chef_site-siteInfo-list.vm
-Log:
-merge fix to SAK-9996 into 2-5-x branch: svn merge -r 39687:39688 https://source.sakaiproject.org/svn/site-manage/trunk/
-
-----------------------
-This automatic notification message was sent by Sakai Collab (https://collab.sakaiproject.org/portal) from the Source site.
-You can modify how you receive notifications at My Workspace > Preferences.
-
-
-
-From rjlowe@iupui.edu Fri Jan 4 15:46:24 2008
-Return-Path:
-Received: from murder (mail.umich.edu [141.211.14.25])
- by frankenstein.mail.umich.edu (Cyrus v2.3.8) with LMTPA;
- Fri, 04 Jan 2008 15:46:24 -0500
-X-Sieve: CMU Sieve 2.3
-Received: from murder ([unix socket])
- by mail.umich.edu (Cyrus v2.2.12) with LMTPA;
- Fri, 04 Jan 2008 15:46:24 -0500
-Received: from dreamcatcher.mr.itd.umich.edu (dreamcatcher.mr.itd.umich.edu [141.211.14.43])
- by panther.mail.umich.edu () with ESMTP id m04KkNbx032077;
- Fri, 4 Jan 2008 15:46:23 -0500
-Received: FROM paploo.uhi.ac.uk (app1.prod.collab.uhi.ac.uk [194.35.219.184])
- BY dreamcatcher.mr.itd.umich.edu ID 477E9B13.2F3BC.22965 ;
- 4 Jan 2008 15:46:13 -0500
-Received: from paploo.uhi.ac.uk (localhost [127.0.0.1])
- by paploo.uhi.ac.uk (Postfix) with ESMTP id 4AE03BB552;
- Fri, 4 Jan 2008 20:46:13 +0000 (GMT)
-Message-ID: <200801042044.m04Kiem3007881@nakamura.uits.iupui.edu>
-Mime-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Received: from prod.collab.uhi.ac.uk ([194.35.219.182])
- by paploo.uhi.ac.uk (JAMES SMTP Server 2.1.3) with SMTP ID 38
- for ;
- Fri, 4 Jan 2008 20:45:56 +0000 (GMT)
-Received: from nakamura.uits.iupui.edu (nakamura.uits.iupui.edu [134.68.220.122])
- by shmi.uhi.ac.uk (Postfix) with ESMTP id A55D242F57
- for ; Fri, 4 Jan 2008 20:45:52 +0000 (GMT)
-Received: from nakamura.uits.iupui.edu (localhost [127.0.0.1])
- by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11) with ESMTP id m04KieqE007883
- for ; Fri, 4 Jan 2008 15:44:40 -0500
-Received: (from apache@localhost)
- by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11/Submit) id m04Kiem3007881
- for source@collab.sakaiproject.org; Fri, 4 Jan 2008 15:44:40 -0500
-Date: Fri, 4 Jan 2008 15:44:40 -0500
-X-Authentication-Warning: nakamura.uits.iupui.edu: apache set sender to rjlowe@iupui.edu using -f
-To: source@collab.sakaiproject.org
-From: rjlowe@iupui.edu
-Subject: [sakai] svn commit: r39769 - in gradebook/trunk/app/ui/src: java/org/sakaiproject/tool/gradebook/ui/helpers/beans java/org/sakaiproject/tool/gradebook/ui/helpers/producers webapp/WEB-INF webapp/WEB-INF/bundle
-X-Content-Type-Outer-Envelope: text/plain; charset=UTF-8
-X-Content-Type-Message-Body: text/plain; charset=UTF-8
-Content-Type: text/plain; charset=UTF-8
-X-DSPAM-Result: Innocent
-X-DSPAM-Processed: Fri Jan 4 15:46:24 2008
-X-DSPAM-Confidence: 0.7565
-X-DSPAM-Probability: 0.0000
-
-Details: http://source.sakaiproject.org/viewsvn/?view=rev&rev=39769
-
-Author: rjlowe@iupui.edu
-Date: 2008-01-04 15:44:39 -0500 (Fri, 04 Jan 2008)
-New Revision: 39769
-
-Modified:
-gradebook/trunk/app/ui/src/java/org/sakaiproject/tool/gradebook/ui/helpers/beans/AssignmentGradeRecordBean.java
-gradebook/trunk/app/ui/src/java/org/sakaiproject/tool/gradebook/ui/helpers/producers/GradeGradebookItemProducer.java
-gradebook/trunk/app/ui/src/webapp/WEB-INF/applicationContext.xml
-gradebook/trunk/app/ui/src/webapp/WEB-INF/bundle/messages.properties
-gradebook/trunk/app/ui/src/webapp/WEB-INF/requestContext.xml
-Log:
-SAK-12180 - Fixed errors with grading helper
-
-----------------------
-This automatic notification message was sent by Sakai Collab (https://collab.sakaiproject.org/portal) from the Source site.
-You can modify how you receive notifications at My Workspace > Preferences.
-
-
-
-From zqian@umich.edu Fri Jan 4 15:03:18 2008
-Return-Path:
-Received: from murder (mail.umich.edu [141.211.14.46])
- by frankenstein.mail.umich.edu (Cyrus v2.3.8) with LMTPA;
- Fri, 04 Jan 2008 15:03:18 -0500
-X-Sieve: CMU Sieve 2.3
-Received: from murder ([unix socket])
- by mail.umich.edu (Cyrus v2.2.12) with LMTPA;
- Fri, 04 Jan 2008 15:03:18 -0500
-Received: from firestarter.mr.itd.umich.edu (firestarter.mr.itd.umich.edu [141.211.14.83])
- by fan.mail.umich.edu () with ESMTP id m04K3HGF006563;
- Fri, 4 Jan 2008 15:03:17 -0500
-Received: FROM paploo.uhi.ac.uk (app1.prod.collab.uhi.ac.uk [194.35.219.184])
- BY firestarter.mr.itd.umich.edu ID 477E9100.8F7F4.1590 ;
- 4 Jan 2008 15:03:15 -0500
-Received: from paploo.uhi.ac.uk (localhost [127.0.0.1])
- by paploo.uhi.ac.uk (Postfix) with ESMTP id 57770BB477;
- Fri, 4 Jan 2008 20:03:09 +0000 (GMT)
-Message-ID: <200801042001.m04K1cO0007738@nakamura.uits.iupui.edu>
-Mime-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Received: from prod.collab.uhi.ac.uk ([194.35.219.182])
- by paploo.uhi.ac.uk (JAMES SMTP Server 2.1.3) with SMTP ID 622
- for ;
- Fri, 4 Jan 2008 20:02:46 +0000 (GMT)
-Received: from nakamura.uits.iupui.edu (nakamura.uits.iupui.edu [134.68.220.122])
- by shmi.uhi.ac.uk (Postfix) with ESMTP id AB4D042F4D
- for ; Fri, 4 Jan 2008 20:02:50 +0000 (GMT)
-Received: from nakamura.uits.iupui.edu (localhost [127.0.0.1])
- by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11) with ESMTP id m04K1cXv007740
- for ; Fri, 4 Jan 2008 15:01:38 -0500
-Received: (from apache@localhost)
- by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11/Submit) id m04K1cO0007738
- for source@collab.sakaiproject.org; Fri, 4 Jan 2008 15:01:38 -0500
-Date: Fri, 4 Jan 2008 15:01:38 -0500
-X-Authentication-Warning: nakamura.uits.iupui.edu: apache set sender to zqian@umich.edu using -f
-To: source@collab.sakaiproject.org
-From: zqian@umich.edu
-Subject: [sakai] svn commit: r39766 - site-manage/branches/sakai_2-4-x/site-manage-tool/tool/src/java/org/sakaiproject/site/tool
-X-Content-Type-Outer-Envelope: text/plain; charset=UTF-8
-X-Content-Type-Message-Body: text/plain; charset=UTF-8
-Content-Type: text/plain; charset=UTF-8
-X-DSPAM-Result: Innocent
-X-DSPAM-Processed: Fri Jan 4 15:03:18 2008
-X-DSPAM-Confidence: 0.7626
-X-DSPAM-Probability: 0.0000
-
-Details: http://source.sakaiproject.org/viewsvn/?view=rev&rev=39766
-
-Author: zqian@umich.edu
-Date: 2008-01-04 15:01:37 -0500 (Fri, 04 Jan 2008)
-New Revision: 39766
-
-Modified:
-site-manage/branches/sakai_2-4-x/site-manage-tool/tool/src/java/org/sakaiproject/site/tool/SiteAction.java
-Log:
-merge fix to SAK-10788 into site-manage 2.4.x branch:
-
-Sakai Source Repository #38024 Wed Nov 07 14:54:46 MST 2007 zqian@umich.edu Fix to SAK-10788: If a provided id in a couse site is fake or doesn't provide any user information, Site Info appears to be like project site with empty participant list
-
-Watch for enrollments object being null and concatenate provider ids when there are more than one.
-Files Changed
-MODIFY /site-manage/trunk/site-manage-tool/tool/src/java/org/sakaiproject/site/tool/SiteAction.java
-
-
-
-
-----------------------
-This automatic notification message was sent by Sakai Collab (https://collab.sakaiproject.org/portal) from the Source site.
-You can modify how you receive notifications at My Workspace > Preferences.
-
-
-
-From rjlowe@iupui.edu Fri Jan 4 14:50:18 2008
-Return-Path:
-Received: from murder (mail.umich.edu [141.211.14.93])
- by frankenstein.mail.umich.edu (Cyrus v2.3.8) with LMTPA;
- Fri, 04 Jan 2008 14:50:18 -0500
-X-Sieve: CMU Sieve 2.3
-Received: from murder ([unix socket])
- by mail.umich.edu (Cyrus v2.2.12) with LMTPA;
- Fri, 04 Jan 2008 14:50:18 -0500
-Received: from eyewitness.mr.itd.umich.edu (eyewitness.mr.itd.umich.edu [141.211.93.142])
- by mission.mail.umich.edu () with ESMTP id m04JoHJi019755;
- Fri, 4 Jan 2008 14:50:17 -0500
-Received: FROM paploo.uhi.ac.uk (app1.prod.collab.uhi.ac.uk [194.35.219.184])
- BY eyewitness.mr.itd.umich.edu ID 477E8DF2.67B91.5278 ;
- 4 Jan 2008 14:50:13 -0500
-Received: from paploo.uhi.ac.uk (localhost [127.0.0.1])
- by paploo.uhi.ac.uk (Postfix) with ESMTP id 2D1B9BB492;
- Fri, 4 Jan 2008 19:47:10 +0000 (GMT)
-Message-ID: <200801041948.m04JmdwO007705@nakamura.uits.iupui.edu>
-Mime-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Received: from prod.collab.uhi.ac.uk ([194.35.219.182])
- by paploo.uhi.ac.uk (JAMES SMTP Server 2.1.3) with SMTP ID 960
- for ;
- Fri, 4 Jan 2008 19:46:50 +0000 (GMT)
-Received: from nakamura.uits.iupui.edu (nakamura.uits.iupui.edu [134.68.220.122])
- by shmi.uhi.ac.uk (Postfix) with ESMTP id B3E6742F4A
- for ; Fri, 4 Jan 2008 19:49:51 +0000 (GMT)
-Received: from nakamura.uits.iupui.edu (localhost [127.0.0.1])
- by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11) with ESMTP id m04JmeV9007707
- for ; Fri, 4 Jan 2008 14:48:40 -0500
-Received: (from apache@localhost)
- by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11/Submit) id m04JmdwO007705
- for source@collab.sakaiproject.org; Fri, 4 Jan 2008 14:48:39 -0500
-Date: Fri, 4 Jan 2008 14:48:39 -0500
-X-Authentication-Warning: nakamura.uits.iupui.edu: apache set sender to rjlowe@iupui.edu using -f
-To: source@collab.sakaiproject.org
-From: rjlowe@iupui.edu
-Subject: [sakai] svn commit: r39765 - in gradebook/trunk/app: business/src/java/org/sakaiproject/tool/gradebook/business business/src/java/org/sakaiproject/tool/gradebook/business/impl ui ui/src/java/org/sakaiproject/tool/gradebook/ui/helpers/beans ui/src/java/org/sakaiproject/tool/gradebook/ui/helpers/entity ui/src/java/org/sakaiproject/tool/gradebook/ui/helpers/params ui/src/java/org/sakaiproject/tool/gradebook/ui/helpers/producers ui/src/webapp/WEB-INF ui/src/webapp/WEB-INF/bundle ui/src/webapp/content/templates
-X-Content-Type-Outer-Envelope: text/plain; charset=UTF-8
-X-Content-Type-Message-Body: text/plain; charset=UTF-8
-Content-Type: text/plain; charset=UTF-8
-X-DSPAM-Result: Innocent
-X-DSPAM-Processed: Fri Jan 4 14:50:18 2008
-X-DSPAM-Confidence: 0.7556
-X-DSPAM-Probability: 0.0000
-
-Details: http://source.sakaiproject.org/viewsvn/?view=rev&rev=39765
-
-Author: rjlowe@iupui.edu
-Date: 2008-01-04 14:48:37 -0500 (Fri, 04 Jan 2008)
-New Revision: 39765
-
-Added:
-gradebook/trunk/app/ui/src/java/org/sakaiproject/tool/gradebook/ui/helpers/beans/AssignmentGradeRecordBean.java
-gradebook/trunk/app/ui/src/java/org/sakaiproject/tool/gradebook/ui/helpers/beans/AssignmentGradeRecordCreator.java
-gradebook/trunk/app/ui/src/java/org/sakaiproject/tool/gradebook/ui/helpers/entity/GradebookEntryGradeEntityProvider.java
-gradebook/trunk/app/ui/src/java/org/sakaiproject/tool/gradebook/ui/helpers/params/GradeGradebookItemViewParams.java
-gradebook/trunk/app/ui/src/java/org/sakaiproject/tool/gradebook/ui/helpers/producers/GradeGradebookItemProducer.java
-gradebook/trunk/app/ui/src/webapp/content/templates/grade-gradebook-item.html
-Modified:
-gradebook/trunk/app/business/src/java/org/sakaiproject/tool/gradebook/business/GradebookManager.java
-gradebook/trunk/app/business/src/java/org/sakaiproject/tool/gradebook/business/impl/GradebookManagerHibernateImpl.java
-gradebook/trunk/app/ui/pom.xml
-gradebook/trunk/app/ui/src/java/org/sakaiproject/tool/gradebook/ui/helpers/beans/GradebookItemBean.java
-gradebook/trunk/app/ui/src/java/org/sakaiproject/tool/gradebook/ui/helpers/entity/GradebookEntryEntityProvider.java
-gradebook/trunk/app/ui/src/java/org/sakaiproject/tool/gradebook/ui/helpers/producers/AddGradebookItemProducer.java
-gradebook/trunk/app/ui/src/webapp/WEB-INF/applicationContext.xml
-gradebook/trunk/app/ui/src/webapp/WEB-INF/bundle/messages.properties
-gradebook/trunk/app/ui/src/webapp/WEB-INF/requestContext.xml
-Log:
-SAK-12180 - New helper tool to grade an assignment
-
-----------------------
-This automatic notification message was sent by Sakai Collab (https://collab.sakaiproject.org/portal) from the Source site.
-You can modify how you receive notifications at My Workspace > Preferences.
-
-
-
-From cwen@iupui.edu Fri Jan 4 11:37:30 2008
-Return-Path:
-Received: from murder (mail.umich.edu [141.211.14.46])
- by frankenstein.mail.umich.edu (Cyrus v2.3.8) with LMTPA;
- Fri, 04 Jan 2008 11:37:30 -0500
-X-Sieve: CMU Sieve 2.3
-Received: from murder ([unix socket])
- by mail.umich.edu (Cyrus v2.2.12) with LMTPA;
- Fri, 04 Jan 2008 11:37:30 -0500
-Received: from tadpole.mr.itd.umich.edu (tadpole.mr.itd.umich.edu [141.211.14.72])
- by fan.mail.umich.edu () with ESMTP id m04GbT9x022078;
- Fri, 4 Jan 2008 11:37:29 -0500
-Received: FROM paploo.uhi.ac.uk (app1.prod.collab.uhi.ac.uk [194.35.219.184])
- BY tadpole.mr.itd.umich.edu ID 477E60B2.82756.9904 ;
- 4 Jan 2008 11:37:09 -0500
-Received: from paploo.uhi.ac.uk (localhost [127.0.0.1])
- by paploo.uhi.ac.uk (Postfix) with ESMTP id 8D13DBB001;
- Fri, 4 Jan 2008 16:37:07 +0000 (GMT)
-Message-ID: <200801041635.m04GZQGZ007313@nakamura.uits.iupui.edu>
-Mime-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Received: from prod.collab.uhi.ac.uk ([194.35.219.182])
- by paploo.uhi.ac.uk (JAMES SMTP Server 2.1.3) with SMTP ID 120
- for ;
- Fri, 4 Jan 2008 16:36:40 +0000 (GMT)
-Received: from nakamura.uits.iupui.edu (nakamura.uits.iupui.edu [134.68.220.122])
- by shmi.uhi.ac.uk (Postfix) with ESMTP id D430B42E42
- for ; Fri, 4 Jan 2008 16:36:37 +0000 (GMT)
-Received: from nakamura.uits.iupui.edu (localhost [127.0.0.1])
- by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11) with ESMTP id m04GZQ7W007315
- for ; Fri, 4 Jan 2008 11:35:26 -0500
-Received: (from apache@localhost)
- by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11/Submit) id m04GZQGZ007313
- for source@collab.sakaiproject.org; Fri, 4 Jan 2008 11:35:26 -0500
-Date: Fri, 4 Jan 2008 11:35:26 -0500
-X-Authentication-Warning: nakamura.uits.iupui.edu: apache set sender to cwen@iupui.edu using -f
-To: source@collab.sakaiproject.org
-From: cwen@iupui.edu
-Subject: [sakai] svn commit: r39764 - in msgcntr/trunk/messageforums-app/src/java/org/sakaiproject/tool/messageforums: . ui
-X-Content-Type-Outer-Envelope: text/plain; charset=UTF-8
-X-Content-Type-Message-Body: text/plain; charset=UTF-8
-Content-Type: text/plain; charset=UTF-8
-X-DSPAM-Result: Innocent
-X-DSPAM-Processed: Fri Jan 4 11:37:30 2008
-X-DSPAM-Confidence: 0.7002
-X-DSPAM-Probability: 0.0000
-
-Details: http://source.sakaiproject.org/viewsvn/?view=rev&rev=39764
-
-Author: cwen@iupui.edu
-Date: 2008-01-04 11:35:25 -0500 (Fri, 04 Jan 2008)
-New Revision: 39764
-
-Modified:
-msgcntr/trunk/messageforums-app/src/java/org/sakaiproject/tool/messageforums/PrivateMessagesTool.java
-msgcntr/trunk/messageforums-app/src/java/org/sakaiproject/tool/messageforums/ui/PrivateMessageDecoratedBean.java
-Log:
-unmerge Xingtang's checkin for SAK-12488.
-
-svn merge -r39558:39557 https://source.sakaiproject.org/svn/msgcntr/trunk
-U messageforums-app/src/java/org/sakaiproject/tool/messageforums/PrivateMessagesTool.java
-U messageforums-app/src/java/org/sakaiproject/tool/messageforums/ui/PrivateMessageDecoratedBean.java
-
-svn log -r 39558
-------------------------------------------------------------------------
-r39558 | hu2@iupui.edu | 2007-12-20 15:25:38 -0500 (Thu, 20 Dec 2007) | 3 lines
-
-SAK-12488
-when send a message to yourself. click reply to all, cc row should be null.
-http://jira.sakaiproject.org/jira/browse/SAK-12488
-------------------------------------------------------------------------
-
-
-----------------------
-This automatic notification message was sent by Sakai Collab (https://collab.sakaiproject.org/portal) from the Source site.
-You can modify how you receive notifications at My Workspace > Preferences.
-
-
-
-From cwen@iupui.edu Fri Jan 4 11:35:08 2008
-Return-Path:
-Received: from murder (mail.umich.edu [141.211.14.46])
- by frankenstein.mail.umich.edu (Cyrus v2.3.8) with LMTPA;
- Fri, 04 Jan 2008 11:35:08 -0500
-X-Sieve: CMU Sieve 2.3
-Received: from murder ([unix socket])
- by mail.umich.edu (Cyrus v2.2.12) with LMTPA;
- Fri, 04 Jan 2008 11:35:08 -0500
-Received: from it.mr.itd.umich.edu (it.mr.itd.umich.edu [141.211.93.151])
- by fan.mail.umich.edu () with ESMTP id m04GZ6lt020480;
- Fri, 4 Jan 2008 11:35:06 -0500
-Received: FROM paploo.uhi.ac.uk (app1.prod.collab.uhi.ac.uk [194.35.219.184])
- BY it.mr.itd.umich.edu ID 477E6033.6469D.21870 ;
- 4 Jan 2008 11:35:02 -0500
-Received: from paploo.uhi.ac.uk (localhost [127.0.0.1])
- by paploo.uhi.ac.uk (Postfix) with ESMTP id E40FABAE5B;
- Fri, 4 Jan 2008 16:34:38 +0000 (GMT)
-Message-ID: <200801041633.m04GX6eG007292@nakamura.uits.iupui.edu>
-Mime-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Received: from prod.collab.uhi.ac.uk ([194.35.219.182])
- by paploo.uhi.ac.uk (JAMES SMTP Server 2.1.3) with SMTP ID 697
- for ;
- Fri, 4 Jan 2008 16:34:01 +0000 (GMT)
-Received: from nakamura.uits.iupui.edu (nakamura.uits.iupui.edu [134.68.220.122])
- by shmi.uhi.ac.uk (Postfix) with ESMTP id 1CD0C42E42
- for ; Fri, 4 Jan 2008 16:34:17 +0000 (GMT)
-Received: from nakamura.uits.iupui.edu (localhost [127.0.0.1])
- by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11) with ESMTP id m04GX6Y3007294
- for ; Fri, 4 Jan 2008 11:33:06 -0500
-Received: (from apache@localhost)
- by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11/Submit) id m04GX6eG007292
- for source@collab.sakaiproject.org; Fri, 4 Jan 2008 11:33:06 -0500
-Date: Fri, 4 Jan 2008 11:33:06 -0500
-X-Authentication-Warning: nakamura.uits.iupui.edu: apache set sender to cwen@iupui.edu using -f
-To: source@collab.sakaiproject.org
-From: cwen@iupui.edu
-Subject: [sakai] svn commit: r39763 - in msgcntr/trunk: messageforums-api/src/bundle/org/sakaiproject/api/app/messagecenter/bundle messageforums-app/src/java/org/sakaiproject/tool/messageforums
-X-Content-Type-Outer-Envelope: text/plain; charset=UTF-8
-X-Content-Type-Message-Body: text/plain; charset=UTF-8
-Content-Type: text/plain; charset=UTF-8
-X-DSPAM-Result: Innocent
-X-DSPAM-Processed: Fri Jan 4 11:35:08 2008
-X-DSPAM-Confidence: 0.7615
-X-DSPAM-Probability: 0.0000
-
-Details: http://source.sakaiproject.org/viewsvn/?view=rev&rev=39763
-
-Author: cwen@iupui.edu
-Date: 2008-01-04 11:33:05 -0500 (Fri, 04 Jan 2008)
-New Revision: 39763
-
-Modified:
-msgcntr/trunk/messageforums-api/src/bundle/org/sakaiproject/api/app/messagecenter/bundle/Messages.properties
-msgcntr/trunk/messageforums-app/src/java/org/sakaiproject/tool/messageforums/PrivateMessagesTool.java
-Log:
-unmerge Xingtang's check in for SAK-12484.
-
-svn merge -r39571:39570 https://source.sakaiproject.org/svn/msgcntr/trunk
-U messageforums-api/src/bundle/org/sakaiproject/api/app/messagecenter/bundle/Messages.properties
-U messageforums-app/src/java/org/sakaiproject/tool/messageforums/PrivateMessagesTool.java
-
-svn log -r 39571
-------------------------------------------------------------------------
-r39571 | hu2@iupui.edu | 2007-12-20 21:26:28 -0500 (Thu, 20 Dec 2007) | 3 lines
-
-SAK-12484
-reply all cc list should not include the current user name.
-http://jira.sakaiproject.org/jira/browse/SAK-12484
-------------------------------------------------------------------------
-
-
-----------------------
-This automatic notification message was sent by Sakai Collab (https://collab.sakaiproject.org/portal) from the Source site.
-You can modify how you receive notifications at My Workspace > Preferences.
-
-
-
-From gsilver@umich.edu Fri Jan 4 11:12:37 2008
-Return-Path:
-Received: from murder (mail.umich.edu [141.211.14.25])
- by frankenstein.mail.umich.edu (Cyrus v2.3.8) with LMTPA;
- Fri, 04 Jan 2008 11:12:37 -0500
-X-Sieve: CMU Sieve 2.3
-Received: from murder ([unix socket])
- by mail.umich.edu (Cyrus v2.2.12) with LMTPA;
- Fri, 04 Jan 2008 11:12:37 -0500
-Received: from holes.mr.itd.umich.edu (holes.mr.itd.umich.edu [141.211.14.79])
- by panther.mail.umich.edu () with ESMTP id m04GCaHB030887;
- Fri, 4 Jan 2008 11:12:36 -0500
-Received: FROM paploo.uhi.ac.uk (app1.prod.collab.uhi.ac.uk [194.35.219.184])
- BY holes.mr.itd.umich.edu ID 477E5AEB.E670B.28397 ;
- 4 Jan 2008 11:12:30 -0500
-Received: from paploo.uhi.ac.uk (localhost [127.0.0.1])
- by paploo.uhi.ac.uk (Postfix) with ESMTP id 99715BAE7D;
- Fri, 4 Jan 2008 16:12:27 +0000 (GMT)
-Message-ID: <200801041611.m04GB1Lb007221@nakamura.uits.iupui.edu>
-Mime-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Received: from prod.collab.uhi.ac.uk ([194.35.219.182])
- by paploo.uhi.ac.uk (JAMES SMTP Server 2.1.3) with SMTP ID 272
- for ;
- Fri, 4 Jan 2008 16:12:14 +0000 (GMT)
-Received: from nakamura.uits.iupui.edu (nakamura.uits.iupui.edu [134.68.220.122])
- by shmi.uhi.ac.uk (Postfix) with ESMTP id 0A6ED42DFC
- for ; Fri, 4 Jan 2008 16:12:12 +0000 (GMT)
-Received: from nakamura.uits.iupui.edu (localhost [127.0.0.1])
- by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11) with ESMTP id m04GB1Wt007223
- for ; Fri, 4 Jan 2008 11:11:01 -0500
-Received: (from apache@localhost)
- by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11/Submit) id m04GB1Lb007221
- for source@collab.sakaiproject.org; Fri, 4 Jan 2008 11:11:01 -0500
-Date: Fri, 4 Jan 2008 11:11:01 -0500
-X-Authentication-Warning: nakamura.uits.iupui.edu: apache set sender to gsilver@umich.edu using -f
-To: source@collab.sakaiproject.org
-From: gsilver@umich.edu
-Subject: [sakai] svn commit: r39762 - web/trunk/web-tool/tool/src/bundle
-X-Content-Type-Outer-Envelope: text/plain; charset=UTF-8
-X-Content-Type-Message-Body: text/plain; charset=UTF-8
-Content-Type: text/plain; charset=UTF-8
-X-DSPAM-Result: Innocent
-X-DSPAM-Processed: Fri Jan 4 11:12:37 2008
-onfidence:X-DSPAM-C 0.7601
-X-DSPAM-Probability: 0.0000
-
-Details: http://source.sakaiproject.org/viewsvn/?view=rev&rev=39762
-
-Author: gsilver@umich.edu
-Date: 2008-01-04 11:11:00 -0500 (Fri, 04 Jan 2008)
-New Revision: 39762
-
-Modified:
-web/trunk/web-tool/tool/src/bundle/iframe.properties
-Log:
-SAK-12596
-http://bugs.sakaiproject.org/jira/browse/SAK-12596
-- left moot (unused) entries commented for now
-
-----------------------
-This automatic notification message was sent by Sakai Collab (https://collab.sakaiproject.org/portal) from the Source site.
-You can modify how you receive notifications at My Workspace > Preferences.
-
-
-
-From gsilver@umich.edu Fri Jan 4 11:11:52 2008
-Return-Path:
-Received: from murder (mail.umich.edu [141.211.14.36])
- by frankenstein.mail.umich.edu (Cyrus v2.3.8) with LMTPA;
- Fri, 04 Jan 2008 11:11:52 -0500
-X-Sieve: CMU Sieve 2.3
-Received: from murder ([unix socket])
- by mail.umich.edu (Cyrus v2.2.12) with LMTPA;
- Fri, 04 Jan 2008 11:11:52 -0500
-Received: from creepshow.mr.itd.umich.edu (creepshow.mr.itd.umich.edu [141.211.14.84])
- by godsend.mail.umich.edu () with ESMTP id m04GBqqv025330;
- Fri, 4 Jan 2008 11:11:52 -0500
-Received: FROM paploo.uhi.ac.uk (app1.prod.collab.uhi.ac.uk [194.35.219.184])
- BY creepshow.mr.itd.umich.edu ID 477E5AB3.5CC32.30840 ;
- 4 Jan 2008 11:11:34 -0500
-Received: from paploo.uhi.ac.uk (localhost [127.0.0.1])
- by paploo.uhi.ac.uk (Postfix) with ESMTP id 62AA4BAE46;
- Fri, 4 Jan 2008 16:11:31 +0000 (GMT)
-Message-ID: <200801041610.m04GA5KP007209@nakamura.uits.iupui.edu>
-Mime-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Received: from prod.collab.uhi.ac.uk ([194.35.219.182])
- by paploo.uhi.ac.uk (JAMES SMTP Server 2.1.3) with SMTP ID 1006
- for ;
- Fri, 4 Jan 2008 16:11:18 +0000 (GMT)
-Received: from nakamura.uits.iupui.edu (nakamura.uits.iupui.edu [134.68.220.122])
- by shmi.uhi.ac.uk (Postfix) with ESMTP id C596A3DFA2
- for ; Fri, 4 Jan 2008 16:11:16 +0000 (GMT)
-Received: from nakamura.uits.iupui.edu (localhost [127.0.0.1])
- by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11) with ESMTP id m04GA5LR007211
- for ; Fri, 4 Jan 2008 11:10:05 -0500
-Received: (from apache@localhost)
- by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11/Submit) id m04GA5KP007209
- for source@collab.sakaiproject.org; Fri, 4 Jan 2008 11:10:05 -0500
-Date: Fri, 4 Jan 2008 11:10:05 -0500
-X-Authentication-Warning: nakamura.uits.iupui.edu: apache set sender to gsilver@umich.edu using -f
-To: source@collab.sakaiproject.org
-From: gsilver@umich.edu
-Subject: [sakai] svn commit: r39761 - site/trunk/site-tool/tool/src/bundle
-X-Content-Type-Outer-Envelope: text/plain; charset=UTF-8
-X-Content-Type-Message-Body: text/plain; charset=UTF-8
-Content-Type: text/plain; charset=UTF-8
-X-DSPAM-Result: Innocent
-X-DSPAM-Processed: Fri Jan 4 11:11:52 2008
-X-DSPAM-Confidence: 0.7605
-X-DSPAM-Probability: 0.0000
-
-Details: http://source.sakaiproject.org/viewsvn/?view=rev&rev=39761
-
-Author: gsilver@umich.edu
-Date: 2008-01-04 11:10:04 -0500 (Fri, 04 Jan 2008)
-New Revision: 39761
-
-Modified:
-site/trunk/site-tool/tool/src/bundle/admin.properties
-Log:
-SAK-12595
-http://bugs.sakaiproject.org/jira/browse/SAK-12595
-- left moot (unused) entries commented for now
-
-----------------------
-This automatic notification message was sent by Sakai Collab (https://collab.sakaiproject.org/portal) from the Source site.
-You can modify how you receive notifications at My Workspace > Preferences.
-
-
-
-From zqian@umich.edu Fri Jan 4 11:11:03 2008
-Return-Path:
-Received: from murder (mail.umich.edu [141.211.14.97])
- by frankenstein.mail.umich.edu (Cyrus v2.3.8) with LMTPA;
- Fri, 04 Jan 2008 11:11:03 -0500
-X-Sieve: CMU Sieve 2.3
-Received: from murder ([unix socket])
- by mail.umich.edu (Cyrus v2.2.12) with LMTPA;
- Fri, 04 Jan 2008 11:11:03 -0500
-Received: from carrie.mr.itd.umich.edu (carrie.mr.itd.umich.edu [141.211.93.152])
- by sleepers.mail.umich.edu () with ESMTP id m04GB3Vg011502;
- Fri, 4 Jan 2008 11:11:03 -0500
-Received: FROM paploo.uhi.ac.uk (app1.prod.collab.uhi.ac.uk [194.35.219.184])
- BY carrie.mr.itd.umich.edu ID 477E5A8D.B378F.24200 ;
- 4 Jan 2008 11:10:56 -0500
-Received: from paploo.uhi.ac.uk (localhost [127.0.0.1])
- by paploo.uhi.ac.uk (Postfix) with ESMTP id C7251BAD44;
- Fri, 4 Jan 2008 16:10:53 +0000 (GMT)
-Message-ID: <200801041609.m04G9EuX007197@nakamura.uits.iupui.edu>
-Mime-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Received: from prod.collab.uhi.ac.uk ([194.35.219.182])
- by paploo.uhi.ac.uk (JAMES SMTP Server 2.1.3) with SMTP ID 483
- for ;
- Fri, 4 Jan 2008 16:10:27 +0000 (GMT)
-Received: from nakamura.uits.iupui.edu (nakamura.uits.iupui.edu [134.68.220.122])
- by shmi.uhi.ac.uk (Postfix) with ESMTP id 2E7043DFA2
- for ; Fri, 4 Jan 2008 16:10:26 +0000 (GMT)
-Received: from nakamura.uits.iupui.edu (localhost [127.0.0.1])
- by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11) with ESMTP id m04G9Eqg007199
- for ; Fri, 4 Jan 2008 11:09:15 -0500
-Received: (from apache@localhost)
- by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11/Submit) id m04G9EuX007197
- for source@collab.sakaiproject.org; Fri, 4 Jan 2008 11:09:14 -0500
-Date: Fri, 4 Jan 2008 11:09:14 -0500
-X-Authentication-Warning: nakamura.uits.iupui.edu: apache set sender to zqian@umich.edu using -f
-To: source@collab.sakaiproject.org
-From: zqian@umich.edu
-Subject: [sakai] svn commit: r39760 - in site-manage/trunk/site-manage-tool/tool/src: java/org/sakaiproject/site/tool webapp/vm/sitesetup
-X-Content-Type-Outer-Envelope: text/plain; charset=UTF-8
-X-Content-Type-Message-Body: text/plain; charset=UTF-8
-Content-Type: text/plain; charset=UTF-8
-X-DSPAM-Result: Innocent
-X-DSPAM-Processed: Fri Jan 4 11:11:03 2008
-X-DSPAM-Confidence: 0.6959
-X-DSPAM-Probability: 0.0000
-
-Details: http://source.sakaiproject.org/viewsvn/?view=rev&rev=39760
-
-Author: zqian@umich.edu
-Date: 2008-01-04 11:09:12 -0500 (Fri, 04 Jan 2008)
-New Revision: 39760
-
-Modified:
-site-manage/trunk/site-manage-tool/tool/src/java/org/sakaiproject/site/tool/SiteAction.java
-site-manage/trunk/site-manage-tool/tool/src/webapp/vm/sitesetup/chef_site-siteInfo-list.vm
-Log:
-fix to SAK-10911: Refactor use of site.upd, site.upd.site.mbrship and site.upd.grp.mbrship permissions
-
-----------------------
-This automatic notification message was sent by Sakai Collab (https://collab.sakaiproject.org/portal) from the Source site.
-You can modify how you receive notifications at My Workspace > Preferences.
-
-
-
-From gsilver@umich.edu Fri Jan 4 11:10:22 2008
-Return-Path:
-Received: from murder (mail.umich.edu [141.211.14.39])
- by frankenstein.mail.umich.edu (Cyrus v2.3.8) with LMTPA;
- Fri, 04 Jan 2008 11:10:22 -0500
-X-Sieve: CMU Sieve 2.3
-Received: from murder ([unix socket])
- by mail.umich.edu (Cyrus v2.2.12) with LMTPA;
- Fri, 04 Jan 2008 11:10:22 -0500
-Received: from holes.mr.itd.umich.edu (holes.mr.itd.umich.edu [141.211.14.79])
- by faithful.mail.umich.edu () with ESMTP id m04GAL9k010604;
- Fri, 4 Jan 2008 11:10:21 -0500
-Received: FROM paploo.uhi.ac.uk (app1.prod.collab.uhi.ac.uk [194.35.219.184])
- BY holes.mr.itd.umich.edu ID 477E5A67.34350.23015 ;
- 4 Jan 2008 11:10:18 -0500
-Received: from paploo.uhi.ac.uk (localhost [127.0.0.1])
- by paploo.uhi.ac.uk (Postfix) with ESMTP id 98D04BAD43;
- Fri, 4 Jan 2008 16:10:11 +0000 (GMT)
-Message-ID: <200801041608.m04G8d7w007184@nakamura.uits.iupui.edu>
-Mime-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Received: from prod.collab.uhi.ac.uk ([194.35.219.182])
- by paploo.uhi.ac.uk (JAMES SMTP Server 2.1.3) with SMTP ID 966
- for ;
- Fri, 4 Jan 2008 16:09:51 +0000 (GMT)
-Received: from nakamura.uits.iupui.edu (nakamura.uits.iupui.edu [134.68.220.122])
- by shmi.uhi.ac.uk (Postfix) with ESMTP id 9F89542DD0
- for ; Fri, 4 Jan 2008 16:09:50 +0000 (GMT)
-Received: from nakamura.uits.iupui.edu (localhost [127.0.0.1])
- by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11) with ESMTP id m04G8dXN007186
- for ; Fri, 4 Jan 2008 11:08:39 -0500
-Received: (from apache@localhost)
- by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11/Submit) id m04G8d7w007184
- for source@collab.sakaiproject.org; Fri, 4 Jan 2008 11:08:39 -0500
-Date: Fri, 4 Jan 2008 11:08:39 -0500
-X-Authentication-Warning: nakamura.uits.iupui.edu: apache set sender to gsilver@umich.edu using -f
-To: source@collab.sakaiproject.org
-From: gsilver@umich.edu
-Subject: [sakai] svn commit: r39759 - mailarchive/trunk/mailarchive-tool/tool/src/bundle
-X-Content-Type-Outer-Envelope: text/plain; charset=UTF-8
-X-Content-Type-Message-Body: text/plain; charset=UTF-8
-Content-Type: text/plain; charset=UTF-8
-X-DSPAM-Result: Innocent
-X-DSPAM-Processed: Fri Jan 4 11:10:22 2008
-X-DSPAM-Confidence: 0.7606
-X-DSPAM-Probability: 0.0000
-
-Details: http://source.sakaiproject.org/viewsvn/?view=rev&rev=39759
-
-Author: gsilver@umich.edu
-Date: 2008-01-04 11:08:38 -0500 (Fri, 04 Jan 2008)
-New Revision: 39759
-
-Modified:
-mailarchive/trunk/mailarchive-tool/tool/src/bundle/email.properties
-Log:
-SAK-12592
-http://bugs.sakaiproject.org/jira/browse/SAK-12592
-- left moot (unused) entries commented for now
-
-----------------------
-This automatic notification message was sent by Sakai Collab (https://collab.sakaiproject.org/portal) from the Source site.
-You can modify how you receive notifications at My Workspace > Preferences.
-
-
-
-From wagnermr@iupui.edu Fri Jan 4 10:38:42 2008
-Return-Path:
-Received: from murder (mail.umich.edu [141.211.14.90])
- by frankenstein.mail.umich.edu (Cyrus v2.3.8) with LMTPA;
- Fri, 04 Jan 2008 10:38:42 -0500
-X-Sieve: CMU Sieve 2.3
-Received: from murder ([unix socket])
- by mail.umich.edu (Cyrus v2.2.12) with LMTPA;
- Fri, 04 Jan 2008 10:38:42 -0500
-Received: from shining.mr.itd.umich.edu (shining.mr.itd.umich.edu [141.211.93.153])
- by flawless.mail.umich.edu () with ESMTP id m04Fcfjm012313;
- Fri, 4 Jan 2008 10:38:41 -0500
-Received: FROM paploo.uhi.ac.uk (app1.prod.collab.uhi.ac.uk [194.35.219.184])
- BY shining.mr.itd.umich.edu ID 477E52FA.E6C6E.24093 ;
- 4 Jan 2008 10:38:37 -0500
-Received: from paploo.uhi.ac.uk (localhost [127.0.0.1])
- by paploo.uhi.ac.uk (Postfix) with ESMTP id 6A39594CD2;
- Fri, 4 Jan 2008 15:37:36 +0000 (GMT)
-Message-ID: <200801041537.m04Fb6Ci007092@nakamura.uits.iupui.edu>
-Mime-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Received: from prod.collab.uhi.ac.uk ([194.35.219.182])
- by paploo.uhi.ac.uk (JAMES SMTP Server 2.1.3) with SMTP ID 690
- for ;
- Fri, 4 Jan 2008 15:37:21 +0000 (GMT)
-Received: from nakamura.uits.iupui.edu (nakamura.uits.iupui.edu [134.68.220.122])
- by shmi.uhi.ac.uk (Postfix) with ESMTP id CEFA037ACE
- for ; Fri, 4 Jan 2008 15:38:17 +0000 (GMT)
-Received: from nakamura.uits.iupui.edu (localhost [127.0.0.1])
- by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11) with ESMTP id m04Fb6nh007094
- for ; Fri, 4 Jan 2008 10:37:06 -0500
-Received: (from apache@localhost)
- by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11/Submit) id m04Fb6Ci007092
- for source@collab.sakaiproject.org; Fri, 4 Jan 2008 10:37:06 -0500
-Date: Fri, 4 Jan 2008 10:37:06 -0500
-X-Authentication-Warning: nakamura.uits.iupui.edu: apache set sender to wagnermr@iupui.edu using -f
-To: source@collab.sakaiproject.org
-From: wagnermr@iupui.edu
-Subject: [sakai] svn commit: r39758 - in gradebook/trunk: app/business/src/java/org/sakaiproject/tool/gradebook/business/impl service/api/src/java/org/sakaiproject/service/gradebook/shared service/impl/src/java/org/sakaiproject/component/gradebook
-X-Content-Type-Outer-Envelope: text/plain; charset=UTF-8
-X-Content-Type-Message-Body: text/plain; charset=UTF-8
-Content-Type: text/plain; charset=UTF-8
-X-DSPAM-Result: Innocent
-X-DSPAM-Processed: Fri Jan 4 10:38:42 2008
-X-DSPAM-Confidence: 0.7559
-X-DSPAM-Probability: 0.0000
-
-Details: http://source.sakaiproject.org/viewsvn/?view=rev&rev=39758
-
-Author: wagnermr@iupui.edu
-Date: 2008-01-04 10:37:04 -0500 (Fri, 04 Jan 2008)
-New Revision: 39758
-
-Modified:
-gradebook/trunk/app/business/src/java/org/sakaiproject/tool/gradebook/business/impl/GradebookManagerHibernateImpl.java
-gradebook/trunk/service/api/src/java/org/sakaiproject/service/gradebook/shared/GradebookService.java
-gradebook/trunk/service/impl/src/java/org/sakaiproject/component/gradebook/GradebookServiceHibernateImpl.java
-Log:
-SAK-12175
-http://bugs.sakaiproject.org/jira/browse/SAK-12175
-Create methods required for gb integration with the Assignment2 tool
-getGradeDefinitionForStudentForItem
-
-----------------------
-This automatic notification message was sent by Sakai Collab (https://collab.sakaiproject.org/portal) from the Source site.
-You can modify how you receive notifications at My Workspace > Preferences.
-
-
-
-From zqian@umich.edu Fri Jan 4 10:17:43 2008
-Return-Path:
-Received: from murder (mail.umich.edu [141.211.14.97])
- by frankenstein.mail.umich.edu (Cyrus v2.3.8) with LMTPA;
- Fri, 04 Jan 2008 10:17:43 -0500
-X-Sieve: CMU Sieve 2.3
-Received: from murder ([unix socket])
- by mail.umich.edu (Cyrus v2.2.12) with LMTPA;
- Fri, 04 Jan 2008 10:17:42 -0500
-Received: from creepshow.mr.itd.umich.edu (creepshow.mr.itd.umich.edu [141.211.14.84])
- by sleepers.mail.umich.edu () with ESMTP id m04FHgfs011536;
- Fri, 4 Jan 2008 10:17:42 -0500
-Received: FROM paploo.uhi.ac.uk (app1.prod.collab.uhi.ac.uk [194.35.219.184])
- BY creepshow.mr.itd.umich.edu ID 477E4E0F.CCA4B.926 ;
- 4 Jan 2008 10:17:38 -0500
-Received: from paploo.uhi.ac.uk (localhost [127.0.0.1])
- by paploo.uhi.ac.uk (Postfix) with ESMTP id BD02DBAC64;
- Fri, 4 Jan 2008 15:17:34 +0000 (GMT)
-Message-ID: <200801041515.m04FFv42007050@nakamura.uits.iupui.edu>
-Mime-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Received: from prod.collab.uhi.ac.uk ([194.35.219.182])
- by paploo.uhi.ac.uk (JAMES SMTP Server 2.1.3) with SMTP ID 25
- for ;
- Fri, 4 Jan 2008 15:17:11 +0000 (GMT)
-Received: from nakamura.uits.iupui.edu (nakamura.uits.iupui.edu [134.68.220.122])
- by shmi.uhi.ac.uk (Postfix) with ESMTP id 5B396236B9
- for ; Fri, 4 Jan 2008 15:17:08 +0000 (GMT)
-Received: from nakamura.uits.iupui.edu (localhost [127.0.0.1])
- by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11) with ESMTP id m04FFv85007052
- for ; Fri, 4 Jan 2008 10:15:57 -0500
-Received: (from apache@localhost)
- by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11/Submit) id m04FFv42007050
- for source@collab.sakaiproject.org; Fri, 4 Jan 2008 10:15:57 -0500
-Date: Fri, 4 Jan 2008 10:15:57 -0500
-X-Authentication-Warning: nakamura.uits.iupui.edu: apache set sender to zqian@umich.edu using -f
-To: source@collab.sakaiproject.org
-From: zqian@umich.edu
-Subject: [sakai] svn commit: r39757 - in assignment/trunk: assignment-impl/impl/src/java/org/sakaiproject/assignment/impl assignment-tool/tool/src/webapp/vm/assignment
-X-Content-Type-Outer-Envelope: text/plain; charset=UTF-8
-X-Content-Type-Message-Body: text/plain; charset=UTF-8
-Content-Type: text/plain; charset=UTF-8
-X-DSPAM-Result: Innocent
-X-DSPAM-Processed: Fri Jan 4 10:17:42 2008
-X-DSPAM-Confidence: 0.7605
-X-DSPAM-Probability: 0.0000
-
-Details: http://source.sakaiproject.org/viewsvn/?view=rev&rev=39757
-
-Author: zqian@umich.edu
-Date: 2008-01-04 10:15:54 -0500 (Fri, 04 Jan 2008)
-New Revision: 39757
-
-Modified:
-assignment/trunk/assignment-impl/impl/src/java/org/sakaiproject/assignment/impl/BaseAssignmentService.java
-assignment/trunk/assignment-tool/tool/src/webapp/vm/assignment/chef_assignments_instructor_list_submissions.vm
-Log:
-fix to SAK-12604:Don't show groups/sections filter if the site doesn't have any
-
-----------------------
-This automatic notification message was sent by Sakai Collab (https://collab.sakaiproject.org/portal) from the Source site.
-You can modify how you receive notifications at My Workspace > Preferences.
-
-
-
-From antranig@caret.cam.ac.uk Fri Jan 4 10:04:14 2008
-Return-Path:
-Received: from murder (mail.umich.edu [141.211.14.25])
- by frankenstein.mail.umich.edu (Cyrus v2.3.8) with LMTPA;
- Fri, 04 Jan 2008 10:04:14 -0500
-X-Sieve: CMU Sieve 2.3
-Received: from murder ([unix socket])
- by mail.umich.edu (Cyrus v2.2.12) with LMTPA;
- Fri, 04 Jan 2008 10:04:14 -0500
-Received: from holes.mr.itd.umich.edu (holes.mr.itd.umich.edu [141.211.14.79])
- by panther.mail.umich.edu () with ESMTP id m04F4Dci015108;
- Fri, 4 Jan 2008 10:04:13 -0500
-Received: FROM paploo.uhi.ac.uk (app1.prod.collab.uhi.ac.uk [194.35.219.184])
- BY holes.mr.itd.umich.edu ID 477E4AE3.D7AF.31669 ;
- 4 Jan 2008 10:04:05 -0500
-Received: from paploo.uhi.ac.uk (localhost [127.0.0.1])
- by paploo.uhi.ac.uk (Postfix) with ESMTP id 933E3BAC17;
- Fri, 4 Jan 2008 15:04:00 +0000 (GMT)
-Message-ID: <200801041502.m04F21Jo007031@nakamura.uits.iupui.edu>
-Mime-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Received: from prod.collab.uhi.ac.uk ([194.35.219.182])
- by paploo.uhi.ac.uk (JAMES SMTP Server 2.1.3) with SMTP ID 32
- for ;
- Fri, 4 Jan 2008 15:03:15 +0000 (GMT)
-Received: from nakamura.uits.iupui.edu (nakamura.uits.iupui.edu [134.68.220.122])
- by shmi.uhi.ac.uk (Postfix) with ESMTP id AC2F6236B9
- for ; Fri, 4 Jan 2008 15:03:12 +0000 (GMT)
-Received: from nakamura.uits.iupui.edu (localhost [127.0.0.1])
- by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11) with ESMTP id m04F21hn007033
- for ; Fri, 4 Jan 2008 10:02:01 -0500
-Received: (from apache@localhost)
- by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11/Submit) id m04F21Jo007031
- for source@collab.sakaiproject.org; Fri, 4 Jan 2008 10:02:01 -0500
-Date: Fri, 4 Jan 2008 10:02:01 -0500
-X-Authentication-Warning: nakamura.uits.iupui.edu: apache set sender to antranig@caret.cam.ac.uk using -f
-To: source@collab.sakaiproject.org
-From: antranig@caret.cam.ac.uk
-Subject: [sakai] svn commit: r39756 - in component/branches/SAK-12166/component-api/component/src/java/org/sakaiproject/component: impl impl/spring/support impl/spring/support/dynamic impl/support util
-X-Content-Type-Outer-Envelope: text/plain; charset=UTF-8
-X-Content-Type-Message-Body: text/plain; charset=UTF-8
-Content-Type: text/plain; charset=UTF-8
-X-DSPAM-Result: Innocent
-X-DSPAM-Processed: Fri Jan 4 10:04:14 2008
-X-DSPAM-Confidence: 0.6932
-X-DSPAM-Probability: 0.0000
-
-Details: http://source.sakaiproject.org/viewsvn/?view=rev&rev=39756
-
-Author: antranig@caret.cam.ac.uk
-Date: 2008-01-04 10:01:40 -0500 (Fri, 04 Jan 2008)
-New Revision: 39756
-
-Added:
-component/branches/SAK-12166/component-api/component/src/java/org/sakaiproject/component/impl/spring/support/dynamic/
-component/branches/SAK-12166/component-api/component/src/java/org/sakaiproject/component/impl/spring/support/dynamic/DynamicComponentManager.java
-component/branches/SAK-12166/component-api/component/src/java/org/sakaiproject/component/impl/support/
-component/branches/SAK-12166/component-api/component/src/java/org/sakaiproject/component/impl/support/DynamicComponentRecord.java
-component/branches/SAK-12166/component-api/component/src/java/org/sakaiproject/component/impl/support/DynamicJARManager.java
-component/branches/SAK-12166/component-api/component/src/java/org/sakaiproject/component/impl/support/JARRecord.java
-component/branches/SAK-12166/component-api/component/src/java/org/sakaiproject/component/util/ByteToCharBase64.java
-component/branches/SAK-12166/component-api/component/src/java/org/sakaiproject/component/util/FileUtil.java
-component/branches/SAK-12166/component-api/component/src/java/org/sakaiproject/component/util/RecordFileIO.java
-component/branches/SAK-12166/component-api/component/src/java/org/sakaiproject/component/util/RecordReader.java
-component/branches/SAK-12166/component-api/component/src/java/org/sakaiproject/component/util/RecordWriter.java
-component/branches/SAK-12166/component-api/component/src/java/org/sakaiproject/component/util/StreamDigestor.java
-Modified:
-component/branches/SAK-12166/component-api/component/src/java/org/sakaiproject/component/impl/spring/support/ComponentsLoaderImpl.java
-Log:
-Temporary commit of incomplete work on JAR caching
-
-----------------------
-This automatic notification message was sent by Sakai Collab (https://collab.sakaiproject.org/portal) from the Source site.
-You can modify how you receive notifications at My Workspace > Preferences.
-
-
-
-From gopal.ramasammycook@gmail.com Fri Jan 4 09:05:31 2008
-Return-Path:
-Received: from murder (mail.umich.edu [141.211.14.90])
- by frankenstein.mail.umich.edu (Cyrus v2.3.8) with LMTPA;
- Fri, 04 Jan 2008 09:05:31 -0500
-X-Sieve: CMU Sieve 2.3
-Received: from murder ([unix socket])
- by mail.umich.edu (Cyrus v2.2.12) with LMTPA;
- Fri, 04 Jan 2008 09:05:31 -0500
-Received: from guys.mr.itd.umich.edu (guys.mr.itd.umich.edu [141.211.14.76])
- by flawless.mail.umich.edu () with ESMTP id m04E5U3C029277;
- Fri, 4 Jan 2008 09:05:30 -0500
-Received: FROM paploo.uhi.ac.uk (app1.prod.collab.uhi.ac.uk [194.35.219.184])
- BY guys.mr.itd.umich.edu ID 477E3D23.EE2E7.5237 ;
- 4 Jan 2008 09:05:26 -0500
-Received: from paploo.uhi.ac.uk (localhost [127.0.0.1])
- by paploo.uhi.ac.uk (Postfix) with ESMTP id 33C7856DC0;
- Fri, 4 Jan 2008 14:05:26 +0000 (GMT)
-Message-ID: <200801041403.m04E3psW006926@nakamura.uits.iupui.edu>
-Mime-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Received: from prod.collab.uhi.ac.uk ([194.35.219.182])
- by paploo.uhi.ac.uk (JAMES SMTP Server 2.1.3) with SMTP ID 575
- for ;
- Fri, 4 Jan 2008 14:05:04 +0000 (GMT)
-Received: from nakamura.uits.iupui.edu (nakamura.uits.iupui.edu [134.68.220.122])
- by shmi.uhi.ac.uk (Postfix) with ESMTP id 3C0261D617
- for ; Fri, 4 Jan 2008 14:05:03 +0000 (GMT)
-Received: from nakamura.uits.iupui.edu (localhost [127.0.0.1])
- by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11) with ESMTP id m04E3pQS006928
- for ; Fri, 4 Jan 2008 09:03:52 -0500
-Received: (from apache@localhost)
- by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11/Submit) id m04E3psW006926
- for source@collab.sakaiproject.org; Fri, 4 Jan 2008 09:03:51 -0500
-Date: Fri, 4 Jan 2008 09:03:51 -0500
-X-Authentication-Warning: nakamura.uits.iupui.edu: apache set sender to gopal.ramasammycook@gmail.com using -f
-To: source@collab.sakaiproject.org
-From: gopal.ramasammycook@gmail.com
-Subject: [sakai] svn commit: r39755 - in sam/branches/SAK-12065: samigo-api/src/java/org/sakaiproject/tool/assessment/shared/api/grading samigo-app/src/java/org/sakaiproject/tool/assessment/ui/bean/evaluation samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/evaluation samigo-services/src/java/org/sakaiproject/tool/assessment/facade samigo-services/src/java/org/sakaiproject/tool/assessment/integration/helper/ifc samigo-services/src/java/org/sakaiproject/tool/assessment/integration/helper/integrated samigo-services/src/java/org/sakaiproject/tool/assessment/integration/helper/standalone samigo-services/src/java/org/sakaiproject/tool/assessment/shared/impl/grading
-X-Content-Type-Outer-Envelope: text/plain; charset=UTF-8
-X-Content-Type-Message-Body: text/plain; charset=UTF-8
-Content-Type: text/plain; charset=UTF-8
-X-DSPAM-Result: Innocent
-X-DSPAM-Processed: Fri Jan 4 09:05:31 2008
-X-DSPAM-Confidence: 0.7558
-X-DSPAM-Probability: 0.0000
-
-Details: http://source.sakaiproject.org/viewsvn/?view=rev&rev=39755
-
-Author: gopal.ramasammycook@gmail.com
-Date: 2008-01-04 09:02:54 -0500 (Fri, 04 Jan 2008)
-New Revision: 39755
-
-Modified:
-sam/branches/SAK-12065/samigo-api/src/java/org/sakaiproject/tool/assessment/shared/api/grading/GradingSectionAwareServiceAPI.java
-sam/branches/SAK-12065/samigo-app/src/java/org/sakaiproject/tool/assessment/ui/bean/evaluation/QuestionScoresBean.java
-sam/branches/SAK-12065/samigo-app/src/java/org/sakaiproject/tool/assessment/ui/bean/evaluation/SubmissionStatusBean.java
-sam/branches/SAK-12065/samigo-app/src/java/org/sakaiproject/tool/assessment/ui/bean/evaluation/TotalScoresBean.java
-sam/branches/SAK-12065/samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/evaluation/SubmissionStatusListener.java
-sam/branches/SAK-12065/samigo-services/src/java/org/sakaiproject/tool/assessment/facade/PublishedAssessmentFacadeQueries.java
-sam/branches/SAK-12065/samigo-services/src/java/org/sakaiproject/tool/assessment/facade/PublishedAssessmentFacadeQueriesAPI.java
-sam/branches/SAK-12065/samigo-services/src/java/org/sakaiproject/tool/assessment/integration/helper/ifc/SectionAwareServiceHelper.java
-sam/branches/SAK-12065/samigo-services/src/java/org/sakaiproject/tool/assessment/integration/helper/integrated/SectionAwareServiceHelperImpl.java
-sam/branches/SAK-12065/samigo-services/src/java/org/sakaiproject/tool/assessment/integration/helper/standalone/SectionAwareServiceHelperImpl.java
-sam/branches/SAK-12065/samigo-services/src/java/org/sakaiproject/tool/assessment/shared/impl/grading/GradingSectionAwareServiceImpl.java
-Log:
-SAK-12065 Gopal - Samigo Group Release. SubmissionStatus/TotalScores/Questions View filter.
-
-----------------------
-This automatic notification message was sent by Sakai Collab (https://collab.sakaiproject.org/portal) from the Source site.
-You can modify how you receive notifications at My Workspace > Preferences.
-
-
-
-From david.horwitz@uct.ac.za Fri Jan 4 07:02:32 2008
-Return-Path:
-Received: from murder (mail.umich.edu [141.211.14.39])
- by frankenstein.mail.umich.edu (Cyrus v2.3.8) with LMTPA;
- Fri, 04 Jan 2008 07:02:32 -0500
-X-Sieve: CMU Sieve 2.3
-Received: from murder ([unix socket])
- by mail.umich.edu (Cyrus v2.2.12) with LMTPA;
- Fri, 04 Jan 2008 07:02:32 -0500
-Received: from guys.mr.itd.umich.edu (guys.mr.itd.umich.edu [141.211.14.76])
- by faithful.mail.umich.edu () with ESMTP id m04C2VN7026678;
- Fri, 4 Jan 2008 07:02:31 -0500
-Received: FROM paploo.uhi.ac.uk (app1.prod.collab.uhi.ac.uk [194.35.219.184])
- BY guys.mr.itd.umich.edu ID 477E2050.C2599.3263 ;
- 4 Jan 2008 07:02:27 -0500
-Received: from paploo.uhi.ac.uk (localhost [127.0.0.1])
- by paploo.uhi.ac.uk (Postfix) with ESMTP id 6497FBA906;
- Fri, 4 Jan 2008 12:02:11 +0000 (GMT)
-Message-ID: <200801041200.m04C0gfK006793@nakamura.uits.iupui.edu>
-Mime-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Received: from prod.collab.uhi.ac.uk ([194.35.219.182])
- by paploo.uhi.ac.uk (JAMES SMTP Server 2.1.3) with SMTP ID 611
- for ;
- Fri, 4 Jan 2008 12:01:53 +0000 (GMT)
-Received: from nakamura.uits.iupui.edu (nakamura.uits.iupui.edu [134.68.220.122])
- by shmi.uhi.ac.uk (Postfix) with ESMTP id 5296342D3C
- for ; Fri, 4 Jan 2008 12:01:53 +0000 (GMT)
-Received: from nakamura.uits.iupui.edu (localhost [127.0.0.1])
- by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11) with ESMTP id m04C0gnm006795
- for ; Fri, 4 Jan 2008 07:00:42 -0500
-Received: (from apache@localhost)
- by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11/Submit) id m04C0gfK006793
- for source@collab.sakaiproject.org; Fri, 4 Jan 2008 07:00:42 -0500
-Date: Fri, 4 Jan 2008 07:00:42 -0500
-X-Authentication-Warning: nakamura.uits.iupui.edu: apache set sender to david.horwitz@uct.ac.za using -f
-To: source@collab.sakaiproject.org
-From: david.horwitz@uct.ac.za
-Subject: [sakai] svn commit: r39754 - in polls/branches/sakai_2-5-x: . tool tool/src/java/org/sakaiproject/poll/tool tool/src/java/org/sakaiproject/poll/tool/evolvers tool/src/webapp/WEB-INF
-X-Content-Type-Outer-Envelope: text/plain; charset=UTF-8
-X-Content-Type-Message-Body: text/plain; charset=UTF-8
-Content-Type: text/plain; charset=UTF-8
-X-DSPAM-Result: Innocent
-X-DSPAM-Processed: Fri Jan 4 07:02:32 2008
-X-DSPAM-Confidence: 0.6526
-X-DSPAM-Probability: 0.0000
-
-Details: http://source.sakaiproject.org/viewsvn/?view=rev&rev=39754
-
-Author: david.horwitz@uct.ac.za
-Date: 2008-01-04 07:00:10 -0500 (Fri, 04 Jan 2008)
-New Revision: 39754
-
-Added:
-polls/branches/sakai_2-5-x/tool/src/java/org/sakaiproject/poll/tool/evolvers/
-polls/branches/sakai_2-5-x/tool/src/java/org/sakaiproject/poll/tool/evolvers/SakaiFCKTextEvolver.java
-Removed:
-polls/branches/sakai_2-5-x/tool/src/java/org/sakaiproject/poll/tool/evolvers/SakaiFCKTextEvolver.java
-Modified:
-polls/branches/sakai_2-5-x/.classpath
-polls/branches/sakai_2-5-x/tool/pom.xml
-polls/branches/sakai_2-5-x/tool/src/webapp/WEB-INF/requestContext.xml
-Log:
-svn log -r39753 https://source.sakaiproject.org/svn/polls/trunk
-------------------------------------------------------------------------
-r39753 | david.horwitz@uct.ac.za | 2008-01-04 13:05:51 +0200 (Fri, 04 Jan 2008) | 1 line
-
-SAK-12228 implmented workaround sugested by AB - needs to be tested against a trunk build
-------------------------------------------------------------------------
-dhorwitz@david-horwitz-6:~/branchManagemnt/sakai_2-5-x> svn merge -c39753 https://source.sakaiproject.org/svn/polls/trunk polls/
-U polls/.classpath
-A polls/tool/src/java/org/sakaiproject/poll/tool/evolvers
-A polls/tool/src/java/org/sakaiproject/poll/tool/evolvers/SakaiFCKTextEvolver.java
-C polls/tool/src/webapp/WEB-INF/requestContext.xml
-U polls/tool/pom.xml
-
-dhorwitz@david-horwitz-6:~/branchManagemnt/sakai_2-5-x> svn resolved polls/tool/src/webapp/WEB-INF/requestContext.xml
-Resolved conflicted state of 'polls/tool/src/webapp/WEB-INF/requestContext.xml
-
-
-----------------------
-This automatic notification message was sent by Sakai Collab (https://collab.sakaiproject.org/portal) from the Source site.
-You can modify how you receive notifications at My Workspace > Preferences.
-
-
-
-From david.horwitz@uct.ac.za Fri Jan 4 06:08:27 2008
-Return-Path:
-Received: from murder (mail.umich.edu [141.211.14.98])
- by frankenstein.mail.umich.edu (Cyrus v2.3.8) with LMTPA;
- Fri, 04 Jan 2008 06:08:27 -0500
-X-Sieve: CMU Sieve 2.3
-Received: from murder ([unix socket])
- by mail.umich.edu (Cyrus v2.2.12) with LMTPA;
- Fri, 04 Jan 2008 06:08:27 -0500
-Received: from firestarter.mr.itd.umich.edu (firestarter.mr.itd.umich.edu [141.211.14.83])
- by casino.mail.umich.edu () with ESMTP id m04B8Qw9001368;
- Fri, 4 Jan 2008 06:08:26 -0500
-Received: FROM paploo.uhi.ac.uk (app1.prod.collab.uhi.ac.uk [194.35.219.184])
- BY firestarter.mr.itd.umich.edu ID 477E13A5.30FC0.24054 ;
- 4 Jan 2008 06:08:23 -0500
-Received: from paploo.uhi.ac.uk (localhost [127.0.0.1])
- by paploo.uhi.ac.uk (Postfix) with ESMTP id 784A476D7B;
- Fri, 4 Jan 2008 11:08:12 +0000 (GMT)
-Message-ID: <200801041106.m04B6lK3006677@nakamura.uits.iupui.edu>
-Mime-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Received: from prod.collab.uhi.ac.uk ([194.35.219.182])
- by paploo.uhi.ac.uk (JAMES SMTP Server 2.1.3) with SMTP ID 585
- for ;
- Fri, 4 Jan 2008 11:07:56 +0000 (GMT)
-Received: from nakamura.uits.iupui.edu (nakamura.uits.iupui.edu [134.68.220.122])
- by shmi.uhi.ac.uk (Postfix) with ESMTP id 1CACC42D0C
- for ; Fri, 4 Jan 2008 11:07:58 +0000 (GMT)
-Received: from nakamura.uits.iupui.edu (localhost [127.0.0.1])
- by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11) with ESMTP id m04B6lWM006679
- for ; Fri, 4 Jan 2008 06:06:47 -0500
-Received: (from apache@localhost)
- by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11/Submit) id m04B6lK3006677
- for source@collab.sakaiproject.org; Fri, 4 Jan 2008 06:06:47 -0500
-Date: Fri, 4 Jan 2008 06:06:47 -0500
-X-Authentication-Warning: nakamura.uits.iupui.edu: apache set sender to david.horwitz@uct.ac.za using -f
-To: source@collab.sakaiproject.org
-From: david.horwitz@uct.ac.za
-Subject: [sakai] svn commit: r39753 - in polls/trunk: . tool tool/src/java/org/sakaiproject/poll/tool tool/src/java/org/sakaiproject/poll/tool/evolvers tool/src/webapp/WEB-INF
-X-Content-Type-Outer-Envelope: text/plain; charset=UTF-8
-X-Content-Type-Message-Body: text/plain; charset=UTF-8
-Content-Type: text/plain; charset=UTF-8
-X-DSPAM-Result: Innocent
-X-DSPAM-Processed: Fri Jan 4 06:08:27 2008
-X-DSPAM-Confidence: 0.6948
-X-DSPAM-Probability: 0.0000
-
-Details: http://source.sakaiproject.org/viewsvn/?view=rev&rev=39753
-
-Author: david.horwitz@uct.ac.za
-Date: 2008-01-04 06:05:51 -0500 (Fri, 04 Jan 2008)
-New Revision: 39753
-
-Added:
-polls/trunk/tool/src/java/org/sakaiproject/poll/tool/evolvers/
-polls/trunk/tool/src/java/org/sakaiproject/poll/tool/evolvers/SakaiFCKTextEvolver.java
-Modified:
-polls/trunk/.classpath
-polls/trunk/tool/pom.xml
-polls/trunk/tool/src/webapp/WEB-INF/requestContext.xml
-Log:
-SAK-12228 implmented workaround sugested by AB - needs to be tested against a trunk build
-
-----------------------
-This automatic notification message was sent by Sakai Collab (https://collab.sakaiproject.org/portal) from the Source site.
-You can modify how you receive notifications at My Workspace > Preferences.
-
-
-
-From david.horwitz@uct.ac.za Fri Jan 4 04:49:08 2008
-Return-Path:
-Received: from murder (mail.umich.edu [141.211.14.92])
- by frankenstein.mail.umich.edu (Cyrus v2.3.8) with LMTPA;
- Fri, 04 Jan 2008 04:49:08 -0500
-X-Sieve: CMU Sieve 2.3
-Received: from murder ([unix socket])
- by mail.umich.edu (Cyrus v2.2.12) with LMTPA;
- Fri, 04 Jan 2008 04:49:08 -0500
-Received: from galaxyquest.mr.itd.umich.edu (galaxyquest.mr.itd.umich.edu [141.211.93.145])
- by score.mail.umich.edu () with ESMTP id m049n60G017588;
- Fri, 4 Jan 2008 04:49:06 -0500
-Received: FROM paploo.uhi.ac.uk (app1.prod.collab.uhi.ac.uk [194.35.219.184])
- BY galaxyquest.mr.itd.umich.edu ID 477E010C.48C2.10259 ;
- 4 Jan 2008 04:49:03 -0500
-Received: from paploo.uhi.ac.uk (localhost [127.0.0.1])
- by paploo.uhi.ac.uk (Postfix) with ESMTP id 254CC8CDEE;
- Fri, 4 Jan 2008 09:48:55 +0000 (GMT)
-Message-ID: <200801040947.m049lUxo006517@nakamura.uits.iupui.edu>
-Mime-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Received: from prod.collab.uhi.ac.uk ([194.35.219.182])
- by paploo.uhi.ac.uk (JAMES SMTP Server 2.1.3) with SMTP ID 246
- for ;
- Fri, 4 Jan 2008 09:48:36 +0000 (GMT)
-Received: from nakamura.uits.iupui.edu (nakamura.uits.iupui.edu [134.68.220.122])
- by shmi.uhi.ac.uk (Postfix) with ESMTP id 8C13342C92
- for ; Fri, 4 Jan 2008 09:48:40 +0000 (GMT)
-Received: from nakamura.uits.iupui.edu (localhost [127.0.0.1])
- by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11) with ESMTP id m049lU3P006519
- for ; Fri, 4 Jan 2008 04:47:30 -0500
-Received: (from apache@localhost)
- by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11/Submit) id m049lUxo006517
- for source@collab.sakaiproject.org; Fri, 4 Jan 2008 04:47:30 -0500
-Date: Fri, 4 Jan 2008 04:47:30 -0500
-X-Authentication-Warning: nakamura.uits.iupui.edu: apache set sender to david.horwitz@uct.ac.za using -f
-To: source@collab.sakaiproject.org
-From: david.horwitz@uct.ac.za
-Subject: [sakai] svn commit: r39752 - in podcasts/branches/sakai_2-5-x/podcasts-app/src/webapp: css podcasts
-X-Content-Type-Outer-Envelope: text/plain; charset=UTF-8
-X-Content-Type-Message-Body: text/plain; charset=UTF-8
-Content-Type: text/plain; charset=UTF-8
-X-DSPAM-Result: Innocent
-X-DSPAM-Processed: Fri Jan 4 04:49:08 2008
-X-DSPAM-Confidence: 0.6528
-X-DSPAM-Probability: 0.0000
-
-Details: http://source.sakaiproject.org/viewsvn/?view=rev&rev=39752
-
-Author: david.horwitz@uct.ac.za
-Date: 2008-01-04 04:47:16 -0500 (Fri, 04 Jan 2008)
-New Revision: 39752
-
-Modified:
-podcasts/branches/sakai_2-5-x/podcasts-app/src/webapp/css/podcaster.css
-podcasts/branches/sakai_2-5-x/podcasts-app/src/webapp/podcasts/podMain.jsp
-Log:
-svn log -r39641 https://source.sakaiproject.org/svn/podcasts/trunk
-------------------------------------------------------------------------
-r39641 | josrodri@iupui.edu | 2007-12-28 23:44:24 +0200 (Fri, 28 Dec 2007) | 1 line
-
-SAK-9882: refactored podMain.jsp the right way (at least much closer to)
-------------------------------------------------------------------------
-
-dhorwitz@david-horwitz-6:~/branchManagemnt/sakai_2-5-x> svn merge -c39641 https://source.sakaiproject.org/svn/podcasts/trunk podcasts/
-C podcasts/podcasts-app/src/webapp/podcasts/podMain.jsp
-U podcasts/podcasts-app/src/webapp/css/podcaster.css
-
-conflict merged manualy
-
-
-
-----------------------
-This automatic notification message was sent by Sakai Collab (https://collab.sakaiproject.org/portal) from the Source site.
-You can modify how you receive notifications at My Workspace > Preferences.
-
-
-
-From david.horwitz@uct.ac.za Fri Jan 4 04:33:44 2008
-Return-Path:
-Received: from murder (mail.umich.edu [141.211.14.46])
- by frankenstein.mail.umich.edu (Cyrus v2.3.8) with LMTPA;
- Fri, 04 Jan 2008 04:33:44 -0500
-X-Sieve: CMU Sieve 2.3
-Received: from murder ([unix socket])
- by mail.umich.edu (Cyrus v2.2.12) with LMTPA;
- Fri, 04 Jan 2008 04:33:44 -0500
-Received: from workinggirl.mr.itd.umich.edu (workinggirl.mr.itd.umich.edu [141.211.93.143])
- by fan.mail.umich.edu () with ESMTP id m049Xge3031803;
- Fri, 4 Jan 2008 04:33:42 -0500
-Received: FROM paploo.uhi.ac.uk (app1.prod.collab.uhi.ac.uk [194.35.219.184])
- BY workinggirl.mr.itd.umich.edu ID 477DFD6C.75DBE.26054 ;
- 4 Jan 2008 04:33:35 -0500
-Received: from paploo.uhi.ac.uk (localhost [127.0.0.1])
- by paploo.uhi.ac.uk (Postfix) with ESMTP id 6C929BA656;
- Fri, 4 Jan 2008 09:33:27 +0000 (GMT)
-Message-ID: <200801040932.m049W2i5006493@nakamura.uits.iupui.edu>
-Mime-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Received: from prod.collab.uhi.ac.uk ([194.35.219.182])
- by paploo.uhi.ac.uk (JAMES SMTP Server 2.1.3) with SMTP ID 153
- for ;
- Fri, 4 Jan 2008 09:33:10 +0000 (GMT)
-Received: from nakamura.uits.iupui.edu (nakamura.uits.iupui.edu [134.68.220.122])
- by shmi.uhi.ac.uk (Postfix) with ESMTP id 6C69423767
- for ; Fri, 4 Jan 2008 09:33:13 +0000 (GMT)
-Received: from nakamura.uits.iupui.edu (localhost [127.0.0.1])
- by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11) with ESMTP id m049W3fl006495
- for ; Fri, 4 Jan 2008 04:32:03 -0500
-Received: (from apache@localhost)
- by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11/Submit) id m049W2i5006493
- for source@collab.sakaiproject.org; Fri, 4 Jan 2008 04:32:02 -0500
-Date: Fri, 4 Jan 2008 04:32:02 -0500
-X-Authentication-Warning: nakamura.uits.iupui.edu: apache set sender to david.horwitz@uct.ac.za using -f
-To: source@collab.sakaiproject.org
-From: david.horwitz@uct.ac.za
-Subject: [sakai] svn commit: r39751 - in podcasts/branches/sakai_2-5-x/podcasts-app/src/webapp: css images podcasts
-X-Content-Type-Outer-Envelope: text/plain; charset=UTF-8
-X-Content-Type-Message-Body: text/plain; charset=UTF-8
-Content-Type: text/plain; charset=UTF-8
-X-DSPAM-Result: Innocent
-X-DSPAM-Processed: Fri Jan 4 04:33:44 2008
-X-DSPAM-Confidence: 0.7002
-X-DSPAM-Probability: 0.0000
-
-Details: http://source.sakaiproject.org/viewsvn/?view=rev&rev=39751
-
-Author: david.horwitz@uct.ac.za
-Date: 2008-01-04 04:31:35 -0500 (Fri, 04 Jan 2008)
-New Revision: 39751
-
-Removed:
-podcasts/branches/sakai_2-5-x/podcasts-app/src/webapp/images/rss-feed-icon.png
-podcasts/branches/sakai_2-5-x/podcasts-app/src/webapp/podcasts/podPermissions.jsp
-Modified:
-podcasts/branches/sakai_2-5-x/podcasts-app/src/webapp/css/podcaster.css
-podcasts/branches/sakai_2-5-x/podcasts-app/src/webapp/podcasts/podDelete.jsp
-podcasts/branches/sakai_2-5-x/podcasts-app/src/webapp/podcasts/podMain.jsp
-podcasts/branches/sakai_2-5-x/podcasts-app/src/webapp/podcasts/podNoResource.jsp
-podcasts/branches/sakai_2-5-x/podcasts-app/src/webapp/podcasts/podOptions.jsp
-Log:
-svn log -r39146 https://source.sakaiproject.org/svn/podcasts/trunk
-------------------------------------------------------------------------
-r39146 | josrodri@iupui.edu | 2007-12-12 21:40:33 +0200 (Wed, 12 Dec 2007) | 1 line
-
-SAK-9882: refactored the other pages as well to take advantage of proper jsp components as well as validation cleanup.
-------------------------------------------------------------------------
-dhorwitz@david-horwitz-6:~/branchManagemnt/sakai_2-5-x> svn merge -c39146 https://source.sakaiproject.org/svn/podcasts/trunk podcasts/
-D podcasts/podcasts-app/src/webapp/podcasts/podPermissions.jsp
-U podcasts/podcasts-app/src/webapp/podcasts/podDelete.jsp
-U podcasts/podcasts-app/src/webapp/podcasts/podMain.jsp
-U podcasts/podcasts-app/src/webapp/podcasts/podNoResource.jsp
-U podcasts/podcasts-app/src/webapp/podcasts/podOptions.jsp
-D podcasts/podcasts-app/src/webapp/images/rss-feed-icon.png
-U podcasts/podcasts-app/src/webapp/css/podcaster.css
-
-
-
-----------------------
-This automatic notification message was sent by Sakai Collab (https://collab.sakaiproject.org/portal) from the Source site.
-You can modify how you receive notifications at My Workspace > Preferences.
-
-
-
-From stephen.marquard@uct.ac.za Fri Jan 4 04:07:34 2008
-Return-Path:
-Received: from murder (mail.umich.edu [141.211.14.25])
- by frankenstein.mail.umich.edu (Cyrus v2.3.8) with LMTPA;
- Fri, 04 Jan 2008 04:07:34 -0500
-X-Sieve: CMU Sieve 2.3
-Received: from murder ([unix socket])
- by mail.umich.edu (Cyrus v2.2.12) with LMTPA;
- Fri, 04 Jan 2008 04:07:34 -0500
-Received: from salemslot.mr.itd.umich.edu (salemslot.mr.itd.umich.edu [141.211.14.58])
- by panther.mail.umich.edu () with ESMTP id m0497WAN027902;
- Fri, 4 Jan 2008 04:07:32 -0500
-Received: FROM paploo.uhi.ac.uk (app1.prod.collab.uhi.ac.uk [194.35.219.184])
- BY salemslot.mr.itd.umich.edu ID 477DF74E.49493.30415 ;
- 4 Jan 2008 04:07:29 -0500
-Received: from paploo.uhi.ac.uk (localhost [127.0.0.1])
- by paploo.uhi.ac.uk (Postfix) with ESMTP id 88598BA5B6;
- Fri, 4 Jan 2008 09:07:19 +0000 (GMT)
-Message-ID: <200801040905.m0495rWB006420@nakamura.uits.iupui.edu>
-Mime-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Received: from prod.collab.uhi.ac.uk ([194.35.219.182])
- by paploo.uhi.ac.uk (JAMES SMTP Server 2.1.3) with SMTP ID 385
- for ;
- Fri, 4 Jan 2008 09:07:04 +0000 (GMT)
-Received: from nakamura.uits.iupui.edu (nakamura.uits.iupui.edu [134.68.220.122])
- by shmi.uhi.ac.uk (Postfix) with ESMTP id 90636418A8
- for ; Fri, 4 Jan 2008 09:07:04 +0000 (GMT)
-Received: from nakamura.uits.iupui.edu (localhost [127.0.0.1])
- by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11) with ESMTP id m0495sZs006422
- for ; Fri, 4 Jan 2008 04:05:54 -0500
-Received: (from apache@localhost)
- by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11/Submit) id m0495rWB006420
- for source@collab.sakaiproject.org; Fri, 4 Jan 2008 04:05:53 -0500
-Date: Fri, 4 Jan 2008 04:05:53 -0500
-X-Authentication-Warning: nakamura.uits.iupui.edu: apache set sender to stephen.marquard@uct.ac.za using -f
-To: source@collab.sakaiproject.org
-From: stephen.marquard@uct.ac.za
-Subject: [sakai] svn commit: r39750 - event/branches/SAK-6216/event-util/util/src/java/org/sakaiproject/util
-X-Content-Type-Outer-Envelope: text/plain; charset=UTF-8
-X-Content-Type-Message-Body: text/plain; charset=UTF-8
-Content-Type: text/plain; charset=UTF-8
-X-DSPAM-Result: Innocent
-X-DSPAM-Processed: Fri Jan 4 04:07:34 2008
-X-DSPAM-Confidence: 0.7554
-X-DSPAM-Probability: 0.0000
-
-Details: http://source.sakaiproject.org/viewsvn/?view=rev&rev=39750
-
-Author: stephen.marquard@uct.ac.za
-Date: 2008-01-04 04:05:43 -0500 (Fri, 04 Jan 2008)
-New Revision: 39750
-
-Modified:
-event/branches/SAK-6216/event-util/util/src/java/org/sakaiproject/util/EmailNotification.java
-Log:
-SAK-6216 merge event change from SAK-11169 (r39033) to synchronize branch with 2-5-x (for convenience for UCT local build)
-
-----------------------
-This automatic notification message was sent by Sakai Collab (https://collab.sakaiproject.org/portal) from the Source site.
-You can modify how you receive notifications at My Workspace > Preferences.
-
-
-
-From louis@media.berkeley.edu Thu Jan 3 19:51:21 2008
-Return-Path:
-Received: from murder (mail.umich.edu [141.211.14.91])
- by frankenstein.mail.umich.edu (Cyrus v2.3.8) with LMTPA;
- Thu, 03 Jan 2008 19:51:21 -0500
-X-Sieve: CMU Sieve 2.3
-Received: from murder ([unix socket])
- by mail.umich.edu (Cyrus v2.2.12) with LMTPA;
- Thu, 03 Jan 2008 19:51:21 -0500
-Received: from eyewitness.mr.itd.umich.edu (eyewitness.mr.itd.umich.edu [141.211.93.142])
- by jacknife.mail.umich.edu () with ESMTP id m040pJHB027171;
- Thu, 3 Jan 2008 19:51:19 -0500
-Received: FROM paploo.uhi.ac.uk (app1.prod.collab.uhi.ac.uk [194.35.219.184])
- BY eyewitness.mr.itd.umich.edu ID 477D8300.AC098.32562 ;
- 3 Jan 2008 19:51:15 -0500
-Received: from paploo.uhi.ac.uk (localhost [127.0.0.1])
- by paploo.uhi.ac.uk (Postfix) with ESMTP id E6CC4B9F8A;
- Fri, 4 Jan 2008 00:36:06 +0000 (GMT)
-Message-ID: <200801040023.m040NpCc005473@nakamura.uits.iupui.edu>
-Mime-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Received: from prod.collab.uhi.ac.uk ([194.35.219.182])
- by paploo.uhi.ac.uk (JAMES SMTP Server 2.1.3) with SMTP ID 754
- for ;
- Fri, 4 Jan 2008 00:35:43 +0000 (GMT)
-Received: from nakamura.uits.iupui.edu (nakamura.uits.iupui.edu [134.68.220.122])
- by shmi.uhi.ac.uk (Postfix) with ESMTP id 8889842C49
- for ; Fri, 4 Jan 2008 00:25:00 +0000 (GMT)
-Received: from nakamura.uits.iupui.edu (localhost [127.0.0.1])
- by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11) with ESMTP id m040NpgM005475
- for ; Thu, 3 Jan 2008 19:23:51 -0500
-Received: (from apache@localhost)
- by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11/Submit) id m040NpCc005473
- for source@collab.sakaiproject.org; Thu, 3 Jan 2008 19:23:51 -0500
-Date: Thu, 3 Jan 2008 19:23:51 -0500
-X-Authentication-Warning: nakamura.uits.iupui.edu: apache set sender to louis@media.berkeley.edu using -f
-To: source@collab.sakaiproject.org
-From: louis@media.berkeley.edu
-Subject: [sakai] svn commit: r39749 - in bspace/site-manage/sakai_2-4-x/site-manage-tool/tool/src: bundle webapp/vm/sitesetup
-X-Content-Type-Outer-Envelope: text/plain; charset=UTF-8
-X-Content-Type-Message-Body: text/plain; charset=UTF-8
-Content-Type: text/plain; charset=UTF-8
-X-DSPAM-Result: Innocent
-X-DSPAM-Processed: Thu Jan 3 19:51:20 2008
-X-DSPAM-Confidence: 0.6956
-X-DSPAM-Probability: 0.0000
-
-Details: http://source.sakaiproject.org/viewsvn/?view=rev&rev=39749
-
-Author: louis@media.berkeley.edu
-Date: 2008-01-03 19:23:46 -0500 (Thu, 03 Jan 2008)
-New Revision: 39749
-
-Modified:
-bspace/site-manage/sakai_2-4-x/site-manage-tool/tool/src/bundle/sitesetupgeneric.properties
-bspace/site-manage/sakai_2-4-x/site-manage-tool/tool/src/webapp/vm/sitesetup/chef_site-importSites.vm
-Log:
-BSP-1420 Update text to clarify "Re-Use Materials..." option in WS Setup
-
-----------------------
-This automatic notification message was sent by Sakai Collab (https://collab.sakaiproject.org/portal) from the Source site.
-You can modify how you receive notifications at My Workspace > Preferences.
-
-
-
-From louis@media.berkeley.edu Thu Jan 3 17:18:23 2008
-Return-Path:
-Received: from murder (mail.umich.edu [141.211.14.91])
- by frankenstein.mail.umich.edu (Cyrus v2.3.8) with LMTPA;
- Thu, 03 Jan 2008 17:18:23 -0500
-X-Sieve: CMU Sieve 2.3
-Received: from murder ([unix socket])
- by mail.umich.edu (Cyrus v2.2.12) with LMTPA;
- Thu, 03 Jan 2008 17:18:23 -0500
-Received: from salemslot.mr.itd.umich.edu (salemslot.mr.itd.umich.edu [141.211.14.58])
- by jacknife.mail.umich.edu () with ESMTP id m03MIMXY027729;
- Thu, 3 Jan 2008 17:18:22 -0500
-Received: FROM paploo.uhi.ac.uk (app1.prod.collab.uhi.ac.uk [194.35.219.184])
- BY salemslot.mr.itd.umich.edu ID 477D5F23.797F6.16348 ;
- 3 Jan 2008 17:18:14 -0500
-Received: from paploo.uhi.ac.uk (localhost [127.0.0.1])
- by paploo.uhi.ac.uk (Postfix) with ESMTP id EF439B98CE;
- Thu, 3 Jan 2008 22:18:19 +0000 (GMT)
-Message-ID: <200801032216.m03MGhDa005292@nakamura.uits.iupui.edu>
-Mime-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Received: from prod.collab.uhi.ac.uk ([194.35.219.182])
- by paploo.uhi.ac.uk (JAMES SMTP Server 2.1.3) with SMTP ID 236
- for ;
- Thu, 3 Jan 2008 22:18:04 +0000 (GMT)
-Received: from nakamura.uits.iupui.edu (nakamura.uits.iupui.edu [134.68.220.122])
- by shmi.uhi.ac.uk (Postfix) with ESMTP id 905D53C2FD
- for ; Thu, 3 Jan 2008 22:17:52 +0000 (GMT)
-Received: from nakamura.uits.iupui.edu (localhost [127.0.0.1])
- by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11) with ESMTP id m03MGhrs005294
- for ; Thu, 3 Jan 2008 17:16:43 -0500
-Received: (from apache@localhost)
- by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11/Submit) id m03MGhDa005292
- for source@collab.sakaiproject.org; Thu, 3 Jan 2008 17:16:43 -0500
-Date: Thu, 3 Jan 2008 17:16:43 -0500
-X-Authentication-Warning: nakamura.uits.iupui.edu: apache set sender to louis@media.berkeley.edu using -f
-To: source@collab.sakaiproject.org
-From: louis@media.berkeley.edu
-Subject: [sakai] svn commit: r39746 - in bspace/site-manage/sakai_2-4-x/site-manage-tool/tool/src: bundle webapp/vm/sitesetup
-X-Content-Type-Outer-Envelope: text/plain; charset=UTF-8
-X-Content-Type-Message-Body: text/plain; charset=UTF-8
-Content-Type: text/plain; charset=UTF-8
-X-DSPAM-Result: Innocent
-X-DSPAM-Processed: Thu Jan 3 17:18:23 2008
-X-DSPAM-Confidence: 0.6959
-X-DSPAM-Probability: 0.0000
-
-Details: http://source.sakaiproject.org/viewsvn/?view=rev&rev=39746
-
-Author: louis@media.berkeley.edu
-Date: 2008-01-03 17:16:39 -0500 (Thu, 03 Jan 2008)
-New Revision: 39746
-
-Modified:
-bspace/site-manage/sakai_2-4-x/site-manage-tool/tool/src/bundle/sitesetupgeneric.properties
-bspace/site-manage/sakai_2-4-x/site-manage-tool/tool/src/webapp/vm/sitesetup/chef_site-siteInfo-duplicate.vm
-Log:
-BSP-1421 Add text to clarify "Duplicate Site" option in Site Info
-
-----------------------
-This automatic notification message was sent by Sakai Collab (https://collab.sakaiproject.org/portal) from the Source site.
-You can modify how you receive notifications at My Workspace > Preferences.
-
-
-
-From ray@media.berkeley.edu Thu Jan 3 17:07:00 2008
-Return-Path:
-Received: from murder (mail.umich.edu [141.211.14.39])
- by frankenstein.mail.umich.edu (Cyrus v2.3.8) with LMTPA;
- Thu, 03 Jan 2008 17:07:00 -0500
-X-Sieve: CMU Sieve 2.3
-Received: from murder ([unix socket])
- by mail.umich.edu (Cyrus v2.2.12) with LMTPA;
- Thu, 03 Jan 2008 17:07:00 -0500
-Received: from anniehall.mr.itd.umich.edu (anniehall.mr.itd.umich.edu [141.211.93.141])
- by faithful.mail.umich.edu () with ESMTP id m03M6xaq014868;
- Thu, 3 Jan 2008 17:06:59 -0500
-Received: FROM paploo.uhi.ac.uk (app1.prod.collab.uhi.ac.uk [194.35.219.184])
- BY anniehall.mr.itd.umich.edu ID 477D5C7A.4FE1F.22211 ;
- 3 Jan 2008 17:06:53 -0500
-Received: from paploo.uhi.ac.uk (localhost [127.0.0.1])
- by paploo.uhi.ac.uk (Postfix) with ESMTP id 0BC8D7225E;
- Thu, 3 Jan 2008 22:06:57 +0000 (GMT)
-Message-ID: <200801032205.m03M5Ea7005273@nakamura.uits.iupui.edu>
-Mime-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Received: from prod.collab.uhi.ac.uk ([194.35.219.182])
- by paploo.uhi.ac.uk (JAMES SMTP Server 2.1.3) with SMTP ID 554
- for ;
- Thu, 3 Jan 2008 22:06:34 +0000 (GMT)
-Received: from nakamura.uits.iupui.edu (nakamura.uits.iupui.edu [134.68.220.122])
- by shmi.uhi.ac.uk (Postfix) with ESMTP id 2AB513C2FD
- for ; Thu, 3 Jan 2008 22:06:23 +0000 (GMT)
-Received: from nakamura.uits.iupui.edu (localhost [127.0.0.1])
- by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11) with ESMTP id m03M5EQa005275
- for ; Thu, 3 Jan 2008 17:05:14 -0500
-Received: (from apache@localhost)
- by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11/Submit) id m03M5Ea7005273
- for source@collab.sakaiproject.org; Thu, 3 Jan 2008 17:05:14 -0500
-Date: Thu, 3 Jan 2008 17:05:14 -0500
-X-Authentication-Warning: nakamura.uits.iupui.edu: apache set sender to ray@media.berkeley.edu using -f
-To: source@collab.sakaiproject.org
-From: ray@media.berkeley.edu
-Subject: [sakai] svn commit: r39745 - providers/trunk/cm/cm-authz-provider/src/java/org/sakaiproject/coursemanagement/impl/provider
-X-Content-Type-Outer-Envelope: text/plain; charset=UTF-8
-X-Content-Type-Message-Body: text/plain; charset=UTF-8
-Content-Type: text/plain; charset=UTF-8
-X-DSPAM-Result: Innocent
-X-DSPAM-Processed: Thu Jan 3 17:07:00 2008
-X-DSPAM-Confidence: 0.7556
-X-DSPAM-Probability: 0.0000
-
-Details: http://source.sakaiproject.org/viewsvn/?view=rev&rev=39745
-
-Author: ray@media.berkeley.edu
-Date: 2008-01-03 17:05:11 -0500 (Thu, 03 Jan 2008)
-New Revision: 39745
-
-Modified:
-providers/trunk/cm/cm-authz-provider/src/java/org/sakaiproject/coursemanagement/impl/provider/CourseManagementGroupProvider.java
-Log:
-SAK-12602 Fix logic when a user has multiple roles in a section
-
-----------------------
-This automatic notification message was sent by Sakai Collab (https://collab.sakaiproject.org/portal) from the Source site.
-You can modify how you receive notifications at My Workspace > Preferences.
-
-
-
-From cwen@iupui.edu Thu Jan 3 16:34:40 2008
-Return-Path:
-Received: from murder (mail.umich.edu [141.211.14.34])
- by frankenstein.mail.umich.edu (Cyrus v2.3.8) with LMTPA;
- Thu, 03 Jan 2008 16:34:40 -0500
-X-Sieve: CMU Sieve 2.3
-Received: from murder ([unix socket])
- by mail.umich.edu (Cyrus v2.2.12) with LMTPA;
- Thu, 03 Jan 2008 16:34:40 -0500
-Received: from icestorm.mr.itd.umich.edu (icestorm.mr.itd.umich.edu [141.211.93.149])
- by chaos.mail.umich.edu () with ESMTP id m03LYdY1029538;
- Thu, 3 Jan 2008 16:34:39 -0500
-Received: FROM paploo.uhi.ac.uk (app1.prod.collab.uhi.ac.uk [194.35.219.184])
- BY icestorm.mr.itd.umich.edu ID 477D54EA.13F34.26602 ;
- 3 Jan 2008 16:34:36 -0500
-Received: from paploo.uhi.ac.uk (localhost [127.0.0.1])
- by paploo.uhi.ac.uk (Postfix) with ESMTP id CC710ADC79;
- Thu, 3 Jan 2008 21:34:29 +0000 (GMT)
-Message-ID: <200801032133.m03LX3gG005191@nakamura.uits.iupui.edu>
-Mime-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Received: from prod.collab.uhi.ac.uk ([194.35.219.182])
- by paploo.uhi.ac.uk (JAMES SMTP Server 2.1.3) with SMTP ID 611
- for ;
- Thu, 3 Jan 2008 21:34:08 +0000 (GMT)
-Received: from nakamura.uits.iupui.edu (nakamura.uits.iupui.edu [134.68.220.122])
- by shmi.uhi.ac.uk (Postfix) with ESMTP id 43C4242B55
- for ; Thu, 3 Jan 2008 21:34:12 +0000 (GMT)
-Received: from nakamura.uits.iupui.edu (localhost [127.0.0.1])
- by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11) with ESMTP id m03LX3Vb005193
- for ; Thu, 3 Jan 2008 16:33:03 -0500
-Received: (from apache@localhost)
- by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11/Submit) id m03LX3gG005191
- for source@collab.sakaiproject.org; Thu, 3 Jan 2008 16:33:03 -0500
-Date: Thu, 3 Jan 2008 16:33:03 -0500
-X-Authentication-Warning: nakamura.uits.iupui.edu: apache set sender to cwen@iupui.edu using -f
-To: source@collab.sakaiproject.org
-From: cwen@iupui.edu
-Subject: [sakai] svn commit: r39744 - oncourse/branches/oncourse_OPC_122007
-X-Content-Type-Outer-Envelope: text/plain; charset=UTF-8
-X-Content-Type-Message-Body: text/plain; charset=UTF-8
-Content-Type: text/plain; charset=UTF-8
-X-DSPAM-Result: Innocent
-X-DSPAM-Processed: Thu Jan 3 16:34:40 2008
-X-DSPAM-Confidence: 0.9846
-X-DSPAM-Probability: 0.0000
-
-Details: http://source.sakaiproject.org/viewsvn/?view=rev&rev=39744
-
-Author: cwen@iupui.edu
-Date: 2008-01-03 16:33:02 -0500 (Thu, 03 Jan 2008)
-New Revision: 39744
-
-Modified:
-oncourse/branches/oncourse_OPC_122007/
-oncourse/branches/oncourse_OPC_122007/.externals
-Log:
-update external for GB.
-
-----------------------
-This automatic notification message was sent by Sakai Collab (https://collab.sakaiproject.org/portal) from the Source site.
-You can modify how you receive notifications at My Workspace > Preferences.
-
-
-
-From cwen@iupui.edu Thu Jan 3 16:29:07 2008
-Return-Path:
-Received: from murder (mail.umich.edu [141.211.14.46])
- by frankenstein.mail.umich.edu (Cyrus v2.3.8) with LMTPA;
- Thu, 03 Jan 2008 16:29:07 -0500
-X-Sieve: CMU Sieve 2.3
-Received: from murder ([unix socket])
- by mail.umich.edu (Cyrus v2.2.12) with LMTPA;
- Thu, 03 Jan 2008 16:29:07 -0500
-Received: from galaxyquest.mr.itd.umich.edu (galaxyquest.mr.itd.umich.edu [141.211.93.145])
- by fan.mail.umich.edu () with ESMTP id m03LT6uw027749;
- Thu, 3 Jan 2008 16:29:06 -0500
-Received: FROM paploo.uhi.ac.uk (app1.prod.collab.uhi.ac.uk [194.35.219.184])
- BY galaxyquest.mr.itd.umich.edu ID 477D5397.E161D.20326 ;
- 3 Jan 2008 16:28:58 -0500
-Received: from paploo.uhi.ac.uk (localhost [127.0.0.1])
- by paploo.uhi.ac.uk (Postfix) with ESMTP id DEC65ADC79;
- Thu, 3 Jan 2008 21:28:52 +0000 (GMT)
-Message-ID: <200801032127.m03LRUqH005177@nakamura.uits.iupui.edu>
-Mime-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Received: from prod.collab.uhi.ac.uk ([194.35.219.182])
- by paploo.uhi.ac.uk (JAMES SMTP Server 2.1.3) with SMTP ID 917
- for ;
- Thu, 3 Jan 2008 21:28:39 +0000 (GMT)
-Received: from nakamura.uits.iupui.edu (nakamura.uits.iupui.edu [134.68.220.122])
- by shmi.uhi.ac.uk (Postfix) with ESMTP id 1FBB042B30
- for ; Thu, 3 Jan 2008 21:28:38 +0000 (GMT)
-Received: from nakamura.uits.iupui.edu (localhost [127.0.0.1])
- by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11) with ESMTP id m03LRUk4005179
- for ; Thu, 3 Jan 2008 16:27:30 -0500
-Received: (from apache@localhost)
- by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11/Submit) id m03LRUqH005177
- for source@collab.sakaiproject.org; Thu, 3 Jan 2008 16:27:30 -0500
-Date: Thu, 3 Jan 2008 16:27:30 -0500
-X-Authentication-Warning: nakamura.uits.iupui.edu: apache set sender to cwen@iupui.edu using -f
-To: source@collab.sakaiproject.org
-From: cwen@iupui.edu
-Subject: [sakai] svn commit: r39743 - gradebook/branches/oncourse_2-4-2/app/ui/src/java/org/sakaiproject/tool/gradebook/ui
-X-Content-Type-Outer-Envelope: text/plain; charset=UTF-8
-X-Content-Type-Message-Body: text/plain; charset=UTF-8
-Content-Type: text/plain; charset=UTF-8
-X-DSPAM-Result: Innocent
-X-DSPAM-Processed: Thu Jan 3 16:29:07 2008
-X-DSPAM-Confidence: 0.8509
-X-DSPAM-Probability: 0.0000
-
-Details: http://source.sakaiproject.org/viewsvn/?view=rev&rev=39743
-
-Author: cwen@iupui.edu
-Date: 2008-01-03 16:27:29 -0500 (Thu, 03 Jan 2008)
-New Revision: 39743
-
-Modified:
-gradebook/branches/oncourse_2-4-2/app/ui/src/java/org/sakaiproject/tool/gradebook/ui/RosterBean.java
-Log:
-svn merge -c 39403 https://source.sakaiproject.org/svn/gradebook/trunk
-U app/ui/src/java/org/sakaiproject/tool/gradebook/ui/RosterBean.java
-
-svn log -r 39403 https://source.sakaiproject.org/svn/gradebook/trunk
-------------------------------------------------------------------------
-r39403 | wagnermr@iupui.edu | 2007-12-17 17:11:08 -0500 (Mon, 17 Dec 2007) | 3 lines
-
-SAK-12504
-http://jira.sakaiproject.org/jira/browse/SAK-12504
-Viewing "All Grades" page as a TA with grader permissions causes stack trace
-------------------------------------------------------------------------
-
-
-----------------------
-This automatic notification message was sent by Sakai Collab (https://collab.sakaiproject.org/portal) from the Source site.
-You can modify how you receive notifications at My Workspace > Preferences.
-
-
-
-From cwen@iupui.edu Thu Jan 3 16:23:48 2008
-Return-Path:
-Received: from murder (mail.umich.edu [141.211.14.91])
- by frankenstein.mail.umich.edu (Cyrus v2.3.8) with LMTPA;
- Thu, 03 Jan 2008 16:23:48 -0500
-X-Sieve: CMU Sieve 2.3
-Received: from murder ([unix socket])
- by mail.umich.edu (Cyrus v2.2.12) with LMTPA;
- Thu, 03 Jan 2008 16:23:48 -0500
-Received: from salemslot.mr.itd.umich.edu (salemslot.mr.itd.umich.edu [141.211.14.58])
- by jacknife.mail.umich.edu () with ESMTP id m03LNlf0002115;
- Thu, 3 Jan 2008 16:23:47 -0500
-Received: FROM paploo.uhi.ac.uk (app1.prod.collab.uhi.ac.uk [194.35.219.184])
- BY salemslot.mr.itd.umich.edu ID 477D525E.1448.30389 ;
- 3 Jan 2008 16:23:44 -0500
-Received: from paploo.uhi.ac.uk (localhost [127.0.0.1])
- by paploo.uhi.ac.uk (Postfix) with ESMTP id 9D005B9D06;
- Thu, 3 Jan 2008 21:23:38 +0000 (GMT)
-Message-ID: <200801032122.m03LMFo4005148@nakamura.uits.iupui.edu>
-Mime-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Received: from prod.collab.uhi.ac.uk ([194.35.219.182])
- by paploo.uhi.ac.uk (JAMES SMTP Server 2.1.3) with SMTP ID 6
- for ;
- Thu, 3 Jan 2008 21:23:24 +0000 (GMT)
-Received: from nakamura.uits.iupui.edu (nakamura.uits.iupui.edu [134.68.220.122])
- by shmi.uhi.ac.uk (Postfix) with ESMTP id 3535542B69
- for ; Thu, 3 Jan 2008 21:23:24 +0000 (GMT)
-Received: from nakamura.uits.iupui.edu (localhost [127.0.0.1])
- by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11) with ESMTP id m03LMFtT005150
- for ; Thu, 3 Jan 2008 16:22:15 -0500
-Received: (from apache@localhost)
- by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11/Submit) id m03LMFo4005148
- for source@collab.sakaiproject.org; Thu, 3 Jan 2008 16:22:15 -0500
-Date: Thu, 3 Jan 2008 16:22:15 -0500
-X-Authentication-Warning: nakamura.uits.iupui.edu: apache set sender to cwen@iupui.edu using -f
-To: source@collab.sakaiproject.org
-From: cwen@iupui.edu
-Subject: [sakai] svn commit: r39742 - gradebook/branches/oncourse_2-4-2/app/ui/src/java/org/sakaiproject/tool/gradebook/ui
-X-Content-Type-Outer-Envelope: text/plain; charset=UTF-8
-X-Content-Type-Message-Body: text/plain; charset=UTF-8
-Content-Type: text/plain; charset=UTF-8
-X-DSPAM-Result: Innocent
-X-DSPAM-Processed: Thu Jan 3 16:23:48 2008
-X-DSPAM-Confidence: 0.9907
-X-DSPAM-Probability: 0.0000
-
-Details: http://source.sakaiproject.org/viewsvn/?view=rev&rev=39742
-
-Author: cwen@iupui.edu
-Date: 2008-01-03 16:22:14 -0500 (Thu, 03 Jan 2008)
-New Revision: 39742
-
-Modified:
-gradebook/branches/oncourse_2-4-2/app/ui/src/java/org/sakaiproject/tool/gradebook/ui/RosterBean.java
-Log:
-svn merge -c 35014 https://source.sakaiproject.org/svn/gradebook/trunk
-U app/ui/src/java/org/sakaiproject/tool/gradebook/ui/RosterBean.java
-
-svn log -r 35014 https://source.sakaiproject.org/svn/gradebook/trunk
-------------------------------------------------------------------------
-r35014 | wagnermr@iupui.edu | 2007-09-12 16:17:59 -0400 (Wed, 12 Sep 2007) | 3 lines
-
-SAK-11458
-http://bugs.sakaiproject.org/jira/browse/SAK-11458
-Course grade does not appear on "All Grades" page if no categories in gb
-------------------------------------------------------------------------
-
-
-----------------------
-This automatic notification message was sent by Sakai Collab (https://collab.sakaiproject.org/portal) from the Source site.
-You can modify how you receive notifications at My Workspace > Preferences.
-
diff --git a/diccionarios/words.txt b/diccionarios/words.txt
deleted file mode 100644
index a2f4fe0..0000000
--- a/diccionarios/words.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-Writing programs or programming is a very creative
-and rewarding activity You can write programs for
-many reasons ranging from making your living to solving
-a difficult data analysis problem to having fun to helping
-someone else solve a problem This book assumes that
-{\em everyone} needs to know how to program and that once
-you know how to program, you will figure out what you want
-to do with your newfound skills
-
-We are surrounded in our daily lives with computers ranging
-from laptops to cell phones We can think of these computers
-as our personal assistants who can take care of many things
-on our behalf The hardware in our current-day computers
-is essentially built to continuously ask us the question
-What would you like me to do next
-
-Our computers are fast and have vasts amounts of memory and
-could be very helpful to us if we only knew the language to
-speak to explain to the computer what we would like it to
-do next If we knew this language we could tell the
-computer to do tasks on our behalf that were reptitive
-Interestingly, the kinds of things computers can do best
-are often the kinds of things that we humans find boring
-and mind-numbing
diff --git a/examenes/beautifulsoup.py b/examenes/beautifulsoup.py
deleted file mode 100644
index 274a61b..0000000
--- a/examenes/beautifulsoup.py
+++ /dev/null
@@ -1,20 +0,0 @@
-from urllib import request
-from bs4 import BeautifulSoup
-import re
-
-
-url = input("Ingresar URL: ")
-veces = int(input("Entrar el número de veces: "))
-inicial = int(input("Entrar la posición inicial: ")) - 1
-
-for i in range(veces):
- html = request.urlopen(url).read()
- soup = BeautifulSoup(html, 'html.parser')
- tags = soup('a')
- print("Recuperando:", url)
- url = tags[inicial].get('href', None)
-
-print("Recuperando:", url)
-print()
-print('La respuesta al encargo de esta ejecución es "',
- re.findall('[A-Z][a-z]*', url)[0], '".', sep='')
diff --git a/examenes/examen2.txt b/examenes/examen2.txt
deleted file mode 100644
index 97cbe07..0000000
--- a/examenes/examen2.txt
+++ /dev/null
@@ -1,54 +0,0 @@
-En esta ocasión debes escribir un programa Python que expanda el siguiente:
-
-import urllib.request, urllib.parse, urllib.error
-from bs4 import BeautifulSoup
-import ssl
-
-# Ignore SSL certificate errors
-ctx = ssl.create_default_context()
-ctx.check_hostname = False
-ctx.verify_mode = ssl.CERT_NONE
-
-url = input('Enter - ')
-html = urllib.request.urlopen(url, context=ctx).read()
-soup = BeautifulSoup(html, 'html.parser')
-
-# Retrieve all of the anchor tags
-tags = soup('a')
-for tag in tags:
- print(tag.get('href', None))
-
-
-El programa usará `urllib` para leer el HTML de los archivos de datos que se indican abajo, extraerá el href= values de las etiquetas , buscará una etiqueta que esté en una posición particular relativa al primer nombre de la lista, seguirá ese enlace y repetirá el proceso un número de veces e informará del apellido que encuentre.
-
-Proporcionamos dos archivos para esta la prueba. Uno es un archivo de muestra donde damos el nombre para comprobar y el otro son los datos reales que se necesitan procesar para la asignación
-
-- Problema de muestra: Comenzar en http://python-data.dr-chuck.net/known_by_Fikret.html
-Encontrar el enlace en la posición 3 (el primer nombre es 1). Seguir ese enlace. Repetir este proceso 4 veces. La respuesta es el apellido que recuperes.
-Secuencia de nombres: Fikret Montgomery Mhairade Butchi Anayah
-Apellido en secuencia: Anayah
-
-- Problema real: Comenzar en: http://python-data.dr-chuck.net/known_by_Melville.html
-Encontrar el enlace en la posición 18 (el primer nombre es 1). Seguir ese enlace. Repetir el proceso 7 veces. La respuesta es el apellido que recuperes.
-
-Sugerencia: El primer carácter del nombre de la última página que cargarás es una mayúscula
-
-Estrategia
-
-Las páginas web ajustan la altura entre los enlaces y ocultan la página después de unos segundos para dificultar la tarea a menos que se escriba un programa Python. Pero francamente con un poco de esfuerzo y paciencia se puede superar esta barrera y hacer TRAMPAS. Pero eso no es lo que se espera de tí. El punto es escribir un programa Python inteligente que resuelva el problema.
-
-Ejemplo de ejecución
-
-Aquí está una muestra de ejecución de una solución:
-
-$ python solution.py
-Ingresar URL: http://python-data.dr-chuck.net/known_by_Fikret.html
-Entrar el número de veces: 4
-Entrar la posición inicial: 3
-Recuperando: http://python-data.dr-chuck.net/known_by_Fikret.html
-Recuperando: http://python-data.dr-chuck.net/known_by_Montgomery.html
-Recuperando: http://python-data.dr-chuck.net/known_by_Mhairade.html
-Recuperando: http://python-data.dr-chuck.net/known_by_Butchi.html
-Recuperando: http://python-data.dr-chuck.net/known_by_Anayah.html
-
-La respuesta al encargo de esta ejecución es "Anayah".
\ No newline at end of file
diff --git a/ficheros/01.py b/ficheros/01.py
deleted file mode 100644
index f1d7816..0000000
--- a/ficheros/01.py
+++ /dev/null
@@ -1,57 +0,0 @@
-"""
-Ejercicio 01
-
-Escribe una función que reciba un nombre de fichero, lo abra, lea y
-visualice el contenido en mayúsculas. Usar el fichero "words.txt" para crear la
-salida que se busca y el fichero "test.txt" para hacer los tests.
-
->>> file_cap('test.txt')
-'ESTO ESTÁ EN MAYÚSCULAS\\n\
-Y ESTO TAMBIÉN'
-
->>> file_cap('Este fichero no existe')
--1
-
->>> file_cap('words.txt')
-'WRITING PROGRAMS OR PROGRAMMING IS A VERY CREATIVE\\n\
-AND REWARDING ACTIVITY YOU CAN WRITE PROGRAMS FOR\\n\
-MANY REASONS RANGING FROM MAKING YOUR LIVING TO SOLVING\\n\
-A DIFFICULT DATA ANALYSIS PROBLEM TO HAVING FUN TO HELPING\\n\
-SOMEONE ELSE SOLVE A PROBLEM THIS BOOK ASSUMES THAT\\n\
-{\\EM EVERYONE} NEEDS TO KNOW HOW TO PROGRAM AND THAT ONCE\\n\
-YOU KNOW HOW TO PROGRAM, YOU WILL FIGURE OUT WHAT YOU WANT\\n\
-TO DO WITH YOUR NEWFOUND SKILLS\\n\
-\\n\
-WE ARE SURROUNDED IN OUR DAILY LIVES WITH COMPUTERS RANGING\\n\
-FROM LAPTOPS TO CELL PHONES WE CAN THINK OF THESE COMPUTERS\\n\
-AS OUR PERSONAL ASSISTANTS WHO CAN TAKE CARE OF MANY THINGS\\n\
-ON OUR BEHALF THE HARDWARE IN OUR CURRENT-DAY COMPUTERS\\n\
-IS ESSENTIALLY BUILT TO CONTINUOUSLY ASK US THE QUESTION\\n\
-WHAT WOULD YOU LIKE ME TO DO NEXT\\n\
-\\n\
-OUR COMPUTERS ARE FAST AND HAVE VASTS AMOUNTS OF MEMORY AND \\n\
-COULD BE VERY HELPFUL TO US IF WE ONLY KNEW THE LANGUAGE TO \\n\
-SPEAK TO EXPLAIN TO THE COMPUTER WHAT WE WOULD LIKE IT TO \\n\
-DO NEXT IF WE KNEW THIS LANGUAGE WE COULD TELL THE \\n\
-COMPUTER TO DO TASKS ON OUR BEHALF THAT WERE REPTITIVE \\n\
-INTERESTINGLY, THE KINDS OF THINGS COMPUTERS CAN DO BEST\\n\
-ARE OFTEN THE KINDS OF THINGS THAT WE HUMANS FIND BORING\\n\
-AND MIND-NUMBING\\n\'
-
-"""
-
-
-def file_cap(file_name):
- try:
- file_handle = open(file_name)
- except IOError:
- return -1
- text = ''
- for line in file_handle:
- text += line.upper()
- return text
-
-
-if __name__ == '__main__':
- import doctest
- doctest.testmod()
diff --git a/ficheros/02.py b/ficheros/02.py
deleted file mode 100644
index 629421b..0000000
--- a/ficheros/02.py
+++ /dev/null
@@ -1,33 +0,0 @@
-"""
-Ejercicio 02
-7.2 Escribe un programa que solicite un nombre de fichero, lo abra, lea y
-busque líneas de la forma:
-
-X-DSPAM-Confidence: 0.8475
-
-Contar estas líneas y extraer los valores en punto flotante de cada una de
-ellas para finalmente calcular la media de esos valores y generar una salida
-como la que se muestra a continuación. Media de correo basura: 0.750718518519
-No utilizar la función sum() o una variable que se llame sum en la solución.
-Se puede descargar un fichero con los datos de prueba
-http://www.pythonlearn.com/code/mbox-short.txt.
-"""
-
-leyendo = True
-while leyendo:
- try:
- fichero = input("Nombre de fichero: ")
- manejador = open(fichero)
- leyendo = False
- except IOError:
- print("El fichero no existe.")
-cont = 0
-total = 0
-for linea in manejador:
- if linea.startswith("X-DSPAM-Confidence:"):
- numero = float(linea[linea.find(" ") + 1:].strip())
- cont += 1
- total += numero
- print(numero)
-
-print("Media de correo basura: ", total/cont)
diff --git a/ficheros/Ejercicios de Ficheros (Soluciones).ipynb b/ficheros/Ejercicios de Ficheros (Soluciones).ipynb
deleted file mode 100644
index adf9d07..0000000
--- a/ficheros/Ejercicios de Ficheros (Soluciones).ipynb
+++ /dev/null
@@ -1,108 +0,0 @@
-{
- "cells": [
- {
- "cell_type": "markdown",
- "metadata": {},
- "source": [
- "# 7.- Ficheros"
- ]
- },
- {
- "cell_type": "markdown",
- "metadata": {},
- "source": [
- "7.1 Escribe un programa que solicite un nombre de fichero, lo abra, lea y visualice el contenido en mayúsculas. Usa el fichero words.txt para crear la salida que se busca."
- ]
- },
- {
- "cell_type": "code",
- "execution_count": null,
- "metadata": {
- "collapsed": false
- },
- "outputs": [],
- "source": [
- "# pylint: disable = I0011, C0103\n",
- "\n",
- "\"\"\"DocString\n",
- "\"\"\"\n",
- "leyendo = True\n",
- "while leyendo:\n",
- " try:\n",
- " fichero = input(\"Nombre de fichero :\")\n",
- " manejador = open(fichero)\n",
- " leyendo = False\n",
- " except IOError:\n",
- " print(\"El fichero no existe\")\n",
- "for linea in manejador:\n",
- " print(linea, end=\"\")\n"
- ]
- },
- {
- "cell_type": "markdown",
- "metadata": {},
- "source": [
- "7.2 Escribe un programa que solicite un nombre de fichero, lo abra, lea y busque líneas de la forma:\n",
- "\n",
- "X-DSPAM-Confidence: 0.8475\n",
- "\n",
- "Contar estas líneas y extraer los valores en punto flotante de cada una de ellas para finalmente calcular la media de esos valores y generar una salida como la que se muestra a continuación.\n",
- "Media de correo basura: 0.750718518519\n",
- "No utilizar la función sum() o una variable que se llame sum en la solución.\n",
- "Se puede descargar un fichero con los datos de prueba http://www.pythonlearn.com/code/mbox-short.txt."
- ]
- },
- {
- "cell_type": "code",
- "execution_count": null,
- "metadata": {
- "collapsed": false
- },
- "outputs": [],
- "source": [
- "# pylint: disable = I0011, C0103\n",
- "\n",
- "\"\"\"DocString\n",
- "\"\"\"\n",
- "leyendo = True\n",
- "while leyendo:\n",
- " try:\n",
- " fichero = input(\"Nombre de fichero: \")\n",
- " manejador = open(fichero)\n",
- " leyendo = False\n",
- " except IOError:\n",
- " print(\"El fichero no existe.\")\n",
- "cont = 0\n",
- "total = 0\n",
- "for linea in manejador:\n",
- " if linea.startswith(\"X-DSPAM-Confidence:\"):\n",
- " numero = float(linea[linea.find(\" \"):].strip())\n",
- " cont += 1\n",
- " total += numero\n",
- "print(\"Media de correo basura: \", total/cont)\n"
- ]
- }
- ],
- "metadata": {
- "anaconda-cloud": {},
- "kernelspec": {
- "display_name": "Python [conda root]",
- "language": "python",
- "name": "conda-root-py"
- },
- "language_info": {
- "codemirror_mode": {
- "name": "ipython",
- "version": 3
- },
- "file_extension": ".py",
- "mimetype": "text/x-python",
- "name": "python",
- "nbconvert_exporter": "python",
- "pygments_lexer": "ipython3",
- "version": "3.5.2"
- }
- },
- "nbformat": 4,
- "nbformat_minor": 1
-}
diff --git "a/ficheros/de_csv_a_md/Propuesta Actividades 2\302\272 FCT - Hoja 1.csv" "b/ficheros/de_csv_a_md/Propuesta Actividades 2\302\272 FCT - Hoja 1.csv"
deleted file mode 100644
index 747ecfa..0000000
--- "a/ficheros/de_csv_a_md/Propuesta Actividades 2\302\272 FCT - Hoja 1.csv"
+++ /dev/null
@@ -1,54 +0,0 @@
-Ciclo,Propone,Temática,Título,Horas,Enlace,Observaciones,Alumnos Inscritos
-DAW,Ango,Programación,Angular y Spring 5 (udemy),115,https://www.udemy.com/course/angular-spring/,,Lucía Hurtado
-ASIR,Ango,Redes,CCNA 3: Scaling Networks,100,https://www.netacad.com/,,
-ASIR,Luis,Redes,Curso de fundamentos de redes para Certificación MTA,25,https://openwebinars.net/cursos/fundamentos-redes-mta/,"Es un poco repaso de las redes de 1º, pero viendo lo poco que os acordáis de lo que os dio Ango, no os viene mal.","Manuel Carrión
-Samuel Luna
-Celia Fernández"
-ASIR,Luis,Seguridad,Curso de Iptables,25,https://openwebinars.net/cursos/iptables/,Amplia lo que se da en el tema de firewalls de SAD.,"Manuel Carrión
-Celia Fernández"
-,,,,,,,
-ASIR,Luis,Virtualización,Curso de Introducción a Docker,10,https://openwebinars.net/academia/portada/docker-introduccion/,"Estos dos cursos de Docker son parte de una cosa que en OpenWebminars llaman ""Carreras"", que son lotes de cursos relacionados. Ésta en particular se llama ""Docker DevOps Profesional"". Jaime Barea comenta que en Cibernéticos les gustó ver este curso en su CV.","Jaime Barea
-Samuel Luna
-Pablo G. Campanario
-Ricardo Herrer
-Celia Fernández
-Alfonso Flores Flores"
-ASIR,Luis,Virtualización,Curso de Docker para Desarrolladores,35,https://openwebinars.net/academia/portada/docker/,"Incluido en ""Docker DevOps Profesional""","Jaime Barea
-Samuel Luna
-Alfonso Flores Flores"
-ASIR,Luis,Virtualización/Cloud,Fundamentos Generales: Orquestación y Automatizacion IT,5,https://openwebinars.net/academia/portada/fundamentos-generales-orquestacion-automatizacion-it/,"Este curso y los que vienen a continuación son parte de la carrera de ""Especialista en Automatización DevOps"", que va de temas de Virtualización en Cloud",Jaime Barea
-ASIR,Luis,Virtualización/Cloud,Curso de Ansible,40,https://openwebinars.net/academia/portada/ansible/,"Incluido en ""Especialista en Automatización DevOps""","Jaime Barea
-Pablo G. Campanario"
-ASIR,Luis,Servicios de Red,SSH: imprescindible en tiempos modernos,15,https://openwebinars.net/cursos/ssh/,"Quizás algo básico, pero no es algo que os venga mal repasar. Incluido en ""Especialista en Automatización DevOps"". Impartido por Alberto Molina.","Jaime Barea
-Manuel Carrión
-Ricardo Herrer
-Samuel Luna
-Celia Fernández"
-ASIR,Ango,Vagrant,Curso Online de Vagrant ,20,https://openwebinars.net/academia/portada/vagrant/,"Lo da Alberto Molina. Incluido en ""Especialista en Automatización DevOps""",Jaime Barea
-ASIR,Ango,Vagrant,Curso de Vagrant para desarrolladores ,15,https://openwebinars.net/academia/portada/curso-vagrant-desarrolladores/,"Incluido en ""Especialista en Automatización DevOps""",Jaime Barea
-ASIR,Luis,Virtualización/Cloud,Curso de Terraform,20,https://openwebinars.net/academia/portada/terraform/,"Incluido en ""Especialista en Automatización DevOps""",Jaime Barea
-ASIR,Luis,Virtualización/Cloud,Curso de Introducción a Amazon Web Services (AWS),15,https://openwebinars.net/academia/portada/aws/,Parece muy interesante. AWS domina completamente el mercado del sector.,Ricardo Herrer
-ASIR,Luis,Virtualización/Cloud,Curso de VMware vSphere para principiantes,20,https://openwebinars.net/academia/portada/vmware-vsphere/,"Se enseña primero el supervisor ESXi y luego ya se pasa al sistema gordo de vSphere. Los que queráis hacer este curso, podéis acceder a vuestra cuenta de VMware Academy para descargaros el software necesario.",Ricardo Herrer
-ASIR,Luis,Seguridad,Curso de Metasploit Framework,20,https://openwebinars.net/academia/portada/metasploit/,"Metasploit, el framework de los hackers vagos que no quieren pringarse las manos ni estudiar para ser hackers. Ideal para vosotros.","Samuel Luna
-Manuel Carrión"
-ASIR,Luis,Seguridad,Curso de Seguridad en Redes con Snort,15,https://openwebinars.net/academia/portada/seguridad-redes-snort/,"SNORT es un sistema de monitorización en red. Está incluido en el temario de SAD, pero sólo lo vemos de pasada. Está bien que lo veáis por vuestra cuenta.",Samuel Luna
-ASIR,Luis,Seguridad,Curso de Hacking Web,15,https://openwebinars.net/academia/portada/hacking-web/,"Aquí se enseña inyección SQL mayormente, que suele ser el principal agujero por donde entrar a las páginas web dinámicas.",Samuel Luna
-DAW/ASIR,Paco Ávila,Programación,Curso de Git,15,https://openwebinars.net/academia/portada/git/,"Fundamental, te dediques a lo que te dediques","Juan Luis Galisteo
-Celia Fernández"
-DAW/ASIR,Paco Ávila,Programación,Curso de Gitflow Profesional,5,https://openwebinars.net/academia/portada/gitflow/,"Cuando se pasa a formar parte de un equipo de programación es necesario tener unas pautas en cuanto a ramas, versiones, flujo de trabajo, etc usando un sistema de gestión de versiones como GIT.","Juan Luis Galisteo
-Celia Fernández"
-DAW/ASIR,Paco Ávila,Sistemas/Programación,Curso de Raspberry Pi para desarrolladores,20,https://openwebinars.net/academia/portada/raspberry-pi-desarrolladores/,Muy especializado y dedicado explícitemente al desarrollo. Se precisa conocer tecnologías de desarrollo donde aplicar la Raspberry PI.,Juan Luis Galisteo
-DAW,Fernando Vargas,DIW,SASS+GULP+BOOTSTRAP,25,https://openwebinars.net/academia/aprende/sass/7179/,"Este curso viene muy bien para repasar los fundamentos de SASS, además incorpora GULP, y un ejercicio muy interesante para crear un Framework propio desde bootstrap",
-DAW,Fernando Vargas,DIW,Protección jurídica del Software,5,https://openwebinars.net/academia/portada/proteccion-juridica-software/,"A través de este taller conocerás las posibilidades existentes para la protección jurídica de tu software, haciendo especial hincapié en las licencias de software",
-ASIR,Luis,Virtualización/Cloud,Curso de Máquinas Virtuales en Azure,10,https://openwebinars.net/academia/portada/maquinas-virtuales-azure/,"Curso de virtualización en Azure. Es parte de un certificado de Microsoft. A día de hoy no entrega certificado de hacer el curso, así que no es recomendable hacerlo (aunque los contenidos son interesantes).",Ricardo Herrer
-ASIR,Luis,Arduino,Curso de Arduino,20,https://openwebinars.net/academia/portada/arduino/,"Curso de Arduino. Explica temas de sensores, control de luces y motores, almacenamiento de datos, comunicaciones, etc. La única pega es que como no tengas todos los sensores, shields, etc., que se explican no se va a poder probar en la práctica.",Pablo G. Campanario
-ASIR,Luis,Programación-Python,Curso de Python 3 desde cero,30,https://openwebinars.net/academia/portada/python-desde-cero/,"Es un curso de programación, pero empieza desde cero y llega sólo a tocar un poco POO, así que no lo es muy complicado aunque sea para ASIR2.","Samuel Luna
-Pablo G. Campanario"
-ASIR,Paco Ávila,Programación-Python,Curso de Python: Aprende a programar en Python 3,45,https://openwebinars.net/academia/portada/python/,Curso básico para aprender python 3 desde cero,"Juan Luis Galisteo
-Celia Fernández"
-ASIR,Paco Ávila/Luis,Sistemas,Servidores Web,60,https://openwebinars.net/academia/portada/servidores-web/,"Este curso amplia lo que se da en SRI, con contenidos como Vagrant y un stack NodeJS/MongoDB (en lugar del clásico LAMP). Aprende Nginx, Apache, instalación del Stack MEAN, LAMP y mucho más","Manuel Carrión
-Pablo G. Campanario
-Juan Luis Galisteo
-Celia Fernández"
-ASIR,Luis,Seguridad,Curso de introducción a Ethical Hacking,30,https://openwebinars.net/academia/portada/ethical-hacking-introduccion/,Repaso del módulo de SAD. Toca un poquito cada palo de la seguridad.,Manuel Carrión
-ASIR,Paco Ávila,Programación-Python,Curso de Web scraping: Extracción de datos en la Web,20,https://openwebinars.net/academia/portada/web-scraping/,"Web scraping es una técnica para extraer datos de sitios web y guardarlos en una base de datos, conviértete en un experto en web scraping usando Python y extrae información de forma práctica utilizando Python como lenguaje de programación.",Juan Luis Galisteo
\ No newline at end of file
diff --git a/ficheros/de_csv_a_md/csv_to_md.py b/ficheros/de_csv_a_md/csv_to_md.py
deleted file mode 100644
index 8452fcd..0000000
--- a/ficheros/de_csv_a_md/csv_to_md.py
+++ /dev/null
@@ -1,9 +0,0 @@
-file = open('hoja01.csv')
-buffer = list()
-cabecera = file.readline().strip().split(',')
-for line in file:
- buffer.append(line.replace(', ', ' ').replace('"', '').strip().split(','))
-
-print(buffer)
-file.close()
-print(cabecera)
\ No newline at end of file
diff --git a/ficheros/de_csv_a_md/csv_to_md2.py b/ficheros/de_csv_a_md/csv_to_md2.py
deleted file mode 100644
index faec342..0000000
--- a/ficheros/de_csv_a_md/csv_to_md2.py
+++ /dev/null
@@ -1,68 +0,0 @@
-file = open('hoja01.csv')
-buffer = list()
-
-for line in file:
- buffer.append(line.strip().replace('"', '').replace(', ', ' ').
- split(','))
-file.close()
-
-file = open('./docs/hoja01.md', 'w')
-
-for line in buffer[1:]:
-
- # Título
- try:
- content = '\n## ' + line[3] + '\n'
- file.writelines(content)
- except IndexError:
- continue
-
- # Propuesto por
- try:
- content = '**' + buffer[0][1] + ':** '
- file.writelines(content)
- content = (line[1] + '\n\n').replace('', ',')
- file.writelines(content)
- except IndexError:
- pass
- # Temática
- try:
- content = '**' + buffer[0][2] + ':** '
- file.writelines(content)
- content = (line[2] + '\n\n').replace('', ',')
- file.writelines(content)
- except IndexError:
- pass
- # Horas
- try:
- content = '**' + buffer[0][4] + ':** '
- file.writelines(content)
- content = (line[4] + '\n\n').replace('', ',')
- file.writelines(content)
- except IndexError:
- pass
- # Enlace
- try:
- content = '**' + buffer[0][5] + ':** '
- file.writelines(content)
- content = line[5].replace('', ',')
- content = '[' + content + '](' + content + ')' + '\n\n'
- file.writelines(content)
- except IndexError:
- pass
- # Observaciones
- try:
- content = '**' + buffer[0][6] + ':** '
- file.writelines(content)
- content = (line[6] + '\n\n').replace('', ',')
- file.writelines(content)
- except IndexError:
- pass
- # Alumnos inscritos
- try:
- content = '**' + buffer[0][7] + ':** '
- file.writelines(content)
- content = (line[7] + '\n\n').replace('', ',')
- file.writelines(content)
- except IndexError:
- pass
diff --git a/ficheros/de_csv_a_md/csv_to_md3.py b/ficheros/de_csv_a_md/csv_to_md3.py
deleted file mode 100644
index 636bb1f..0000000
--- a/ficheros/de_csv_a_md/csv_to_md3.py
+++ /dev/null
@@ -1,40 +0,0 @@
-import csv
-from pathlib import Path
-
-with open(Path("./Propuesta Actividades 2º FCT - Hoja 1.csv"), newline='') as f:
- buffer = csv.reader(f)
- file = open('./docs/hoja01.md', 'w')
- cabecera = next(buffer)
- for line in buffer:
- # Título
- file.writelines('\n## ' + line[3] + '\n')
- # Propuesto por
- content = '**' + cabecera[1] + ':** '
- file.writelines(content)
- content = line[1] + '\n\n'
- file.writelines(content)
- # Temática
- content = '**' + cabecera[2] + ':** '
- file.writelines(content)
- content = line[2] + '\n\n'
- file.writelines(content)
- # Horas
- content = '**' + cabecera[4] + ':** '
- file.writelines(content)
- content = line[4] + '\n\n'
- file.writelines(content)
- # Enlace
- content = '**' + cabecera[5] + ':** '
- file.writelines(content)
- content = '[' + line[5] + '](' + line[5] + ')' + '\n\n'
- file.writelines(content)
- # Observaciones
- content = '**' + cabecera[6] + ':** '
- file.writelines(content)
- content = ('\n' + line[6] + '\n\n').replace('\n', '\n\n')
- file.writelines(content)
- # Alumnos inscritos
- content = '**' + cabecera[7] + ':** '
- file.writelines(content)
- content = ('\n' + line[7] + '\n').replace('\n', '\n\n')
- file.writelines(content)
diff --git a/ficheros/de_csv_a_md/docs/hoja01.md b/ficheros/de_csv_a_md/docs/hoja01.md
deleted file mode 100644
index e2a615f..0000000
--- a/ficheros/de_csv_a_md/docs/hoja01.md
+++ /dev/null
@@ -1,646 +0,0 @@
-
-## Angular y Spring 5 (udemy)
-**Propone:** Ango
-
-**Temática:** Programación
-
-**Horas:** 115
-
-**Enlace:** [https://www.udemy.com/course/angular-spring/](https://www.udemy.com/course/angular-spring/)
-
-**Observaciones:**
-
-
-
-
-
-**Alumnos Inscritos:**
-
-Lucía Hurtado
-
-
-## CCNA 3: Scaling Networks
-**Propone:** Ango
-
-**Temática:** Redes
-
-**Horas:** 100
-
-**Enlace:** [https://www.netacad.com/](https://www.netacad.com/)
-
-**Observaciones:**
-
-
-
-
-
-**Alumnos Inscritos:**
-
-
-
-
-## Curso de fundamentos de redes para Certificación MTA
-**Propone:** Luis
-
-**Temática:** Redes
-
-**Horas:** 25
-
-**Enlace:** [https://openwebinars.net/cursos/fundamentos-redes-mta/](https://openwebinars.net/cursos/fundamentos-redes-mta/)
-
-**Observaciones:**
-
-Es un poco repaso de las redes de 1º, pero viendo lo poco que os acordáis de lo que os dio Ango, no os viene mal.
-
-
-
-**Alumnos Inscritos:**
-
-Manuel Carrión
-
-Samuel Luna
-
-Celia Fernández
-
-
-## Curso de Iptables
-**Propone:** Luis
-
-**Temática:** Seguridad
-
-**Horas:** 25
-
-**Enlace:** [https://openwebinars.net/cursos/iptables/](https://openwebinars.net/cursos/iptables/)
-
-**Observaciones:**
-
-Amplia lo que se da en el tema de firewalls de SAD.
-
-
-
-**Alumnos Inscritos:**
-
-Manuel Carrión
-
-Celia Fernández
-
-
-##
-**Propone:**
-
-**Temática:**
-
-**Horas:**
-
-**Enlace:** []()
-
-**Observaciones:**
-
-
-
-
-
-**Alumnos Inscritos:**
-
-
-
-
-## Curso de Introducción a Docker
-**Propone:** Luis
-
-**Temática:** Virtualización
-
-**Horas:** 10
-
-**Enlace:** [https://openwebinars.net/academia/portada/docker-introduccion/](https://openwebinars.net/academia/portada/docker-introduccion/)
-
-**Observaciones:**
-
-Estos dos cursos de Docker son parte de una cosa que en OpenWebminars llaman "Carreras", que son lotes de cursos relacionados. Ésta en particular se llama "Docker DevOps Profesional". Jaime Barea comenta que en Cibernéticos les gustó ver este curso en su CV.
-
-
-
-**Alumnos Inscritos:**
-
-Jaime Barea
-
-Samuel Luna
-
-Pablo G. Campanario
-
-Ricardo Herrer
-
-Celia Fernández
-
-Alfonso Flores Flores
-
-
-## Curso de Docker para Desarrolladores
-**Propone:** Luis
-
-**Temática:** Virtualización
-
-**Horas:** 35
-
-**Enlace:** [https://openwebinars.net/academia/portada/docker/](https://openwebinars.net/academia/portada/docker/)
-
-**Observaciones:**
-
-Incluido en "Docker DevOps Profesional"
-
-
-
-**Alumnos Inscritos:**
-
-Jaime Barea
-
-Samuel Luna
-
-Alfonso Flores Flores
-
-
-## Fundamentos Generales: Orquestación y Automatizacion IT
-**Propone:** Luis
-
-**Temática:** Virtualización/Cloud
-
-**Horas:** 5
-
-**Enlace:** [https://openwebinars.net/academia/portada/fundamentos-generales-orquestacion-automatizacion-it/](https://openwebinars.net/academia/portada/fundamentos-generales-orquestacion-automatizacion-it/)
-
-**Observaciones:**
-
-Este curso y los que vienen a continuación son parte de la carrera de "Especialista en Automatización DevOps", que va de temas de Virtualización en Cloud
-
-
-
-**Alumnos Inscritos:**
-
-Jaime Barea
-
-
-## Curso de Ansible
-**Propone:** Luis
-
-**Temática:** Virtualización/Cloud
-
-**Horas:** 40
-
-**Enlace:** [https://openwebinars.net/academia/portada/ansible/](https://openwebinars.net/academia/portada/ansible/)
-
-**Observaciones:**
-
-Incluido en "Especialista en Automatización DevOps"
-
-
-
-**Alumnos Inscritos:**
-
-Jaime Barea
-
-Pablo G. Campanario
-
-
-## SSH: imprescindible en tiempos modernos
-**Propone:** Luis
-
-**Temática:** Servicios de Red
-
-**Horas:** 15
-
-**Enlace:** [https://openwebinars.net/cursos/ssh/](https://openwebinars.net/cursos/ssh/)
-
-**Observaciones:**
-
-Quizás algo básico, pero no es algo que os venga mal repasar. Incluido en "Especialista en Automatización DevOps". Impartido por Alberto Molina.
-
-
-
-**Alumnos Inscritos:**
-
-Jaime Barea
-
-Manuel Carrión
-
-Ricardo Herrer
-
-Samuel Luna
-
-Celia Fernández
-
-
-## Curso Online de Vagrant
-**Propone:** Ango
-
-**Temática:** Vagrant
-
-**Horas:** 20
-
-**Enlace:** [https://openwebinars.net/academia/portada/vagrant/](https://openwebinars.net/academia/portada/vagrant/)
-
-**Observaciones:**
-
-Lo da Alberto Molina. Incluido en "Especialista en Automatización DevOps"
-
-
-
-**Alumnos Inscritos:**
-
-Jaime Barea
-
-
-## Curso de Vagrant para desarrolladores
-**Propone:** Ango
-
-**Temática:** Vagrant
-
-**Horas:** 15
-
-**Enlace:** [https://openwebinars.net/academia/portada/curso-vagrant-desarrolladores/](https://openwebinars.net/academia/portada/curso-vagrant-desarrolladores/)
-
-**Observaciones:**
-
-Incluido en "Especialista en Automatización DevOps"
-
-
-
-**Alumnos Inscritos:**
-
-Jaime Barea
-
-
-## Curso de Terraform
-**Propone:** Luis
-
-**Temática:** Virtualización/Cloud
-
-**Horas:** 20
-
-**Enlace:** [https://openwebinars.net/academia/portada/terraform/](https://openwebinars.net/academia/portada/terraform/)
-
-**Observaciones:**
-
-Incluido en "Especialista en Automatización DevOps"
-
-
-
-**Alumnos Inscritos:**
-
-Jaime Barea
-
-
-## Curso de Introducción a Amazon Web Services (AWS)
-**Propone:** Luis
-
-**Temática:** Virtualización/Cloud
-
-**Horas:** 15
-
-**Enlace:** [https://openwebinars.net/academia/portada/aws/](https://openwebinars.net/academia/portada/aws/)
-
-**Observaciones:**
-
-Parece muy interesante. AWS domina completamente el mercado del sector.
-
-
-
-**Alumnos Inscritos:**
-
-Ricardo Herrer
-
-
-## Curso de VMware vSphere para principiantes
-**Propone:** Luis
-
-**Temática:** Virtualización/Cloud
-
-**Horas:** 20
-
-**Enlace:** [https://openwebinars.net/academia/portada/vmware-vsphere/](https://openwebinars.net/academia/portada/vmware-vsphere/)
-
-**Observaciones:**
-
-Se enseña primero el supervisor ESXi y luego ya se pasa al sistema gordo de vSphere. Los que queráis hacer este curso, podéis acceder a vuestra cuenta de VMware Academy para descargaros el software necesario.
-
-
-
-**Alumnos Inscritos:**
-
-Ricardo Herrer
-
-
-## Curso de Metasploit Framework
-**Propone:** Luis
-
-**Temática:** Seguridad
-
-**Horas:** 20
-
-**Enlace:** [https://openwebinars.net/academia/portada/metasploit/](https://openwebinars.net/academia/portada/metasploit/)
-
-**Observaciones:**
-
-Metasploit, el framework de los hackers vagos que no quieren pringarse las manos ni estudiar para ser hackers. Ideal para vosotros.
-
-
-
-**Alumnos Inscritos:**
-
-Samuel Luna
-
-Manuel Carrión
-
-
-## Curso de Seguridad en Redes con Snort
-**Propone:** Luis
-
-**Temática:** Seguridad
-
-**Horas:** 15
-
-**Enlace:** [https://openwebinars.net/academia/portada/seguridad-redes-snort/](https://openwebinars.net/academia/portada/seguridad-redes-snort/)
-
-**Observaciones:**
-
-SNORT es un sistema de monitorización en red. Está incluido en el temario de SAD, pero sólo lo vemos de pasada. Está bien que lo veáis por vuestra cuenta.
-
-
-
-**Alumnos Inscritos:**
-
-Samuel Luna
-
-
-## Curso de Hacking Web
-**Propone:** Luis
-
-**Temática:** Seguridad
-
-**Horas:** 15
-
-**Enlace:** [https://openwebinars.net/academia/portada/hacking-web/](https://openwebinars.net/academia/portada/hacking-web/)
-
-**Observaciones:**
-
-Aquí se enseña inyección SQL mayormente, que suele ser el principal agujero por donde entrar a las páginas web dinámicas.
-
-
-
-**Alumnos Inscritos:**
-
-Samuel Luna
-
-
-## Curso de Git
-**Propone:** Paco Ávila
-
-**Temática:** Programación
-
-**Horas:** 15
-
-**Enlace:** [https://openwebinars.net/academia/portada/git/](https://openwebinars.net/academia/portada/git/)
-
-**Observaciones:**
-
-Fundamental, te dediques a lo que te dediques
-
-
-
-**Alumnos Inscritos:**
-
-Juan Luis Galisteo
-
-Celia Fernández
-
-
-## Curso de Gitflow Profesional
-**Propone:** Paco Ávila
-
-**Temática:** Programación
-
-**Horas:** 5
-
-**Enlace:** [https://openwebinars.net/academia/portada/gitflow/](https://openwebinars.net/academia/portada/gitflow/)
-
-**Observaciones:**
-
-Cuando se pasa a formar parte de un equipo de programación es necesario tener unas pautas en cuanto a ramas, versiones, flujo de trabajo, etc usando un sistema de gestión de versiones como GIT.
-
-
-
-**Alumnos Inscritos:**
-
-Juan Luis Galisteo
-
-Celia Fernández
-
-
-## Curso de Raspberry Pi para desarrolladores
-**Propone:** Paco Ávila
-
-**Temática:** Sistemas/Programación
-
-**Horas:** 20
-
-**Enlace:** [https://openwebinars.net/academia/portada/raspberry-pi-desarrolladores/](https://openwebinars.net/academia/portada/raspberry-pi-desarrolladores/)
-
-**Observaciones:**
-
-Muy especializado y dedicado explícitemente al desarrollo. Se precisa conocer tecnologías de desarrollo donde aplicar la Raspberry PI.
-
-
-
-**Alumnos Inscritos:**
-
-Juan Luis Galisteo
-
-
-## SASS+GULP+BOOTSTRAP
-**Propone:** Fernando Vargas
-
-**Temática:** DIW
-
-**Horas:** 25
-
-**Enlace:** [https://openwebinars.net/academia/aprende/sass/7179/](https://openwebinars.net/academia/aprende/sass/7179/)
-
-**Observaciones:**
-
-Este curso viene muy bien para repasar los fundamentos de SASS, además incorpora GULP, y un ejercicio muy interesante para crear un Framework propio desde bootstrap
-
-
-
-**Alumnos Inscritos:**
-
-
-
-
-## Protección jurídica del Software
-**Propone:** Fernando Vargas
-
-**Temática:** DIW
-
-**Horas:** 5
-
-**Enlace:** [https://openwebinars.net/academia/portada/proteccion-juridica-software/](https://openwebinars.net/academia/portada/proteccion-juridica-software/)
-
-**Observaciones:**
-
-A través de este taller conocerás las posibilidades existentes para la protección jurídica de tu software, haciendo especial hincapié en las licencias de software
-
-
-
-**Alumnos Inscritos:**
-
-
-
-
-## Curso de Máquinas Virtuales en Azure
-**Propone:** Luis
-
-**Temática:** Virtualización/Cloud
-
-**Horas:** 10
-
-**Enlace:** [https://openwebinars.net/academia/portada/maquinas-virtuales-azure/](https://openwebinars.net/academia/portada/maquinas-virtuales-azure/)
-
-**Observaciones:**
-
-Curso de virtualización en Azure. Es parte de un certificado de Microsoft. A día de hoy no entrega certificado de hacer el curso, así que no es recomendable hacerlo (aunque los contenidos son interesantes).
-
-
-
-**Alumnos Inscritos:**
-
-Ricardo Herrer
-
-
-## Curso de Arduino
-**Propone:** Luis
-
-**Temática:** Arduino
-
-**Horas:** 20
-
-**Enlace:** [https://openwebinars.net/academia/portada/arduino/](https://openwebinars.net/academia/portada/arduino/)
-
-**Observaciones:**
-
-Curso de Arduino. Explica temas de sensores, control de luces y motores, almacenamiento de datos, comunicaciones, etc. La única pega es que como no tengas todos los sensores, shields, etc., que se explican no se va a poder probar en la práctica.
-
-
-
-**Alumnos Inscritos:**
-
-Pablo G. Campanario
-
-
-## Curso de Python 3 desde cero
-**Propone:** Luis
-
-**Temática:** Programación-Python
-
-**Horas:** 30
-
-**Enlace:** [https://openwebinars.net/academia/portada/python-desde-cero/](https://openwebinars.net/academia/portada/python-desde-cero/)
-
-**Observaciones:**
-
-Es un curso de programación, pero empieza desde cero y llega sólo a tocar un poco POO, así que no lo es muy complicado aunque sea para ASIR2.
-
-
-
-**Alumnos Inscritos:**
-
-Samuel Luna
-
-Pablo G. Campanario
-
-
-## Curso de Python: Aprende a programar en Python 3
-**Propone:** Paco Ávila
-
-**Temática:** Programación-Python
-
-**Horas:** 45
-
-**Enlace:** [https://openwebinars.net/academia/portada/python/](https://openwebinars.net/academia/portada/python/)
-
-**Observaciones:**
-
-Curso básico para aprender python 3 desde cero
-
-
-
-**Alumnos Inscritos:**
-
-Juan Luis Galisteo
-
-Celia Fernández
-
-
-## Servidores Web
-**Propone:** Paco Ávila/Luis
-
-**Temática:** Sistemas
-
-**Horas:** 60
-
-**Enlace:** [https://openwebinars.net/academia/portada/servidores-web/](https://openwebinars.net/academia/portada/servidores-web/)
-
-**Observaciones:**
-
-Este curso amplia lo que se da en SRI, con contenidos como Vagrant y un stack NodeJS/MongoDB (en lugar del clásico LAMP). Aprende Nginx, Apache, instalación del Stack MEAN, LAMP y mucho más
-
-
-
-**Alumnos Inscritos:**
-
-Manuel Carrión
-
-Pablo G. Campanario
-
-Juan Luis Galisteo
-
-Celia Fernández
-
-
-## Curso de introducción a Ethical Hacking
-**Propone:** Luis
-
-**Temática:** Seguridad
-
-**Horas:** 30
-
-**Enlace:** [https://openwebinars.net/academia/portada/ethical-hacking-introduccion/](https://openwebinars.net/academia/portada/ethical-hacking-introduccion/)
-
-**Observaciones:**
-
-Repaso del módulo de SAD. Toca un poquito cada palo de la seguridad.
-
-
-
-**Alumnos Inscritos:**
-
-Manuel Carrión
-
-
-## Curso de Web scraping: Extracción de datos en la Web
-**Propone:** Paco Ávila
-
-**Temática:** Programación-Python
-
-**Horas:** 20
-
-**Enlace:** [https://openwebinars.net/academia/portada/web-scraping/](https://openwebinars.net/academia/portada/web-scraping/)
-
-**Observaciones:**
-
-Web scraping es una técnica para extraer datos de sitios web y guardarlos en una base de datos, conviértete en un experto en web scraping usando Python y extrae información de forma práctica utilizando Python como lenguaje de programación.
-
-
-
-**Alumnos Inscritos:**
-
-Juan Luis Galisteo
-
diff --git a/ficheros/de_csv_a_md/docs/index.md b/ficheros/de_csv_a_md/docs/index.md
deleted file mode 100644
index 06b0c1b..0000000
--- a/ficheros/de_csv_a_md/docs/index.md
+++ /dev/null
@@ -1 +0,0 @@
-# [Cursos](hoja01.md)
\ No newline at end of file
diff --git a/ficheros/de_csv_a_md/mkdocs.yml b/ficheros/de_csv_a_md/mkdocs.yml
deleted file mode 100644
index dfba68a..0000000
--- a/ficheros/de_csv_a_md/mkdocs.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-site_name: IES ROMERO VARGAS Dpto. Informática FCT Covid-19
-
-nav:
- - Cursos : hoja01.md
-
-theme: windmill
-
-plugins:
- - search:
- separator: '[\s\-\.]+'
- lang: es
diff --git a/ficheros/mbox-short.txt b/ficheros/mbox-short.txt
deleted file mode 100644
index 684a920..0000000
--- a/ficheros/mbox-short.txt
+++ /dev/null
@@ -1,1910 +0,0 @@
-From stephen.marquard@uct.ac.za Sat Jan 5 09:14:16 2008
-Return-Path:
-Received: from murder (mail.umich.edu [141.211.14.90])
- by frankenstein.mail.umich.edu (Cyrus v2.3.8) with LMTPA;
- Sat, 05 Jan 2008 09:14:16 -0500
-X-Sieve: CMU Sieve 2.3
-Received: from murder ([unix socket])
- by mail.umich.edu (Cyrus v2.2.12) with LMTPA;
- Sat, 05 Jan 2008 09:14:16 -0500
-Received: from holes.mr.itd.umich.edu (holes.mr.itd.umich.edu [141.211.14.79])
- by flawless.mail.umich.edu () with ESMTP id m05EEFR1013674;
- Sat, 5 Jan 2008 09:14:15 -0500
-Received: FROM paploo.uhi.ac.uk (app1.prod.collab.uhi.ac.uk [194.35.219.184])
- BY holes.mr.itd.umich.edu ID 477F90B0.2DB2F.12494 ;
- 5 Jan 2008 09:14:10 -0500
-Received: from paploo.uhi.ac.uk (localhost [127.0.0.1])
- by paploo.uhi.ac.uk (Postfix) with ESMTP id 5F919BC2F2;
- Sat, 5 Jan 2008 14:10:05 +0000 (GMT)
-Message-ID: <200801051412.m05ECIaH010327@nakamura.uits.iupui.edu>
-Mime-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Received: from prod.collab.uhi.ac.uk ([194.35.219.182])
- by paploo.uhi.ac.uk (JAMES SMTP Server 2.1.3) with SMTP ID 899
- for ;
- Sat, 5 Jan 2008 14:09:50 +0000 (GMT)
-Received: from nakamura.uits.iupui.edu (nakamura.uits.iupui.edu [134.68.220.122])
- by shmi.uhi.ac.uk (Postfix) with ESMTP id A215243002
- for ; Sat, 5 Jan 2008 14:13:33 +0000 (GMT)
-Received: from nakamura.uits.iupui.edu (localhost [127.0.0.1])
- by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11) with ESMTP id m05ECJVp010329
- for ; Sat, 5 Jan 2008 09:12:19 -0500
-Received: (from apache@localhost)
- by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11/Submit) id m05ECIaH010327
- for source@collab.sakaiproject.org; Sat, 5 Jan 2008 09:12:18 -0500
-Date: Sat, 5 Jan 2008 09:12:18 -0500
-X-Authentication-Warning: nakamura.uits.iupui.edu: apache set sender to stephen.marquard@uct.ac.za using -f
-To: source@collab.sakaiproject.org
-From: stephen.marquard@uct.ac.za
-Subject: [sakai] svn commit: r39772 - content/branches/sakai_2-5-x/content-impl/impl/src/java/org/sakaiproject/content/impl
-X-Content-Type-Outer-Envelope: text/plain; charset=UTF-8
-X-Content-Type-Message-Body: text/plain; charset=UTF-8
-Content-Type: text/plain; charset=UTF-8
-X-DSPAM-Result: Innocent
-X-DSPAM-Processed: Sat Jan 5 09:14:16 2008
-X-DSPAM-Confidence: 0.8475
-X-DSPAM-Probability: 0.0000
-
-Details: http://source.sakaiproject.org/viewsvn/?view=rev&rev=39772
-
-Author: stephen.marquard@uct.ac.za
-Date: 2008-01-05 09:12:07 -0500 (Sat, 05 Jan 2008)
-New Revision: 39772
-
-Modified:
-content/branches/sakai_2-5-x/content-impl/impl/src/java/org/sakaiproject/content/impl/ContentServiceSqlOracle.java
-content/branches/sakai_2-5-x/content-impl/impl/src/java/org/sakaiproject/content/impl/DbContentService.java
-Log:
-SAK-12501 merge to 2-5-x: r39622, r39624:5, r39632:3 (resolve conflict from differing linebreaks for r39622)
-
-----------------------
-This automatic notification message was sent by Sakai Collab (https://collab.sakaiproject.org/portal) from the Source site.
-You can modify how you receive notifications at My Workspace > Preferences.
-
-
-
-From louis@media.berkeley.edu Fri Jan 4 18:10:48 2008
-Return-Path:
-Received: from murder (mail.umich.edu [141.211.14.97])
- by frankenstein.mail.umich.edu (Cyrus v2.3.8) with LMTPA;
- Fri, 04 Jan 2008 18:10:48 -0500
-X-Sieve: CMU Sieve 2.3
-Received: from murder ([unix socket])
- by mail.umich.edu (Cyrus v2.2.12) with LMTPA;
- Fri, 04 Jan 2008 18:10:48 -0500
-Received: from icestorm.mr.itd.umich.edu (icestorm.mr.itd.umich.edu [141.211.93.149])
- by sleepers.mail.umich.edu () with ESMTP id m04NAbGa029441;
- Fri, 4 Jan 2008 18:10:37 -0500
-Received: FROM paploo.uhi.ac.uk (app1.prod.collab.uhi.ac.uk [194.35.219.184])
- BY icestorm.mr.itd.umich.edu ID 477EBCE3.161BB.4320 ;
- 4 Jan 2008 18:10:31 -0500
-Received: from paploo.uhi.ac.uk (localhost [127.0.0.1])
- by paploo.uhi.ac.uk (Postfix) with ESMTP id 07969BB706;
- Fri, 4 Jan 2008 23:10:33 +0000 (GMT)
-Message-ID: <200801042308.m04N8v6O008125@nakamura.uits.iupui.edu>
-Mime-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Received: from prod.collab.uhi.ac.uk ([194.35.219.182])
- by paploo.uhi.ac.uk (JAMES SMTP Server 2.1.3) with SMTP ID 710
- for ;
- Fri, 4 Jan 2008 23:10:10 +0000 (GMT)
-Received: from nakamura.uits.iupui.edu (nakamura.uits.iupui.edu [134.68.220.122])
- by shmi.uhi.ac.uk (Postfix) with ESMTP id 4BA2F42F57
- for ; Fri, 4 Jan 2008 23:10:10 +0000 (GMT)
-Received: from nakamura.uits.iupui.edu (localhost [127.0.0.1])
- by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11) with ESMTP id m04N8vHG008127
- for ; Fri, 4 Jan 2008 18:08:57 -0500
-Received: (from apache@localhost)
- by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11/Submit) id m04N8v6O008125
- for source@collab.sakaiproject.org; Fri, 4 Jan 2008 18:08:57 -0500
-Date: Fri, 4 Jan 2008 18:08:57 -0500
-X-Authentication-Warning: nakamura.uits.iupui.edu: apache set sender to louis@media.berkeley.edu using -f
-To: source@collab.sakaiproject.org
-From: louis@media.berkeley.edu
-Subject: [sakai] svn commit: r39771 - in bspace/site-manage/sakai_2-4-x/site-manage-tool/tool/src: bundle java/org/sakaiproject/site/tool
-X-Content-Type-Outer-Envelope: text/plain; charset=UTF-8
-X-Content-Type-Message-Body: text/plain; charset=UTF-8
-Content-Type: text/plain; charset=UTF-8
-X-DSPAM-Result: Innocent
-X-DSPAM-Processed: Fri Jan 4 18:10:48 2008
-X-DSPAM-Confidence: 0.6178
-X-DSPAM-Probability: 0.0000
-
-Details: http://source.sakaiproject.org/viewsvn/?view=rev&rev=39771
-
-Author: louis@media.berkeley.edu
-Date: 2008-01-04 18:08:50 -0500 (Fri, 04 Jan 2008)
-New Revision: 39771
-
-Modified:
-bspace/site-manage/sakai_2-4-x/site-manage-tool/tool/src/bundle/sitesetupgeneric.properties
-bspace/site-manage/sakai_2-4-x/site-manage-tool/tool/src/java/org/sakaiproject/site/tool/SiteAction.java
-Log:
-BSP-1415 New (Guest) user Notification
-
-----------------------
-This automatic notification message was sent by Sakai Collab (https://collab.sakaiproject.org/portal) from the Source site.
-You can modify how you receive notifications at My Workspace > Preferences.
-
-
-
-From zqian@umich.edu Fri Jan 4 16:10:39 2008
-Return-Path:
-Received: from murder (mail.umich.edu [141.211.14.25])
- by frankenstein.mail.umich.edu (Cyrus v2.3.8) with LMTPA;
- Fri, 04 Jan 2008 16:10:39 -0500
-X-Sieve: CMU Sieve 2.3
-Received: from murder ([unix socket])
- by mail.umich.edu (Cyrus v2.2.12) with LMTPA;
- Fri, 04 Jan 2008 16:10:39 -0500
-Received: from ghostbusters.mr.itd.umich.edu (ghostbusters.mr.itd.umich.edu [141.211.93.144])
- by panther.mail.umich.edu () with ESMTP id m04LAcZw014275;
- Fri, 4 Jan 2008 16:10:38 -0500
-Received: FROM paploo.uhi.ac.uk (app1.prod.collab.uhi.ac.uk [194.35.219.184])
- BY ghostbusters.mr.itd.umich.edu ID 477EA0C6.A0214.25480 ;
- 4 Jan 2008 16:10:33 -0500
-Received: from paploo.uhi.ac.uk (localhost [127.0.0.1])
- by paploo.uhi.ac.uk (Postfix) with ESMTP id C48CDBB490;
- Fri, 4 Jan 2008 21:10:31 +0000 (GMT)
-Message-ID: <200801042109.m04L92hb007923@nakamura.uits.iupui.edu>
-Mime-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Received: from prod.collab.uhi.ac.uk ([194.35.219.182])
- by paploo.uhi.ac.uk (JAMES SMTP Server 2.1.3) with SMTP ID 906
- for ;
- Fri, 4 Jan 2008 21:10:18 +0000 (GMT)
-Received: from nakamura.uits.iupui.edu (nakamura.uits.iupui.edu [134.68.220.122])
- by shmi.uhi.ac.uk (Postfix) with ESMTP id 7D13042F71
- for ; Fri, 4 Jan 2008 21:10:14 +0000 (GMT)
-Received: from nakamura.uits.iupui.edu (localhost [127.0.0.1])
- by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11) with ESMTP id m04L927E007925
- for ; Fri, 4 Jan 2008 16:09:02 -0500
-Received: (from apache@localhost)
- by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11/Submit) id m04L92hb007923
- for source@collab.sakaiproject.org; Fri, 4 Jan 2008 16:09:02 -0500
-Date: Fri, 4 Jan 2008 16:09:02 -0500
-X-Authentication-Warning: nakamura.uits.iupui.edu: apache set sender to zqian@umich.edu using -f
-To: source@collab.sakaiproject.org
-From: zqian@umich.edu
-Subject: [sakai] svn commit: r39770 - site-manage/branches/sakai_2-5-x/site-manage-tool/tool/src/webapp/vm/sitesetup
-X-Content-Type-Outer-Envelope: text/plain; charset=UTF-8
-X-Content-Type-Message-Body: text/plain; charset=UTF-8
-Content-Type: text/plain; charset=UTF-8
-X-DSPAM-Result: Innocent
-X-DSPAM-Processed: Fri Jan 4 16:10:39 2008
-X-DSPAM-Confidence: 0.6961
-X-DSPAM-Probability: 0.0000
-
-Details: http://source.sakaiproject.org/viewsvn/?view=rev&rev=39770
-
-Author: zqian@umich.edu
-Date: 2008-01-04 16:09:01 -0500 (Fri, 04 Jan 2008)
-New Revision: 39770
-
-Modified:
-site-manage/branches/sakai_2-5-x/site-manage-tool/tool/src/webapp/vm/sitesetup/chef_site-siteInfo-list.vm
-Log:
-merge fix to SAK-9996 into 2-5-x branch: svn merge -r 39687:39688 https://source.sakaiproject.org/svn/site-manage/trunk/
-
-----------------------
-This automatic notification message was sent by Sakai Collab (https://collab.sakaiproject.org/portal) from the Source site.
-You can modify how you receive notifications at My Workspace > Preferences.
-
-
-
-From rjlowe@iupui.edu Fri Jan 4 15:46:24 2008
-Return-Path:
-Received: from murder (mail.umich.edu [141.211.14.25])
- by frankenstein.mail.umich.edu (Cyrus v2.3.8) with LMTPA;
- Fri, 04 Jan 2008 15:46:24 -0500
-X-Sieve: CMU Sieve 2.3
-Received: from murder ([unix socket])
- by mail.umich.edu (Cyrus v2.2.12) with LMTPA;
- Fri, 04 Jan 2008 15:46:24 -0500
-Received: from dreamcatcher.mr.itd.umich.edu (dreamcatcher.mr.itd.umich.edu [141.211.14.43])
- by panther.mail.umich.edu () with ESMTP id m04KkNbx032077;
- Fri, 4 Jan 2008 15:46:23 -0500
-Received: FROM paploo.uhi.ac.uk (app1.prod.collab.uhi.ac.uk [194.35.219.184])
- BY dreamcatcher.mr.itd.umich.edu ID 477E9B13.2F3BC.22965 ;
- 4 Jan 2008 15:46:13 -0500
-Received: from paploo.uhi.ac.uk (localhost [127.0.0.1])
- by paploo.uhi.ac.uk (Postfix) with ESMTP id 4AE03BB552;
- Fri, 4 Jan 2008 20:46:13 +0000 (GMT)
-Message-ID: <200801042044.m04Kiem3007881@nakamura.uits.iupui.edu>
-Mime-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Received: from prod.collab.uhi.ac.uk ([194.35.219.182])
- by paploo.uhi.ac.uk (JAMES SMTP Server 2.1.3) with SMTP ID 38
- for ;
- Fri, 4 Jan 2008 20:45:56 +0000 (GMT)
-Received: from nakamura.uits.iupui.edu (nakamura.uits.iupui.edu [134.68.220.122])
- by shmi.uhi.ac.uk (Postfix) with ESMTP id A55D242F57
- for ; Fri, 4 Jan 2008 20:45:52 +0000 (GMT)
-Received: from nakamura.uits.iupui.edu (localhost [127.0.0.1])
- by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11) with ESMTP id m04KieqE007883
- for ; Fri, 4 Jan 2008 15:44:40 -0500
-Received: (from apache@localhost)
- by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11/Submit) id m04Kiem3007881
- for source@collab.sakaiproject.org; Fri, 4 Jan 2008 15:44:40 -0500
-Date: Fri, 4 Jan 2008 15:44:40 -0500
-X-Authentication-Warning: nakamura.uits.iupui.edu: apache set sender to rjlowe@iupui.edu using -f
-To: source@collab.sakaiproject.org
-From: rjlowe@iupui.edu
-Subject: [sakai] svn commit: r39769 - in gradebook/trunk/app/ui/src: java/org/sakaiproject/tool/gradebook/ui/helpers/beans java/org/sakaiproject/tool/gradebook/ui/helpers/producers webapp/WEB-INF webapp/WEB-INF/bundle
-X-Content-Type-Outer-Envelope: text/plain; charset=UTF-8
-X-Content-Type-Message-Body: text/plain; charset=UTF-8
-Content-Type: text/plain; charset=UTF-8
-X-DSPAM-Result: Innocent
-X-DSPAM-Processed: Fri Jan 4 15:46:24 2008
-X-DSPAM-Confidence: 0.7565
-X-DSPAM-Probability: 0.0000
-
-Details: http://source.sakaiproject.org/viewsvn/?view=rev&rev=39769
-
-Author: rjlowe@iupui.edu
-Date: 2008-01-04 15:44:39 -0500 (Fri, 04 Jan 2008)
-New Revision: 39769
-
-Modified:
-gradebook/trunk/app/ui/src/java/org/sakaiproject/tool/gradebook/ui/helpers/beans/AssignmentGradeRecordBean.java
-gradebook/trunk/app/ui/src/java/org/sakaiproject/tool/gradebook/ui/helpers/producers/GradeGradebookItemProducer.java
-gradebook/trunk/app/ui/src/webapp/WEB-INF/applicationContext.xml
-gradebook/trunk/app/ui/src/webapp/WEB-INF/bundle/messages.properties
-gradebook/trunk/app/ui/src/webapp/WEB-INF/requestContext.xml
-Log:
-SAK-12180 - Fixed errors with grading helper
-
-----------------------
-This automatic notification message was sent by Sakai Collab (https://collab.sakaiproject.org/portal) from the Source site.
-You can modify how you receive notifications at My Workspace > Preferences.
-
-
-
-From zqian@umich.edu Fri Jan 4 15:03:18 2008
-Return-Path:
-Received: from murder (mail.umich.edu [141.211.14.46])
- by frankenstein.mail.umich.edu (Cyrus v2.3.8) with LMTPA;
- Fri, 04 Jan 2008 15:03:18 -0500
-X-Sieve: CMU Sieve 2.3
-Received: from murder ([unix socket])
- by mail.umich.edu (Cyrus v2.2.12) with LMTPA;
- Fri, 04 Jan 2008 15:03:18 -0500
-Received: from firestarter.mr.itd.umich.edu (firestarter.mr.itd.umich.edu [141.211.14.83])
- by fan.mail.umich.edu () with ESMTP id m04K3HGF006563;
- Fri, 4 Jan 2008 15:03:17 -0500
-Received: FROM paploo.uhi.ac.uk (app1.prod.collab.uhi.ac.uk [194.35.219.184])
- BY firestarter.mr.itd.umich.edu ID 477E9100.8F7F4.1590 ;
- 4 Jan 2008 15:03:15 -0500
-Received: from paploo.uhi.ac.uk (localhost [127.0.0.1])
- by paploo.uhi.ac.uk (Postfix) with ESMTP id 57770BB477;
- Fri, 4 Jan 2008 20:03:09 +0000 (GMT)
-Message-ID: <200801042001.m04K1cO0007738@nakamura.uits.iupui.edu>
-Mime-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Received: from prod.collab.uhi.ac.uk ([194.35.219.182])
- by paploo.uhi.ac.uk (JAMES SMTP Server 2.1.3) with SMTP ID 622
- for ;
- Fri, 4 Jan 2008 20:02:46 +0000 (GMT)
-Received: from nakamura.uits.iupui.edu (nakamura.uits.iupui.edu [134.68.220.122])
- by shmi.uhi.ac.uk (Postfix) with ESMTP id AB4D042F4D
- for ; Fri, 4 Jan 2008 20:02:50 +0000 (GMT)
-Received: from nakamura.uits.iupui.edu (localhost [127.0.0.1])
- by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11) with ESMTP id m04K1cXv007740
- for ; Fri, 4 Jan 2008 15:01:38 -0500
-Received: (from apache@localhost)
- by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11/Submit) id m04K1cO0007738
- for source@collab.sakaiproject.org; Fri, 4 Jan 2008 15:01:38 -0500
-Date: Fri, 4 Jan 2008 15:01:38 -0500
-X-Authentication-Warning: nakamura.uits.iupui.edu: apache set sender to zqian@umich.edu using -f
-To: source@collab.sakaiproject.org
-From: zqian@umich.edu
-Subject: [sakai] svn commit: r39766 - site-manage/branches/sakai_2-4-x/site-manage-tool/tool/src/java/org/sakaiproject/site/tool
-X-Content-Type-Outer-Envelope: text/plain; charset=UTF-8
-X-Content-Type-Message-Body: text/plain; charset=UTF-8
-Content-Type: text/plain; charset=UTF-8
-X-DSPAM-Result: Innocent
-X-DSPAM-Processed: Fri Jan 4 15:03:18 2008
-X-DSPAM-Confidence: 0.7626
-X-DSPAM-Probability: 0.0000
-
-Details: http://source.sakaiproject.org/viewsvn/?view=rev&rev=39766
-
-Author: zqian@umich.edu
-Date: 2008-01-04 15:01:37 -0500 (Fri, 04 Jan 2008)
-New Revision: 39766
-
-Modified:
-site-manage/branches/sakai_2-4-x/site-manage-tool/tool/src/java/org/sakaiproject/site/tool/SiteAction.java
-Log:
-merge fix to SAK-10788 into site-manage 2.4.x branch:
-
-Sakai Source Repository #38024 Wed Nov 07 14:54:46 MST 2007 zqian@umich.edu Fix to SAK-10788: If a provided id in a couse site is fake or doesn't provide any user information, Site Info appears to be like project site with empty participant list
-
-Watch for enrollments object being null and concatenate provider ids when there are more than one.
-Files Changed
-MODIFY /site-manage/trunk/site-manage-tool/tool/src/java/org/sakaiproject/site/tool/SiteAction.java
-
-
-
-
-----------------------
-This automatic notification message was sent by Sakai Collab (https://collab.sakaiproject.org/portal) from the Source site.
-You can modify how you receive notifications at My Workspace > Preferences.
-
-
-
-From rjlowe@iupui.edu Fri Jan 4 14:50:18 2008
-Return-Path:
-Received: from murder (mail.umich.edu [141.211.14.93])
- by frankenstein.mail.umich.edu (Cyrus v2.3.8) with LMTPA;
- Fri, 04 Jan 2008 14:50:18 -0500
-X-Sieve: CMU Sieve 2.3
-Received: from murder ([unix socket])
- by mail.umich.edu (Cyrus v2.2.12) with LMTPA;
- Fri, 04 Jan 2008 14:50:18 -0500
-Received: from eyewitness.mr.itd.umich.edu (eyewitness.mr.itd.umich.edu [141.211.93.142])
- by mission.mail.umich.edu () with ESMTP id m04JoHJi019755;
- Fri, 4 Jan 2008 14:50:17 -0500
-Received: FROM paploo.uhi.ac.uk (app1.prod.collab.uhi.ac.uk [194.35.219.184])
- BY eyewitness.mr.itd.umich.edu ID 477E8DF2.67B91.5278 ;
- 4 Jan 2008 14:50:13 -0500
-Received: from paploo.uhi.ac.uk (localhost [127.0.0.1])
- by paploo.uhi.ac.uk (Postfix) with ESMTP id 2D1B9BB492;
- Fri, 4 Jan 2008 19:47:10 +0000 (GMT)
-Message-ID: <200801041948.m04JmdwO007705@nakamura.uits.iupui.edu>
-Mime-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Received: from prod.collab.uhi.ac.uk ([194.35.219.182])
- by paploo.uhi.ac.uk (JAMES SMTP Server 2.1.3) with SMTP ID 960
- for ;
- Fri, 4 Jan 2008 19:46:50 +0000 (GMT)
-Received: from nakamura.uits.iupui.edu (nakamura.uits.iupui.edu [134.68.220.122])
- by shmi.uhi.ac.uk (Postfix) with ESMTP id B3E6742F4A
- for ; Fri, 4 Jan 2008 19:49:51 +0000 (GMT)
-Received: from nakamura.uits.iupui.edu (localhost [127.0.0.1])
- by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11) with ESMTP id m04JmeV9007707
- for ; Fri, 4 Jan 2008 14:48:40 -0500
-Received: (from apache@localhost)
- by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11/Submit) id m04JmdwO007705
- for source@collab.sakaiproject.org; Fri, 4 Jan 2008 14:48:39 -0500
-Date: Fri, 4 Jan 2008 14:48:39 -0500
-X-Authentication-Warning: nakamura.uits.iupui.edu: apache set sender to rjlowe@iupui.edu using -f
-To: source@collab.sakaiproject.org
-From: rjlowe@iupui.edu
-Subject: [sakai] svn commit: r39765 - in gradebook/trunk/app: business/src/java/org/sakaiproject/tool/gradebook/business business/src/java/org/sakaiproject/tool/gradebook/business/impl ui ui/src/java/org/sakaiproject/tool/gradebook/ui/helpers/beans ui/src/java/org/sakaiproject/tool/gradebook/ui/helpers/entity ui/src/java/org/sakaiproject/tool/gradebook/ui/helpers/params ui/src/java/org/sakaiproject/tool/gradebook/ui/helpers/producers ui/src/webapp/WEB-INF ui/src/webapp/WEB-INF/bundle ui/src/webapp/content/templates
-X-Content-Type-Outer-Envelope: text/plain; charset=UTF-8
-X-Content-Type-Message-Body: text/plain; charset=UTF-8
-Content-Type: text/plain; charset=UTF-8
-X-DSPAM-Result: Innocent
-X-DSPAM-Processed: Fri Jan 4 14:50:18 2008
-X-DSPAM-Confidence: 0.7556
-X-DSPAM-Probability: 0.0000
-
-Details: http://source.sakaiproject.org/viewsvn/?view=rev&rev=39765
-
-Author: rjlowe@iupui.edu
-Date: 2008-01-04 14:48:37 -0500 (Fri, 04 Jan 2008)
-New Revision: 39765
-
-Added:
-gradebook/trunk/app/ui/src/java/org/sakaiproject/tool/gradebook/ui/helpers/beans/AssignmentGradeRecordBean.java
-gradebook/trunk/app/ui/src/java/org/sakaiproject/tool/gradebook/ui/helpers/beans/AssignmentGradeRecordCreator.java
-gradebook/trunk/app/ui/src/java/org/sakaiproject/tool/gradebook/ui/helpers/entity/GradebookEntryGradeEntityProvider.java
-gradebook/trunk/app/ui/src/java/org/sakaiproject/tool/gradebook/ui/helpers/params/GradeGradebookItemViewParams.java
-gradebook/trunk/app/ui/src/java/org/sakaiproject/tool/gradebook/ui/helpers/producers/GradeGradebookItemProducer.java
-gradebook/trunk/app/ui/src/webapp/content/templates/grade-gradebook-item.html
-Modified:
-gradebook/trunk/app/business/src/java/org/sakaiproject/tool/gradebook/business/GradebookManager.java
-gradebook/trunk/app/business/src/java/org/sakaiproject/tool/gradebook/business/impl/GradebookManagerHibernateImpl.java
-gradebook/trunk/app/ui/pom.xml
-gradebook/trunk/app/ui/src/java/org/sakaiproject/tool/gradebook/ui/helpers/beans/GradebookItemBean.java
-gradebook/trunk/app/ui/src/java/org/sakaiproject/tool/gradebook/ui/helpers/entity/GradebookEntryEntityProvider.java
-gradebook/trunk/app/ui/src/java/org/sakaiproject/tool/gradebook/ui/helpers/producers/AddGradebookItemProducer.java
-gradebook/trunk/app/ui/src/webapp/WEB-INF/applicationContext.xml
-gradebook/trunk/app/ui/src/webapp/WEB-INF/bundle/messages.properties
-gradebook/trunk/app/ui/src/webapp/WEB-INF/requestContext.xml
-Log:
-SAK-12180 - New helper tool to grade an assignment
-
-----------------------
-This automatic notification message was sent by Sakai Collab (https://collab.sakaiproject.org/portal) from the Source site.
-You can modify how you receive notifications at My Workspace > Preferences.
-
-
-
-From cwen@iupui.edu Fri Jan 4 11:37:30 2008
-Return-Path:
-Received: from murder (mail.umich.edu [141.211.14.46])
- by frankenstein.mail.umich.edu (Cyrus v2.3.8) with LMTPA;
- Fri, 04 Jan 2008 11:37:30 -0500
-X-Sieve: CMU Sieve 2.3
-Received: from murder ([unix socket])
- by mail.umich.edu (Cyrus v2.2.12) with LMTPA;
- Fri, 04 Jan 2008 11:37:30 -0500
-Received: from tadpole.mr.itd.umich.edu (tadpole.mr.itd.umich.edu [141.211.14.72])
- by fan.mail.umich.edu () with ESMTP id m04GbT9x022078;
- Fri, 4 Jan 2008 11:37:29 -0500
-Received: FROM paploo.uhi.ac.uk (app1.prod.collab.uhi.ac.uk [194.35.219.184])
- BY tadpole.mr.itd.umich.edu ID 477E60B2.82756.9904 ;
- 4 Jan 2008 11:37:09 -0500
-Received: from paploo.uhi.ac.uk (localhost [127.0.0.1])
- by paploo.uhi.ac.uk (Postfix) with ESMTP id 8D13DBB001;
- Fri, 4 Jan 2008 16:37:07 +0000 (GMT)
-Message-ID: <200801041635.m04GZQGZ007313@nakamura.uits.iupui.edu>
-Mime-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Received: from prod.collab.uhi.ac.uk ([194.35.219.182])
- by paploo.uhi.ac.uk (JAMES SMTP Server 2.1.3) with SMTP ID 120
- for ;
- Fri, 4 Jan 2008 16:36:40 +0000 (GMT)
-Received: from nakamura.uits.iupui.edu (nakamura.uits.iupui.edu [134.68.220.122])
- by shmi.uhi.ac.uk (Postfix) with ESMTP id D430B42E42
- for ; Fri, 4 Jan 2008 16:36:37 +0000 (GMT)
-Received: from nakamura.uits.iupui.edu (localhost [127.0.0.1])
- by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11) with ESMTP id m04GZQ7W007315
- for ; Fri, 4 Jan 2008 11:35:26 -0500
-Received: (from apache@localhost)
- by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11/Submit) id m04GZQGZ007313
- for source@collab.sakaiproject.org; Fri, 4 Jan 2008 11:35:26 -0500
-Date: Fri, 4 Jan 2008 11:35:26 -0500
-X-Authentication-Warning: nakamura.uits.iupui.edu: apache set sender to cwen@iupui.edu using -f
-To: source@collab.sakaiproject.org
-From: cwen@iupui.edu
-Subject: [sakai] svn commit: r39764 - in msgcntr/trunk/messageforums-app/src/java/org/sakaiproject/tool/messageforums: . ui
-X-Content-Type-Outer-Envelope: text/plain; charset=UTF-8
-X-Content-Type-Message-Body: text/plain; charset=UTF-8
-Content-Type: text/plain; charset=UTF-8
-X-DSPAM-Result: Innocent
-X-DSPAM-Processed: Fri Jan 4 11:37:30 2008
-X-DSPAM-Confidence: 0.7002
-X-DSPAM-Probability: 0.0000
-
-Details: http://source.sakaiproject.org/viewsvn/?view=rev&rev=39764
-
-Author: cwen@iupui.edu
-Date: 2008-01-04 11:35:25 -0500 (Fri, 04 Jan 2008)
-New Revision: 39764
-
-Modified:
-msgcntr/trunk/messageforums-app/src/java/org/sakaiproject/tool/messageforums/PrivateMessagesTool.java
-msgcntr/trunk/messageforums-app/src/java/org/sakaiproject/tool/messageforums/ui/PrivateMessageDecoratedBean.java
-Log:
-unmerge Xingtang's checkin for SAK-12488.
-
-svn merge -r39558:39557 https://source.sakaiproject.org/svn/msgcntr/trunk
-U messageforums-app/src/java/org/sakaiproject/tool/messageforums/PrivateMessagesTool.java
-U messageforums-app/src/java/org/sakaiproject/tool/messageforums/ui/PrivateMessageDecoratedBean.java
-
-svn log -r 39558
-------------------------------------------------------------------------
-r39558 | hu2@iupui.edu | 2007-12-20 15:25:38 -0500 (Thu, 20 Dec 2007) | 3 lines
-
-SAK-12488
-when send a message to yourself. click reply to all, cc row should be null.
-http://jira.sakaiproject.org/jira/browse/SAK-12488
-------------------------------------------------------------------------
-
-
-----------------------
-This automatic notification message was sent by Sakai Collab (https://collab.sakaiproject.org/portal) from the Source site.
-You can modify how you receive notifications at My Workspace > Preferences.
-
-
-
-From cwen@iupui.edu Fri Jan 4 11:35:08 2008
-Return-Path:
-Received: from murder (mail.umich.edu [141.211.14.46])
- by frankenstein.mail.umich.edu (Cyrus v2.3.8) with LMTPA;
- Fri, 04 Jan 2008 11:35:08 -0500
-X-Sieve: CMU Sieve 2.3
-Received: from murder ([unix socket])
- by mail.umich.edu (Cyrus v2.2.12) with LMTPA;
- Fri, 04 Jan 2008 11:35:08 -0500
-Received: from it.mr.itd.umich.edu (it.mr.itd.umich.edu [141.211.93.151])
- by fan.mail.umich.edu () with ESMTP id m04GZ6lt020480;
- Fri, 4 Jan 2008 11:35:06 -0500
-Received: FROM paploo.uhi.ac.uk (app1.prod.collab.uhi.ac.uk [194.35.219.184])
- BY it.mr.itd.umich.edu ID 477E6033.6469D.21870 ;
- 4 Jan 2008 11:35:02 -0500
-Received: from paploo.uhi.ac.uk (localhost [127.0.0.1])
- by paploo.uhi.ac.uk (Postfix) with ESMTP id E40FABAE5B;
- Fri, 4 Jan 2008 16:34:38 +0000 (GMT)
-Message-ID: <200801041633.m04GX6eG007292@nakamura.uits.iupui.edu>
-Mime-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Received: from prod.collab.uhi.ac.uk ([194.35.219.182])
- by paploo.uhi.ac.uk (JAMES SMTP Server 2.1.3) with SMTP ID 697
- for ;
- Fri, 4 Jan 2008 16:34:01 +0000 (GMT)
-Received: from nakamura.uits.iupui.edu (nakamura.uits.iupui.edu [134.68.220.122])
- by shmi.uhi.ac.uk (Postfix) with ESMTP id 1CD0C42E42
- for ; Fri, 4 Jan 2008 16:34:17 +0000 (GMT)
-Received: from nakamura.uits.iupui.edu (localhost [127.0.0.1])
- by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11) with ESMTP id m04GX6Y3007294
- for ; Fri, 4 Jan 2008 11:33:06 -0500
-Received: (from apache@localhost)
- by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11/Submit) id m04GX6eG007292
- for source@collab.sakaiproject.org; Fri, 4 Jan 2008 11:33:06 -0500
-Date: Fri, 4 Jan 2008 11:33:06 -0500
-X-Authentication-Warning: nakamura.uits.iupui.edu: apache set sender to cwen@iupui.edu using -f
-To: source@collab.sakaiproject.org
-From: cwen@iupui.edu
-Subject: [sakai] svn commit: r39763 - in msgcntr/trunk: messageforums-api/src/bundle/org/sakaiproject/api/app/messagecenter/bundle messageforums-app/src/java/org/sakaiproject/tool/messageforums
-X-Content-Type-Outer-Envelope: text/plain; charset=UTF-8
-X-Content-Type-Message-Body: text/plain; charset=UTF-8
-Content-Type: text/plain; charset=UTF-8
-X-DSPAM-Result: Innocent
-X-DSPAM-Processed: Fri Jan 4 11:35:08 2008
-X-DSPAM-Confidence: 0.7615
-X-DSPAM-Probability: 0.0000
-
-Details: http://source.sakaiproject.org/viewsvn/?view=rev&rev=39763
-
-Author: cwen@iupui.edu
-Date: 2008-01-04 11:33:05 -0500 (Fri, 04 Jan 2008)
-New Revision: 39763
-
-Modified:
-msgcntr/trunk/messageforums-api/src/bundle/org/sakaiproject/api/app/messagecenter/bundle/Messages.properties
-msgcntr/trunk/messageforums-app/src/java/org/sakaiproject/tool/messageforums/PrivateMessagesTool.java
-Log:
-unmerge Xingtang's check in for SAK-12484.
-
-svn merge -r39571:39570 https://source.sakaiproject.org/svn/msgcntr/trunk
-U messageforums-api/src/bundle/org/sakaiproject/api/app/messagecenter/bundle/Messages.properties
-U messageforums-app/src/java/org/sakaiproject/tool/messageforums/PrivateMessagesTool.java
-
-svn log -r 39571
-------------------------------------------------------------------------
-r39571 | hu2@iupui.edu | 2007-12-20 21:26:28 -0500 (Thu, 20 Dec 2007) | 3 lines
-
-SAK-12484
-reply all cc list should not include the current user name.
-http://jira.sakaiproject.org/jira/browse/SAK-12484
-------------------------------------------------------------------------
-
-
-----------------------
-This automatic notification message was sent by Sakai Collab (https://collab.sakaiproject.org/portal) from the Source site.
-You can modify how you receive notifications at My Workspace > Preferences.
-
-
-
-From gsilver@umich.edu Fri Jan 4 11:12:37 2008
-Return-Path:
-Received: from murder (mail.umich.edu [141.211.14.25])
- by frankenstein.mail.umich.edu (Cyrus v2.3.8) with LMTPA;
- Fri, 04 Jan 2008 11:12:37 -0500
-X-Sieve: CMU Sieve 2.3
-Received: from murder ([unix socket])
- by mail.umich.edu (Cyrus v2.2.12) with LMTPA;
- Fri, 04 Jan 2008 11:12:37 -0500
-Received: from holes.mr.itd.umich.edu (holes.mr.itd.umich.edu [141.211.14.79])
- by panther.mail.umich.edu () with ESMTP id m04GCaHB030887;
- Fri, 4 Jan 2008 11:12:36 -0500
-Received: FROM paploo.uhi.ac.uk (app1.prod.collab.uhi.ac.uk [194.35.219.184])
- BY holes.mr.itd.umich.edu ID 477E5AEB.E670B.28397 ;
- 4 Jan 2008 11:12:30 -0500
-Received: from paploo.uhi.ac.uk (localhost [127.0.0.1])
- by paploo.uhi.ac.uk (Postfix) with ESMTP id 99715BAE7D;
- Fri, 4 Jan 2008 16:12:27 +0000 (GMT)
-Message-ID: <200801041611.m04GB1Lb007221@nakamura.uits.iupui.edu>
-Mime-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Received: from prod.collab.uhi.ac.uk ([194.35.219.182])
- by paploo.uhi.ac.uk (JAMES SMTP Server 2.1.3) with SMTP ID 272
- for ;
- Fri, 4 Jan 2008 16:12:14 +0000 (GMT)
-Received: from nakamura.uits.iupui.edu (nakamura.uits.iupui.edu [134.68.220.122])
- by shmi.uhi.ac.uk (Postfix) with ESMTP id 0A6ED42DFC
- for ; Fri, 4 Jan 2008 16:12:12 +0000 (GMT)
-Received: from nakamura.uits.iupui.edu (localhost [127.0.0.1])
- by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11) with ESMTP id m04GB1Wt007223
- for ; Fri, 4 Jan 2008 11:11:01 -0500
-Received: (from apache@localhost)
- by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11/Submit) id m04GB1Lb007221
- for source@collab.sakaiproject.org; Fri, 4 Jan 2008 11:11:01 -0500
-Date: Fri, 4 Jan 2008 11:11:01 -0500
-X-Authentication-Warning: nakamura.uits.iupui.edu: apache set sender to gsilver@umich.edu using -f
-To: source@collab.sakaiproject.org
-From: gsilver@umich.edu
-Subject: [sakai] svn commit: r39762 - web/trunk/web-tool/tool/src/bundle
-X-Content-Type-Outer-Envelope: text/plain; charset=UTF-8
-X-Content-Type-Message-Body: text/plain; charset=UTF-8
-Content-Type: text/plain; charset=UTF-8
-X-DSPAM-Result: Innocent
-X-DSPAM-Processed: Fri Jan 4 11:12:37 2008
-onfidence:X-DSPAM-C 0.7601
-X-DSPAM-Probability: 0.0000
-
-Details: http://source.sakaiproject.org/viewsvn/?view=rev&rev=39762
-
-Author: gsilver@umich.edu
-Date: 2008-01-04 11:11:00 -0500 (Fri, 04 Jan 2008)
-New Revision: 39762
-
-Modified:
-web/trunk/web-tool/tool/src/bundle/iframe.properties
-Log:
-SAK-12596
-http://bugs.sakaiproject.org/jira/browse/SAK-12596
-- left moot (unused) entries commented for now
-
-----------------------
-This automatic notification message was sent by Sakai Collab (https://collab.sakaiproject.org/portal) from the Source site.
-You can modify how you receive notifications at My Workspace > Preferences.
-
-
-
-From gsilver@umich.edu Fri Jan 4 11:11:52 2008
-Return-Path:
-Received: from murder (mail.umich.edu [141.211.14.36])
- by frankenstein.mail.umich.edu (Cyrus v2.3.8) with LMTPA;
- Fri, 04 Jan 2008 11:11:52 -0500
-X-Sieve: CMU Sieve 2.3
-Received: from murder ([unix socket])
- by mail.umich.edu (Cyrus v2.2.12) with LMTPA;
- Fri, 04 Jan 2008 11:11:52 -0500
-Received: from creepshow.mr.itd.umich.edu (creepshow.mr.itd.umich.edu [141.211.14.84])
- by godsend.mail.umich.edu () with ESMTP id m04GBqqv025330;
- Fri, 4 Jan 2008 11:11:52 -0500
-Received: FROM paploo.uhi.ac.uk (app1.prod.collab.uhi.ac.uk [194.35.219.184])
- BY creepshow.mr.itd.umich.edu ID 477E5AB3.5CC32.30840 ;
- 4 Jan 2008 11:11:34 -0500
-Received: from paploo.uhi.ac.uk (localhost [127.0.0.1])
- by paploo.uhi.ac.uk (Postfix) with ESMTP id 62AA4BAE46;
- Fri, 4 Jan 2008 16:11:31 +0000 (GMT)
-Message-ID: <200801041610.m04GA5KP007209@nakamura.uits.iupui.edu>
-Mime-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Received: from prod.collab.uhi.ac.uk ([194.35.219.182])
- by paploo.uhi.ac.uk (JAMES SMTP Server 2.1.3) with SMTP ID 1006
- for ;
- Fri, 4 Jan 2008 16:11:18 +0000 (GMT)
-Received: from nakamura.uits.iupui.edu (nakamura.uits.iupui.edu [134.68.220.122])
- by shmi.uhi.ac.uk (Postfix) with ESMTP id C596A3DFA2
- for ; Fri, 4 Jan 2008 16:11:16 +0000 (GMT)
-Received: from nakamura.uits.iupui.edu (localhost [127.0.0.1])
- by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11) with ESMTP id m04GA5LR007211
- for ; Fri, 4 Jan 2008 11:10:05 -0500
-Received: (from apache@localhost)
- by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11/Submit) id m04GA5KP007209
- for source@collab.sakaiproject.org; Fri, 4 Jan 2008 11:10:05 -0500
-Date: Fri, 4 Jan 2008 11:10:05 -0500
-X-Authentication-Warning: nakamura.uits.iupui.edu: apache set sender to gsilver@umich.edu using -f
-To: source@collab.sakaiproject.org
-From: gsilver@umich.edu
-Subject: [sakai] svn commit: r39761 - site/trunk/site-tool/tool/src/bundle
-X-Content-Type-Outer-Envelope: text/plain; charset=UTF-8
-X-Content-Type-Message-Body: text/plain; charset=UTF-8
-Content-Type: text/plain; charset=UTF-8
-X-DSPAM-Result: Innocent
-X-DSPAM-Processed: Fri Jan 4 11:11:52 2008
-X-DSPAM-Confidence: 0.7605
-X-DSPAM-Probability: 0.0000
-
-Details: http://source.sakaiproject.org/viewsvn/?view=rev&rev=39761
-
-Author: gsilver@umich.edu
-Date: 2008-01-04 11:10:04 -0500 (Fri, 04 Jan 2008)
-New Revision: 39761
-
-Modified:
-site/trunk/site-tool/tool/src/bundle/admin.properties
-Log:
-SAK-12595
-http://bugs.sakaiproject.org/jira/browse/SAK-12595
-- left moot (unused) entries commented for now
-
-----------------------
-This automatic notification message was sent by Sakai Collab (https://collab.sakaiproject.org/portal) from the Source site.
-You can modify how you receive notifications at My Workspace > Preferences.
-
-
-
-From zqian@umich.edu Fri Jan 4 11:11:03 2008
-Return-Path:
-Received: from murder (mail.umich.edu [141.211.14.97])
- by frankenstein.mail.umich.edu (Cyrus v2.3.8) with LMTPA;
- Fri, 04 Jan 2008 11:11:03 -0500
-X-Sieve: CMU Sieve 2.3
-Received: from murder ([unix socket])
- by mail.umich.edu (Cyrus v2.2.12) with LMTPA;
- Fri, 04 Jan 2008 11:11:03 -0500
-Received: from carrie.mr.itd.umich.edu (carrie.mr.itd.umich.edu [141.211.93.152])
- by sleepers.mail.umich.edu () with ESMTP id m04GB3Vg011502;
- Fri, 4 Jan 2008 11:11:03 -0500
-Received: FROM paploo.uhi.ac.uk (app1.prod.collab.uhi.ac.uk [194.35.219.184])
- BY carrie.mr.itd.umich.edu ID 477E5A8D.B378F.24200 ;
- 4 Jan 2008 11:10:56 -0500
-Received: from paploo.uhi.ac.uk (localhost [127.0.0.1])
- by paploo.uhi.ac.uk (Postfix) with ESMTP id C7251BAD44;
- Fri, 4 Jan 2008 16:10:53 +0000 (GMT)
-Message-ID: <200801041609.m04G9EuX007197@nakamura.uits.iupui.edu>
-Mime-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Received: from prod.collab.uhi.ac.uk ([194.35.219.182])
- by paploo.uhi.ac.uk (JAMES SMTP Server 2.1.3) with SMTP ID 483
- for ;
- Fri, 4 Jan 2008 16:10:27 +0000 (GMT)
-Received: from nakamura.uits.iupui.edu (nakamura.uits.iupui.edu [134.68.220.122])
- by shmi.uhi.ac.uk (Postfix) with ESMTP id 2E7043DFA2
- for ; Fri, 4 Jan 2008 16:10:26 +0000 (GMT)
-Received: from nakamura.uits.iupui.edu (localhost [127.0.0.1])
- by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11) with ESMTP id m04G9Eqg007199
- for ; Fri, 4 Jan 2008 11:09:15 -0500
-Received: (from apache@localhost)
- by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11/Submit) id m04G9EuX007197
- for source@collab.sakaiproject.org; Fri, 4 Jan 2008 11:09:14 -0500
-Date: Fri, 4 Jan 2008 11:09:14 -0500
-X-Authentication-Warning: nakamura.uits.iupui.edu: apache set sender to zqian@umich.edu using -f
-To: source@collab.sakaiproject.org
-From: zqian@umich.edu
-Subject: [sakai] svn commit: r39760 - in site-manage/trunk/site-manage-tool/tool/src: java/org/sakaiproject/site/tool webapp/vm/sitesetup
-X-Content-Type-Outer-Envelope: text/plain; charset=UTF-8
-X-Content-Type-Message-Body: text/plain; charset=UTF-8
-Content-Type: text/plain; charset=UTF-8
-X-DSPAM-Result: Innocent
-X-DSPAM-Processed: Fri Jan 4 11:11:03 2008
-X-DSPAM-Confidence: 0.6959
-X-DSPAM-Probability: 0.0000
-
-Details: http://source.sakaiproject.org/viewsvn/?view=rev&rev=39760
-
-Author: zqian@umich.edu
-Date: 2008-01-04 11:09:12 -0500 (Fri, 04 Jan 2008)
-New Revision: 39760
-
-Modified:
-site-manage/trunk/site-manage-tool/tool/src/java/org/sakaiproject/site/tool/SiteAction.java
-site-manage/trunk/site-manage-tool/tool/src/webapp/vm/sitesetup/chef_site-siteInfo-list.vm
-Log:
-fix to SAK-10911: Refactor use of site.upd, site.upd.site.mbrship and site.upd.grp.mbrship permissions
-
-----------------------
-This automatic notification message was sent by Sakai Collab (https://collab.sakaiproject.org/portal) from the Source site.
-You can modify how you receive notifications at My Workspace > Preferences.
-
-
-
-From gsilver@umich.edu Fri Jan 4 11:10:22 2008
-Return-Path:
-Received: from murder (mail.umich.edu [141.211.14.39])
- by frankenstein.mail.umich.edu (Cyrus v2.3.8) with LMTPA;
- Fri, 04 Jan 2008 11:10:22 -0500
-X-Sieve: CMU Sieve 2.3
-Received: from murder ([unix socket])
- by mail.umich.edu (Cyrus v2.2.12) with LMTPA;
- Fri, 04 Jan 2008 11:10:22 -0500
-Received: from holes.mr.itd.umich.edu (holes.mr.itd.umich.edu [141.211.14.79])
- by faithful.mail.umich.edu () with ESMTP id m04GAL9k010604;
- Fri, 4 Jan 2008 11:10:21 -0500
-Received: FROM paploo.uhi.ac.uk (app1.prod.collab.uhi.ac.uk [194.35.219.184])
- BY holes.mr.itd.umich.edu ID 477E5A67.34350.23015 ;
- 4 Jan 2008 11:10:18 -0500
-Received: from paploo.uhi.ac.uk (localhost [127.0.0.1])
- by paploo.uhi.ac.uk (Postfix) with ESMTP id 98D04BAD43;
- Fri, 4 Jan 2008 16:10:11 +0000 (GMT)
-Message-ID: <200801041608.m04G8d7w007184@nakamura.uits.iupui.edu>
-Mime-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Received: from prod.collab.uhi.ac.uk ([194.35.219.182])
- by paploo.uhi.ac.uk (JAMES SMTP Server 2.1.3) with SMTP ID 966
- for ;
- Fri, 4 Jan 2008 16:09:51 +0000 (GMT)
-Received: from nakamura.uits.iupui.edu (nakamura.uits.iupui.edu [134.68.220.122])
- by shmi.uhi.ac.uk (Postfix) with ESMTP id 9F89542DD0
- for ; Fri, 4 Jan 2008 16:09:50 +0000 (GMT)
-Received: from nakamura.uits.iupui.edu (localhost [127.0.0.1])
- by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11) with ESMTP id m04G8dXN007186
- for ; Fri, 4 Jan 2008 11:08:39 -0500
-Received: (from apache@localhost)
- by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11/Submit) id m04G8d7w007184
- for source@collab.sakaiproject.org; Fri, 4 Jan 2008 11:08:39 -0500
-Date: Fri, 4 Jan 2008 11:08:39 -0500
-X-Authentication-Warning: nakamura.uits.iupui.edu: apache set sender to gsilver@umich.edu using -f
-To: source@collab.sakaiproject.org
-From: gsilver@umich.edu
-Subject: [sakai] svn commit: r39759 - mailarchive/trunk/mailarchive-tool/tool/src/bundle
-X-Content-Type-Outer-Envelope: text/plain; charset=UTF-8
-X-Content-Type-Message-Body: text/plain; charset=UTF-8
-Content-Type: text/plain; charset=UTF-8
-X-DSPAM-Result: Innocent
-X-DSPAM-Processed: Fri Jan 4 11:10:22 2008
-X-DSPAM-Confidence: 0.7606
-X-DSPAM-Probability: 0.0000
-
-Details: http://source.sakaiproject.org/viewsvn/?view=rev&rev=39759
-
-Author: gsilver@umich.edu
-Date: 2008-01-04 11:08:38 -0500 (Fri, 04 Jan 2008)
-New Revision: 39759
-
-Modified:
-mailarchive/trunk/mailarchive-tool/tool/src/bundle/email.properties
-Log:
-SAK-12592
-http://bugs.sakaiproject.org/jira/browse/SAK-12592
-- left moot (unused) entries commented for now
-
-----------------------
-This automatic notification message was sent by Sakai Collab (https://collab.sakaiproject.org/portal) from the Source site.
-You can modify how you receive notifications at My Workspace > Preferences.
-
-
-
-From wagnermr@iupui.edu Fri Jan 4 10:38:42 2008
-Return-Path:
-Received: from murder (mail.umich.edu [141.211.14.90])
- by frankenstein.mail.umich.edu (Cyrus v2.3.8) with LMTPA;
- Fri, 04 Jan 2008 10:38:42 -0500
-X-Sieve: CMU Sieve 2.3
-Received: from murder ([unix socket])
- by mail.umich.edu (Cyrus v2.2.12) with LMTPA;
- Fri, 04 Jan 2008 10:38:42 -0500
-Received: from shining.mr.itd.umich.edu (shining.mr.itd.umich.edu [141.211.93.153])
- by flawless.mail.umich.edu () with ESMTP id m04Fcfjm012313;
- Fri, 4 Jan 2008 10:38:41 -0500
-Received: FROM paploo.uhi.ac.uk (app1.prod.collab.uhi.ac.uk [194.35.219.184])
- BY shining.mr.itd.umich.edu ID 477E52FA.E6C6E.24093 ;
- 4 Jan 2008 10:38:37 -0500
-Received: from paploo.uhi.ac.uk (localhost [127.0.0.1])
- by paploo.uhi.ac.uk (Postfix) with ESMTP id 6A39594CD2;
- Fri, 4 Jan 2008 15:37:36 +0000 (GMT)
-Message-ID: <200801041537.m04Fb6Ci007092@nakamura.uits.iupui.edu>
-Mime-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Received: from prod.collab.uhi.ac.uk ([194.35.219.182])
- by paploo.uhi.ac.uk (JAMES SMTP Server 2.1.3) with SMTP ID 690
- for ;
- Fri, 4 Jan 2008 15:37:21 +0000 (GMT)
-Received: from nakamura.uits.iupui.edu (nakamura.uits.iupui.edu [134.68.220.122])
- by shmi.uhi.ac.uk (Postfix) with ESMTP id CEFA037ACE
- for ; Fri, 4 Jan 2008 15:38:17 +0000 (GMT)
-Received: from nakamura.uits.iupui.edu (localhost [127.0.0.1])
- by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11) with ESMTP id m04Fb6nh007094
- for ; Fri, 4 Jan 2008 10:37:06 -0500
-Received: (from apache@localhost)
- by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11/Submit) id m04Fb6Ci007092
- for source@collab.sakaiproject.org; Fri, 4 Jan 2008 10:37:06 -0500
-Date: Fri, 4 Jan 2008 10:37:06 -0500
-X-Authentication-Warning: nakamura.uits.iupui.edu: apache set sender to wagnermr@iupui.edu using -f
-To: source@collab.sakaiproject.org
-From: wagnermr@iupui.edu
-Subject: [sakai] svn commit: r39758 - in gradebook/trunk: app/business/src/java/org/sakaiproject/tool/gradebook/business/impl service/api/src/java/org/sakaiproject/service/gradebook/shared service/impl/src/java/org/sakaiproject/component/gradebook
-X-Content-Type-Outer-Envelope: text/plain; charset=UTF-8
-X-Content-Type-Message-Body: text/plain; charset=UTF-8
-Content-Type: text/plain; charset=UTF-8
-X-DSPAM-Result: Innocent
-X-DSPAM-Processed: Fri Jan 4 10:38:42 2008
-X-DSPAM-Confidence: 0.7559
-X-DSPAM-Probability: 0.0000
-
-Details: http://source.sakaiproject.org/viewsvn/?view=rev&rev=39758
-
-Author: wagnermr@iupui.edu
-Date: 2008-01-04 10:37:04 -0500 (Fri, 04 Jan 2008)
-New Revision: 39758
-
-Modified:
-gradebook/trunk/app/business/src/java/org/sakaiproject/tool/gradebook/business/impl/GradebookManagerHibernateImpl.java
-gradebook/trunk/service/api/src/java/org/sakaiproject/service/gradebook/shared/GradebookService.java
-gradebook/trunk/service/impl/src/java/org/sakaiproject/component/gradebook/GradebookServiceHibernateImpl.java
-Log:
-SAK-12175
-http://bugs.sakaiproject.org/jira/browse/SAK-12175
-Create methods required for gb integration with the Assignment2 tool
-getGradeDefinitionForStudentForItem
-
-----------------------
-This automatic notification message was sent by Sakai Collab (https://collab.sakaiproject.org/portal) from the Source site.
-You can modify how you receive notifications at My Workspace > Preferences.
-
-
-
-From zqian@umich.edu Fri Jan 4 10:17:43 2008
-Return-Path:
-Received: from murder (mail.umich.edu [141.211.14.97])
- by frankenstein.mail.umich.edu (Cyrus v2.3.8) with LMTPA;
- Fri, 04 Jan 2008 10:17:43 -0500
-X-Sieve: CMU Sieve 2.3
-Received: from murder ([unix socket])
- by mail.umich.edu (Cyrus v2.2.12) with LMTPA;
- Fri, 04 Jan 2008 10:17:42 -0500
-Received: from creepshow.mr.itd.umich.edu (creepshow.mr.itd.umich.edu [141.211.14.84])
- by sleepers.mail.umich.edu () with ESMTP id m04FHgfs011536;
- Fri, 4 Jan 2008 10:17:42 -0500
-Received: FROM paploo.uhi.ac.uk (app1.prod.collab.uhi.ac.uk [194.35.219.184])
- BY creepshow.mr.itd.umich.edu ID 477E4E0F.CCA4B.926 ;
- 4 Jan 2008 10:17:38 -0500
-Received: from paploo.uhi.ac.uk (localhost [127.0.0.1])
- by paploo.uhi.ac.uk (Postfix) with ESMTP id BD02DBAC64;
- Fri, 4 Jan 2008 15:17:34 +0000 (GMT)
-Message-ID: <200801041515.m04FFv42007050@nakamura.uits.iupui.edu>
-Mime-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Received: from prod.collab.uhi.ac.uk ([194.35.219.182])
- by paploo.uhi.ac.uk (JAMES SMTP Server 2.1.3) with SMTP ID 25
- for ;
- Fri, 4 Jan 2008 15:17:11 +0000 (GMT)
-Received: from nakamura.uits.iupui.edu (nakamura.uits.iupui.edu [134.68.220.122])
- by shmi.uhi.ac.uk (Postfix) with ESMTP id 5B396236B9
- for ; Fri, 4 Jan 2008 15:17:08 +0000 (GMT)
-Received: from nakamura.uits.iupui.edu (localhost [127.0.0.1])
- by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11) with ESMTP id m04FFv85007052
- for ; Fri, 4 Jan 2008 10:15:57 -0500
-Received: (from apache@localhost)
- by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11/Submit) id m04FFv42007050
- for source@collab.sakaiproject.org; Fri, 4 Jan 2008 10:15:57 -0500
-Date: Fri, 4 Jan 2008 10:15:57 -0500
-X-Authentication-Warning: nakamura.uits.iupui.edu: apache set sender to zqian@umich.edu using -f
-To: source@collab.sakaiproject.org
-From: zqian@umich.edu
-Subject: [sakai] svn commit: r39757 - in assignment/trunk: assignment-impl/impl/src/java/org/sakaiproject/assignment/impl assignment-tool/tool/src/webapp/vm/assignment
-X-Content-Type-Outer-Envelope: text/plain; charset=UTF-8
-X-Content-Type-Message-Body: text/plain; charset=UTF-8
-Content-Type: text/plain; charset=UTF-8
-X-DSPAM-Result: Innocent
-X-DSPAM-Processed: Fri Jan 4 10:17:42 2008
-X-DSPAM-Confidence: 0.7605
-X-DSPAM-Probability: 0.0000
-
-Details: http://source.sakaiproject.org/viewsvn/?view=rev&rev=39757
-
-Author: zqian@umich.edu
-Date: 2008-01-04 10:15:54 -0500 (Fri, 04 Jan 2008)
-New Revision: 39757
-
-Modified:
-assignment/trunk/assignment-impl/impl/src/java/org/sakaiproject/assignment/impl/BaseAssignmentService.java
-assignment/trunk/assignment-tool/tool/src/webapp/vm/assignment/chef_assignments_instructor_list_submissions.vm
-Log:
-fix to SAK-12604:Don't show groups/sections filter if the site doesn't have any
-
-----------------------
-This automatic notification message was sent by Sakai Collab (https://collab.sakaiproject.org/portal) from the Source site.
-You can modify how you receive notifications at My Workspace > Preferences.
-
-
-
-From antranig@caret.cam.ac.uk Fri Jan 4 10:04:14 2008
-Return-Path:
-Received: from murder (mail.umich.edu [141.211.14.25])
- by frankenstein.mail.umich.edu (Cyrus v2.3.8) with LMTPA;
- Fri, 04 Jan 2008 10:04:14 -0500
-X-Sieve: CMU Sieve 2.3
-Received: from murder ([unix socket])
- by mail.umich.edu (Cyrus v2.2.12) with LMTPA;
- Fri, 04 Jan 2008 10:04:14 -0500
-Received: from holes.mr.itd.umich.edu (holes.mr.itd.umich.edu [141.211.14.79])
- by panther.mail.umich.edu () with ESMTP id m04F4Dci015108;
- Fri, 4 Jan 2008 10:04:13 -0500
-Received: FROM paploo.uhi.ac.uk (app1.prod.collab.uhi.ac.uk [194.35.219.184])
- BY holes.mr.itd.umich.edu ID 477E4AE3.D7AF.31669 ;
- 4 Jan 2008 10:04:05 -0500
-Received: from paploo.uhi.ac.uk (localhost [127.0.0.1])
- by paploo.uhi.ac.uk (Postfix) with ESMTP id 933E3BAC17;
- Fri, 4 Jan 2008 15:04:00 +0000 (GMT)
-Message-ID: <200801041502.m04F21Jo007031@nakamura.uits.iupui.edu>
-Mime-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Received: from prod.collab.uhi.ac.uk ([194.35.219.182])
- by paploo.uhi.ac.uk (JAMES SMTP Server 2.1.3) with SMTP ID 32
- for ;
- Fri, 4 Jan 2008 15:03:15 +0000 (GMT)
-Received: from nakamura.uits.iupui.edu (nakamura.uits.iupui.edu [134.68.220.122])
- by shmi.uhi.ac.uk (Postfix) with ESMTP id AC2F6236B9
- for ; Fri, 4 Jan 2008 15:03:12 +0000 (GMT)
-Received: from nakamura.uits.iupui.edu (localhost [127.0.0.1])
- by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11) with ESMTP id m04F21hn007033
- for ; Fri, 4 Jan 2008 10:02:01 -0500
-Received: (from apache@localhost)
- by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11/Submit) id m04F21Jo007031
- for source@collab.sakaiproject.org; Fri, 4 Jan 2008 10:02:01 -0500
-Date: Fri, 4 Jan 2008 10:02:01 -0500
-X-Authentication-Warning: nakamura.uits.iupui.edu: apache set sender to antranig@caret.cam.ac.uk using -f
-To: source@collab.sakaiproject.org
-From: antranig@caret.cam.ac.uk
-Subject: [sakai] svn commit: r39756 - in component/branches/SAK-12166/component-api/component/src/java/org/sakaiproject/component: impl impl/spring/support impl/spring/support/dynamic impl/support util
-X-Content-Type-Outer-Envelope: text/plain; charset=UTF-8
-X-Content-Type-Message-Body: text/plain; charset=UTF-8
-Content-Type: text/plain; charset=UTF-8
-X-DSPAM-Result: Innocent
-X-DSPAM-Processed: Fri Jan 4 10:04:14 2008
-X-DSPAM-Confidence: 0.6932
-X-DSPAM-Probability: 0.0000
-
-Details: http://source.sakaiproject.org/viewsvn/?view=rev&rev=39756
-
-Author: antranig@caret.cam.ac.uk
-Date: 2008-01-04 10:01:40 -0500 (Fri, 04 Jan 2008)
-New Revision: 39756
-
-Added:
-component/branches/SAK-12166/component-api/component/src/java/org/sakaiproject/component/impl/spring/support/dynamic/
-component/branches/SAK-12166/component-api/component/src/java/org/sakaiproject/component/impl/spring/support/dynamic/DynamicComponentManager.java
-component/branches/SAK-12166/component-api/component/src/java/org/sakaiproject/component/impl/support/
-component/branches/SAK-12166/component-api/component/src/java/org/sakaiproject/component/impl/support/DynamicComponentRecord.java
-component/branches/SAK-12166/component-api/component/src/java/org/sakaiproject/component/impl/support/DynamicJARManager.java
-component/branches/SAK-12166/component-api/component/src/java/org/sakaiproject/component/impl/support/JARRecord.java
-component/branches/SAK-12166/component-api/component/src/java/org/sakaiproject/component/util/ByteToCharBase64.java
-component/branches/SAK-12166/component-api/component/src/java/org/sakaiproject/component/util/FileUtil.java
-component/branches/SAK-12166/component-api/component/src/java/org/sakaiproject/component/util/RecordFileIO.java
-component/branches/SAK-12166/component-api/component/src/java/org/sakaiproject/component/util/RecordReader.java
-component/branches/SAK-12166/component-api/component/src/java/org/sakaiproject/component/util/RecordWriter.java
-component/branches/SAK-12166/component-api/component/src/java/org/sakaiproject/component/util/StreamDigestor.java
-Modified:
-component/branches/SAK-12166/component-api/component/src/java/org/sakaiproject/component/impl/spring/support/ComponentsLoaderImpl.java
-Log:
-Temporary commit of incomplete work on JAR caching
-
-----------------------
-This automatic notification message was sent by Sakai Collab (https://collab.sakaiproject.org/portal) from the Source site.
-You can modify how you receive notifications at My Workspace > Preferences.
-
-
-
-From gopal.ramasammycook@gmail.com Fri Jan 4 09:05:31 2008
-Return-Path:
-Received: from murder (mail.umich.edu [141.211.14.90])
- by frankenstein.mail.umich.edu (Cyrus v2.3.8) with LMTPA;
- Fri, 04 Jan 2008 09:05:31 -0500
-X-Sieve: CMU Sieve 2.3
-Received: from murder ([unix socket])
- by mail.umich.edu (Cyrus v2.2.12) with LMTPA;
- Fri, 04 Jan 2008 09:05:31 -0500
-Received: from guys.mr.itd.umich.edu (guys.mr.itd.umich.edu [141.211.14.76])
- by flawless.mail.umich.edu () with ESMTP id m04E5U3C029277;
- Fri, 4 Jan 2008 09:05:30 -0500
-Received: FROM paploo.uhi.ac.uk (app1.prod.collab.uhi.ac.uk [194.35.219.184])
- BY guys.mr.itd.umich.edu ID 477E3D23.EE2E7.5237 ;
- 4 Jan 2008 09:05:26 -0500
-Received: from paploo.uhi.ac.uk (localhost [127.0.0.1])
- by paploo.uhi.ac.uk (Postfix) with ESMTP id 33C7856DC0;
- Fri, 4 Jan 2008 14:05:26 +0000 (GMT)
-Message-ID: <200801041403.m04E3psW006926@nakamura.uits.iupui.edu>
-Mime-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Received: from prod.collab.uhi.ac.uk ([194.35.219.182])
- by paploo.uhi.ac.uk (JAMES SMTP Server 2.1.3) with SMTP ID 575
- for ;
- Fri, 4 Jan 2008 14:05:04 +0000 (GMT)
-Received: from nakamura.uits.iupui.edu (nakamura.uits.iupui.edu [134.68.220.122])
- by shmi.uhi.ac.uk (Postfix) with ESMTP id 3C0261D617
- for ; Fri, 4 Jan 2008 14:05:03 +0000 (GMT)
-Received: from nakamura.uits.iupui.edu (localhost [127.0.0.1])
- by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11) with ESMTP id m04E3pQS006928
- for ; Fri, 4 Jan 2008 09:03:52 -0500
-Received: (from apache@localhost)
- by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11/Submit) id m04E3psW006926
- for source@collab.sakaiproject.org; Fri, 4 Jan 2008 09:03:51 -0500
-Date: Fri, 4 Jan 2008 09:03:51 -0500
-X-Authentication-Warning: nakamura.uits.iupui.edu: apache set sender to gopal.ramasammycook@gmail.com using -f
-To: source@collab.sakaiproject.org
-From: gopal.ramasammycook@gmail.com
-Subject: [sakai] svn commit: r39755 - in sam/branches/SAK-12065: samigo-api/src/java/org/sakaiproject/tool/assessment/shared/api/grading samigo-app/src/java/org/sakaiproject/tool/assessment/ui/bean/evaluation samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/evaluation samigo-services/src/java/org/sakaiproject/tool/assessment/facade samigo-services/src/java/org/sakaiproject/tool/assessment/integration/helper/ifc samigo-services/src/java/org/sakaiproject/tool/assessment/integration/helper/integrated samigo-services/src/java/org/sakaiproject/tool/assessment/integration/helper/standalone samigo-services/src/java/org/sakaiproject/tool/assessment/shared/impl/grading
-X-Content-Type-Outer-Envelope: text/plain; charset=UTF-8
-X-Content-Type-Message-Body: text/plain; charset=UTF-8
-Content-Type: text/plain; charset=UTF-8
-X-DSPAM-Result: Innocent
-X-DSPAM-Processed: Fri Jan 4 09:05:31 2008
-X-DSPAM-Confidence: 0.7558
-X-DSPAM-Probability: 0.0000
-
-Details: http://source.sakaiproject.org/viewsvn/?view=rev&rev=39755
-
-Author: gopal.ramasammycook@gmail.com
-Date: 2008-01-04 09:02:54 -0500 (Fri, 04 Jan 2008)
-New Revision: 39755
-
-Modified:
-sam/branches/SAK-12065/samigo-api/src/java/org/sakaiproject/tool/assessment/shared/api/grading/GradingSectionAwareServiceAPI.java
-sam/branches/SAK-12065/samigo-app/src/java/org/sakaiproject/tool/assessment/ui/bean/evaluation/QuestionScoresBean.java
-sam/branches/SAK-12065/samigo-app/src/java/org/sakaiproject/tool/assessment/ui/bean/evaluation/SubmissionStatusBean.java
-sam/branches/SAK-12065/samigo-app/src/java/org/sakaiproject/tool/assessment/ui/bean/evaluation/TotalScoresBean.java
-sam/branches/SAK-12065/samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/evaluation/SubmissionStatusListener.java
-sam/branches/SAK-12065/samigo-services/src/java/org/sakaiproject/tool/assessment/facade/PublishedAssessmentFacadeQueries.java
-sam/branches/SAK-12065/samigo-services/src/java/org/sakaiproject/tool/assessment/facade/PublishedAssessmentFacadeQueriesAPI.java
-sam/branches/SAK-12065/samigo-services/src/java/org/sakaiproject/tool/assessment/integration/helper/ifc/SectionAwareServiceHelper.java
-sam/branches/SAK-12065/samigo-services/src/java/org/sakaiproject/tool/assessment/integration/helper/integrated/SectionAwareServiceHelperImpl.java
-sam/branches/SAK-12065/samigo-services/src/java/org/sakaiproject/tool/assessment/integration/helper/standalone/SectionAwareServiceHelperImpl.java
-sam/branches/SAK-12065/samigo-services/src/java/org/sakaiproject/tool/assessment/shared/impl/grading/GradingSectionAwareServiceImpl.java
-Log:
-SAK-12065 Gopal - Samigo Group Release. SubmissionStatus/TotalScores/Questions View filter.
-
-----------------------
-This automatic notification message was sent by Sakai Collab (https://collab.sakaiproject.org/portal) from the Source site.
-You can modify how you receive notifications at My Workspace > Preferences.
-
-
-
-From david.horwitz@uct.ac.za Fri Jan 4 07:02:32 2008
-Return-Path:
-Received: from murder (mail.umich.edu [141.211.14.39])
- by frankenstein.mail.umich.edu (Cyrus v2.3.8) with LMTPA;
- Fri, 04 Jan 2008 07:02:32 -0500
-X-Sieve: CMU Sieve 2.3
-Received: from murder ([unix socket])
- by mail.umich.edu (Cyrus v2.2.12) with LMTPA;
- Fri, 04 Jan 2008 07:02:32 -0500
-Received: from guys.mr.itd.umich.edu (guys.mr.itd.umich.edu [141.211.14.76])
- by faithful.mail.umich.edu () with ESMTP id m04C2VN7026678;
- Fri, 4 Jan 2008 07:02:31 -0500
-Received: FROM paploo.uhi.ac.uk (app1.prod.collab.uhi.ac.uk [194.35.219.184])
- BY guys.mr.itd.umich.edu ID 477E2050.C2599.3263 ;
- 4 Jan 2008 07:02:27 -0500
-Received: from paploo.uhi.ac.uk (localhost [127.0.0.1])
- by paploo.uhi.ac.uk (Postfix) with ESMTP id 6497FBA906;
- Fri, 4 Jan 2008 12:02:11 +0000 (GMT)
-Message-ID: <200801041200.m04C0gfK006793@nakamura.uits.iupui.edu>
-Mime-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Received: from prod.collab.uhi.ac.uk ([194.35.219.182])
- by paploo.uhi.ac.uk (JAMES SMTP Server 2.1.3) with SMTP ID 611
- for ;
- Fri, 4 Jan 2008 12:01:53 +0000 (GMT)
-Received: from nakamura.uits.iupui.edu (nakamura.uits.iupui.edu [134.68.220.122])
- by shmi.uhi.ac.uk (Postfix) with ESMTP id 5296342D3C
- for ; Fri, 4 Jan 2008 12:01:53 +0000 (GMT)
-Received: from nakamura.uits.iupui.edu (localhost [127.0.0.1])
- by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11) with ESMTP id m04C0gnm006795
- for ; Fri, 4 Jan 2008 07:00:42 -0500
-Received: (from apache@localhost)
- by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11/Submit) id m04C0gfK006793
- for source@collab.sakaiproject.org; Fri, 4 Jan 2008 07:00:42 -0500
-Date: Fri, 4 Jan 2008 07:00:42 -0500
-X-Authentication-Warning: nakamura.uits.iupui.edu: apache set sender to david.horwitz@uct.ac.za using -f
-To: source@collab.sakaiproject.org
-From: david.horwitz@uct.ac.za
-Subject: [sakai] svn commit: r39754 - in polls/branches/sakai_2-5-x: . tool tool/src/java/org/sakaiproject/poll/tool tool/src/java/org/sakaiproject/poll/tool/evolvers tool/src/webapp/WEB-INF
-X-Content-Type-Outer-Envelope: text/plain; charset=UTF-8
-X-Content-Type-Message-Body: text/plain; charset=UTF-8
-Content-Type: text/plain; charset=UTF-8
-X-DSPAM-Result: Innocent
-X-DSPAM-Processed: Fri Jan 4 07:02:32 2008
-X-DSPAM-Confidence: 0.6526
-X-DSPAM-Probability: 0.0000
-
-Details: http://source.sakaiproject.org/viewsvn/?view=rev&rev=39754
-
-Author: david.horwitz@uct.ac.za
-Date: 2008-01-04 07:00:10 -0500 (Fri, 04 Jan 2008)
-New Revision: 39754
-
-Added:
-polls/branches/sakai_2-5-x/tool/src/java/org/sakaiproject/poll/tool/evolvers/
-polls/branches/sakai_2-5-x/tool/src/java/org/sakaiproject/poll/tool/evolvers/SakaiFCKTextEvolver.java
-Removed:
-polls/branches/sakai_2-5-x/tool/src/java/org/sakaiproject/poll/tool/evolvers/SakaiFCKTextEvolver.java
-Modified:
-polls/branches/sakai_2-5-x/.classpath
-polls/branches/sakai_2-5-x/tool/pom.xml
-polls/branches/sakai_2-5-x/tool/src/webapp/WEB-INF/requestContext.xml
-Log:
-svn log -r39753 https://source.sakaiproject.org/svn/polls/trunk
-------------------------------------------------------------------------
-r39753 | david.horwitz@uct.ac.za | 2008-01-04 13:05:51 +0200 (Fri, 04 Jan 2008) | 1 line
-
-SAK-12228 implmented workaround sugested by AB - needs to be tested against a trunk build
-------------------------------------------------------------------------
-dhorwitz@david-horwitz-6:~/branchManagemnt/sakai_2-5-x> svn merge -c39753 https://source.sakaiproject.org/svn/polls/trunk polls/
-U polls/.classpath
-A polls/tool/src/java/org/sakaiproject/poll/tool/evolvers
-A polls/tool/src/java/org/sakaiproject/poll/tool/evolvers/SakaiFCKTextEvolver.java
-C polls/tool/src/webapp/WEB-INF/requestContext.xml
-U polls/tool/pom.xml
-
-dhorwitz@david-horwitz-6:~/branchManagemnt/sakai_2-5-x> svn resolved polls/tool/src/webapp/WEB-INF/requestContext.xml
-Resolved conflicted state of 'polls/tool/src/webapp/WEB-INF/requestContext.xml
-
-
-----------------------
-This automatic notification message was sent by Sakai Collab (https://collab.sakaiproject.org/portal) from the Source site.
-You can modify how you receive notifications at My Workspace > Preferences.
-
-
-
-From david.horwitz@uct.ac.za Fri Jan 4 06:08:27 2008
-Return-Path:
-Received: from murder (mail.umich.edu [141.211.14.98])
- by frankenstein.mail.umich.edu (Cyrus v2.3.8) with LMTPA;
- Fri, 04 Jan 2008 06:08:27 -0500
-X-Sieve: CMU Sieve 2.3
-Received: from murder ([unix socket])
- by mail.umich.edu (Cyrus v2.2.12) with LMTPA;
- Fri, 04 Jan 2008 06:08:27 -0500
-Received: from firestarter.mr.itd.umich.edu (firestarter.mr.itd.umich.edu [141.211.14.83])
- by casino.mail.umich.edu () with ESMTP id m04B8Qw9001368;
- Fri, 4 Jan 2008 06:08:26 -0500
-Received: FROM paploo.uhi.ac.uk (app1.prod.collab.uhi.ac.uk [194.35.219.184])
- BY firestarter.mr.itd.umich.edu ID 477E13A5.30FC0.24054 ;
- 4 Jan 2008 06:08:23 -0500
-Received: from paploo.uhi.ac.uk (localhost [127.0.0.1])
- by paploo.uhi.ac.uk (Postfix) with ESMTP id 784A476D7B;
- Fri, 4 Jan 2008 11:08:12 +0000 (GMT)
-Message-ID: <200801041106.m04B6lK3006677@nakamura.uits.iupui.edu>
-Mime-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Received: from prod.collab.uhi.ac.uk ([194.35.219.182])
- by paploo.uhi.ac.uk (JAMES SMTP Server 2.1.3) with SMTP ID 585
- for ;
- Fri, 4 Jan 2008 11:07:56 +0000 (GMT)
-Received: from nakamura.uits.iupui.edu (nakamura.uits.iupui.edu [134.68.220.122])
- by shmi.uhi.ac.uk (Postfix) with ESMTP id 1CACC42D0C
- for ; Fri, 4 Jan 2008 11:07:58 +0000 (GMT)
-Received: from nakamura.uits.iupui.edu (localhost [127.0.0.1])
- by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11) with ESMTP id m04B6lWM006679
- for ; Fri, 4 Jan 2008 06:06:47 -0500
-Received: (from apache@localhost)
- by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11/Submit) id m04B6lK3006677
- for source@collab.sakaiproject.org; Fri, 4 Jan 2008 06:06:47 -0500
-Date: Fri, 4 Jan 2008 06:06:47 -0500
-X-Authentication-Warning: nakamura.uits.iupui.edu: apache set sender to david.horwitz@uct.ac.za using -f
-To: source@collab.sakaiproject.org
-From: david.horwitz@uct.ac.za
-Subject: [sakai] svn commit: r39753 - in polls/trunk: . tool tool/src/java/org/sakaiproject/poll/tool tool/src/java/org/sakaiproject/poll/tool/evolvers tool/src/webapp/WEB-INF
-X-Content-Type-Outer-Envelope: text/plain; charset=UTF-8
-X-Content-Type-Message-Body: text/plain; charset=UTF-8
-Content-Type: text/plain; charset=UTF-8
-X-DSPAM-Result: Innocent
-X-DSPAM-Processed: Fri Jan 4 06:08:27 2008
-X-DSPAM-Confidence: 0.6948
-X-DSPAM-Probability: 0.0000
-
-Details: http://source.sakaiproject.org/viewsvn/?view=rev&rev=39753
-
-Author: david.horwitz@uct.ac.za
-Date: 2008-01-04 06:05:51 -0500 (Fri, 04 Jan 2008)
-New Revision: 39753
-
-Added:
-polls/trunk/tool/src/java/org/sakaiproject/poll/tool/evolvers/
-polls/trunk/tool/src/java/org/sakaiproject/poll/tool/evolvers/SakaiFCKTextEvolver.java
-Modified:
-polls/trunk/.classpath
-polls/trunk/tool/pom.xml
-polls/trunk/tool/src/webapp/WEB-INF/requestContext.xml
-Log:
-SAK-12228 implmented workaround sugested by AB - needs to be tested against a trunk build
-
-----------------------
-This automatic notification message was sent by Sakai Collab (https://collab.sakaiproject.org/portal) from the Source site.
-You can modify how you receive notifications at My Workspace > Preferences.
-
-
-
-From david.horwitz@uct.ac.za Fri Jan 4 04:49:08 2008
-Return-Path:
-Received: from murder (mail.umich.edu [141.211.14.92])
- by frankenstein.mail.umich.edu (Cyrus v2.3.8) with LMTPA;
- Fri, 04 Jan 2008 04:49:08 -0500
-X-Sieve: CMU Sieve 2.3
-Received: from murder ([unix socket])
- by mail.umich.edu (Cyrus v2.2.12) with LMTPA;
- Fri, 04 Jan 2008 04:49:08 -0500
-Received: from galaxyquest.mr.itd.umich.edu (galaxyquest.mr.itd.umich.edu [141.211.93.145])
- by score.mail.umich.edu () with ESMTP id m049n60G017588;
- Fri, 4 Jan 2008 04:49:06 -0500
-Received: FROM paploo.uhi.ac.uk (app1.prod.collab.uhi.ac.uk [194.35.219.184])
- BY galaxyquest.mr.itd.umich.edu ID 477E010C.48C2.10259 ;
- 4 Jan 2008 04:49:03 -0500
-Received: from paploo.uhi.ac.uk (localhost [127.0.0.1])
- by paploo.uhi.ac.uk (Postfix) with ESMTP id 254CC8CDEE;
- Fri, 4 Jan 2008 09:48:55 +0000 (GMT)
-Message-ID: <200801040947.m049lUxo006517@nakamura.uits.iupui.edu>
-Mime-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Received: from prod.collab.uhi.ac.uk ([194.35.219.182])
- by paploo.uhi.ac.uk (JAMES SMTP Server 2.1.3) with SMTP ID 246
- for ;
- Fri, 4 Jan 2008 09:48:36 +0000 (GMT)
-Received: from nakamura.uits.iupui.edu (nakamura.uits.iupui.edu [134.68.220.122])
- by shmi.uhi.ac.uk (Postfix) with ESMTP id 8C13342C92
- for ; Fri, 4 Jan 2008 09:48:40 +0000 (GMT)
-Received: from nakamura.uits.iupui.edu (localhost [127.0.0.1])
- by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11) with ESMTP id m049lU3P006519
- for ; Fri, 4 Jan 2008 04:47:30 -0500
-Received: (from apache@localhost)
- by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11/Submit) id m049lUxo006517
- for source@collab.sakaiproject.org; Fri, 4 Jan 2008 04:47:30 -0500
-Date: Fri, 4 Jan 2008 04:47:30 -0500
-X-Authentication-Warning: nakamura.uits.iupui.edu: apache set sender to david.horwitz@uct.ac.za using -f
-To: source@collab.sakaiproject.org
-From: david.horwitz@uct.ac.za
-Subject: [sakai] svn commit: r39752 - in podcasts/branches/sakai_2-5-x/podcasts-app/src/webapp: css podcasts
-X-Content-Type-Outer-Envelope: text/plain; charset=UTF-8
-X-Content-Type-Message-Body: text/plain; charset=UTF-8
-Content-Type: text/plain; charset=UTF-8
-X-DSPAM-Result: Innocent
-X-DSPAM-Processed: Fri Jan 4 04:49:08 2008
-X-DSPAM-Confidence: 0.6528
-X-DSPAM-Probability: 0.0000
-
-Details: http://source.sakaiproject.org/viewsvn/?view=rev&rev=39752
-
-Author: david.horwitz@uct.ac.za
-Date: 2008-01-04 04:47:16 -0500 (Fri, 04 Jan 2008)
-New Revision: 39752
-
-Modified:
-podcasts/branches/sakai_2-5-x/podcasts-app/src/webapp/css/podcaster.css
-podcasts/branches/sakai_2-5-x/podcasts-app/src/webapp/podcasts/podMain.jsp
-Log:
-svn log -r39641 https://source.sakaiproject.org/svn/podcasts/trunk
-------------------------------------------------------------------------
-r39641 | josrodri@iupui.edu | 2007-12-28 23:44:24 +0200 (Fri, 28 Dec 2007) | 1 line
-
-SAK-9882: refactored podMain.jsp the right way (at least much closer to)
-------------------------------------------------------------------------
-
-dhorwitz@david-horwitz-6:~/branchManagemnt/sakai_2-5-x> svn merge -c39641 https://source.sakaiproject.org/svn/podcasts/trunk podcasts/
-C podcasts/podcasts-app/src/webapp/podcasts/podMain.jsp
-U podcasts/podcasts-app/src/webapp/css/podcaster.css
-
-conflict merged manualy
-
-
-
-----------------------
-This automatic notification message was sent by Sakai Collab (https://collab.sakaiproject.org/portal) from the Source site.
-You can modify how you receive notifications at My Workspace > Preferences.
-
-
-
-From david.horwitz@uct.ac.za Fri Jan 4 04:33:44 2008
-Return-Path:
-Received: from murder (mail.umich.edu [141.211.14.46])
- by frankenstein.mail.umich.edu (Cyrus v2.3.8) with LMTPA;
- Fri, 04 Jan 2008 04:33:44 -0500
-X-Sieve: CMU Sieve 2.3
-Received: from murder ([unix socket])
- by mail.umich.edu (Cyrus v2.2.12) with LMTPA;
- Fri, 04 Jan 2008 04:33:44 -0500
-Received: from workinggirl.mr.itd.umich.edu (workinggirl.mr.itd.umich.edu [141.211.93.143])
- by fan.mail.umich.edu () with ESMTP id m049Xge3031803;
- Fri, 4 Jan 2008 04:33:42 -0500
-Received: FROM paploo.uhi.ac.uk (app1.prod.collab.uhi.ac.uk [194.35.219.184])
- BY workinggirl.mr.itd.umich.edu ID 477DFD6C.75DBE.26054 ;
- 4 Jan 2008 04:33:35 -0500
-Received: from paploo.uhi.ac.uk (localhost [127.0.0.1])
- by paploo.uhi.ac.uk (Postfix) with ESMTP id 6C929BA656;
- Fri, 4 Jan 2008 09:33:27 +0000 (GMT)
-Message-ID: <200801040932.m049W2i5006493@nakamura.uits.iupui.edu>
-Mime-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Received: from prod.collab.uhi.ac.uk ([194.35.219.182])
- by paploo.uhi.ac.uk (JAMES SMTP Server 2.1.3) with SMTP ID 153
- for ;
- Fri, 4 Jan 2008 09:33:10 +0000 (GMT)
-Received: from nakamura.uits.iupui.edu (nakamura.uits.iupui.edu [134.68.220.122])
- by shmi.uhi.ac.uk (Postfix) with ESMTP id 6C69423767
- for ; Fri, 4 Jan 2008 09:33:13 +0000 (GMT)
-Received: from nakamura.uits.iupui.edu (localhost [127.0.0.1])
- by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11) with ESMTP id m049W3fl006495
- for ; Fri, 4 Jan 2008 04:32:03 -0500
-Received: (from apache@localhost)
- by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11/Submit) id m049W2i5006493
- for source@collab.sakaiproject.org; Fri, 4 Jan 2008 04:32:02 -0500
-Date: Fri, 4 Jan 2008 04:32:02 -0500
-X-Authentication-Warning: nakamura.uits.iupui.edu: apache set sender to david.horwitz@uct.ac.za using -f
-To: source@collab.sakaiproject.org
-From: david.horwitz@uct.ac.za
-Subject: [sakai] svn commit: r39751 - in podcasts/branches/sakai_2-5-x/podcasts-app/src/webapp: css images podcasts
-X-Content-Type-Outer-Envelope: text/plain; charset=UTF-8
-X-Content-Type-Message-Body: text/plain; charset=UTF-8
-Content-Type: text/plain; charset=UTF-8
-X-DSPAM-Result: Innocent
-X-DSPAM-Processed: Fri Jan 4 04:33:44 2008
-X-DSPAM-Confidence: 0.7002
-X-DSPAM-Probability: 0.0000
-
-Details: http://source.sakaiproject.org/viewsvn/?view=rev&rev=39751
-
-Author: david.horwitz@uct.ac.za
-Date: 2008-01-04 04:31:35 -0500 (Fri, 04 Jan 2008)
-New Revision: 39751
-
-Removed:
-podcasts/branches/sakai_2-5-x/podcasts-app/src/webapp/images/rss-feed-icon.png
-podcasts/branches/sakai_2-5-x/podcasts-app/src/webapp/podcasts/podPermissions.jsp
-Modified:
-podcasts/branches/sakai_2-5-x/podcasts-app/src/webapp/css/podcaster.css
-podcasts/branches/sakai_2-5-x/podcasts-app/src/webapp/podcasts/podDelete.jsp
-podcasts/branches/sakai_2-5-x/podcasts-app/src/webapp/podcasts/podMain.jsp
-podcasts/branches/sakai_2-5-x/podcasts-app/src/webapp/podcasts/podNoResource.jsp
-podcasts/branches/sakai_2-5-x/podcasts-app/src/webapp/podcasts/podOptions.jsp
-Log:
-svn log -r39146 https://source.sakaiproject.org/svn/podcasts/trunk
-------------------------------------------------------------------------
-r39146 | josrodri@iupui.edu | 2007-12-12 21:40:33 +0200 (Wed, 12 Dec 2007) | 1 line
-
-SAK-9882: refactored the other pages as well to take advantage of proper jsp components as well as validation cleanup.
-------------------------------------------------------------------------
-dhorwitz@david-horwitz-6:~/branchManagemnt/sakai_2-5-x> svn merge -c39146 https://source.sakaiproject.org/svn/podcasts/trunk podcasts/
-D podcasts/podcasts-app/src/webapp/podcasts/podPermissions.jsp
-U podcasts/podcasts-app/src/webapp/podcasts/podDelete.jsp
-U podcasts/podcasts-app/src/webapp/podcasts/podMain.jsp
-U podcasts/podcasts-app/src/webapp/podcasts/podNoResource.jsp
-U podcasts/podcasts-app/src/webapp/podcasts/podOptions.jsp
-D podcasts/podcasts-app/src/webapp/images/rss-feed-icon.png
-U podcasts/podcasts-app/src/webapp/css/podcaster.css
-
-
-
-----------------------
-This automatic notification message was sent by Sakai Collab (https://collab.sakaiproject.org/portal) from the Source site.
-You can modify how you receive notifications at My Workspace > Preferences.
-
-
-
-From stephen.marquard@uct.ac.za Fri Jan 4 04:07:34 2008
-Return-Path:
-Received: from murder (mail.umich.edu [141.211.14.25])
- by frankenstein.mail.umich.edu (Cyrus v2.3.8) with LMTPA;
- Fri, 04 Jan 2008 04:07:34 -0500
-X-Sieve: CMU Sieve 2.3
-Received: from murder ([unix socket])
- by mail.umich.edu (Cyrus v2.2.12) with LMTPA;
- Fri, 04 Jan 2008 04:07:34 -0500
-Received: from salemslot.mr.itd.umich.edu (salemslot.mr.itd.umich.edu [141.211.14.58])
- by panther.mail.umich.edu () with ESMTP id m0497WAN027902;
- Fri, 4 Jan 2008 04:07:32 -0500
-Received: FROM paploo.uhi.ac.uk (app1.prod.collab.uhi.ac.uk [194.35.219.184])
- BY salemslot.mr.itd.umich.edu ID 477DF74E.49493.30415 ;
- 4 Jan 2008 04:07:29 -0500
-Received: from paploo.uhi.ac.uk (localhost [127.0.0.1])
- by paploo.uhi.ac.uk (Postfix) with ESMTP id 88598BA5B6;
- Fri, 4 Jan 2008 09:07:19 +0000 (GMT)
-Message-ID: <200801040905.m0495rWB006420@nakamura.uits.iupui.edu>
-Mime-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Received: from prod.collab.uhi.ac.uk ([194.35.219.182])
- by paploo.uhi.ac.uk (JAMES SMTP Server 2.1.3) with SMTP ID 385
- for ;
- Fri, 4 Jan 2008 09:07:04 +0000 (GMT)
-Received: from nakamura.uits.iupui.edu (nakamura.uits.iupui.edu [134.68.220.122])
- by shmi.uhi.ac.uk (Postfix) with ESMTP id 90636418A8
- for ; Fri, 4 Jan 2008 09:07:04 +0000 (GMT)
-Received: from nakamura.uits.iupui.edu (localhost [127.0.0.1])
- by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11) with ESMTP id m0495sZs006422
- for ; Fri, 4 Jan 2008 04:05:54 -0500
-Received: (from apache@localhost)
- by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11/Submit) id m0495rWB006420
- for source@collab.sakaiproject.org; Fri, 4 Jan 2008 04:05:53 -0500
-Date: Fri, 4 Jan 2008 04:05:53 -0500
-X-Authentication-Warning: nakamura.uits.iupui.edu: apache set sender to stephen.marquard@uct.ac.za using -f
-To: source@collab.sakaiproject.org
-From: stephen.marquard@uct.ac.za
-Subject: [sakai] svn commit: r39750 - event/branches/SAK-6216/event-util/util/src/java/org/sakaiproject/util
-X-Content-Type-Outer-Envelope: text/plain; charset=UTF-8
-X-Content-Type-Message-Body: text/plain; charset=UTF-8
-Content-Type: text/plain; charset=UTF-8
-X-DSPAM-Result: Innocent
-X-DSPAM-Processed: Fri Jan 4 04:07:34 2008
-X-DSPAM-Confidence: 0.7554
-X-DSPAM-Probability: 0.0000
-
-Details: http://source.sakaiproject.org/viewsvn/?view=rev&rev=39750
-
-Author: stephen.marquard@uct.ac.za
-Date: 2008-01-04 04:05:43 -0500 (Fri, 04 Jan 2008)
-New Revision: 39750
-
-Modified:
-event/branches/SAK-6216/event-util/util/src/java/org/sakaiproject/util/EmailNotification.java
-Log:
-SAK-6216 merge event change from SAK-11169 (r39033) to synchronize branch with 2-5-x (for convenience for UCT local build)
-
-----------------------
-This automatic notification message was sent by Sakai Collab (https://collab.sakaiproject.org/portal) from the Source site.
-You can modify how you receive notifications at My Workspace > Preferences.
-
-
-
-From louis@media.berkeley.edu Thu Jan 3 19:51:21 2008
-Return-Path:
-Received: from murder (mail.umich.edu [141.211.14.91])
- by frankenstein.mail.umich.edu (Cyrus v2.3.8) with LMTPA;
- Thu, 03 Jan 2008 19:51:21 -0500
-X-Sieve: CMU Sieve 2.3
-Received: from murder ([unix socket])
- by mail.umich.edu (Cyrus v2.2.12) with LMTPA;
- Thu, 03 Jan 2008 19:51:21 -0500
-Received: from eyewitness.mr.itd.umich.edu (eyewitness.mr.itd.umich.edu [141.211.93.142])
- by jacknife.mail.umich.edu () with ESMTP id m040pJHB027171;
- Thu, 3 Jan 2008 19:51:19 -0500
-Received: FROM paploo.uhi.ac.uk (app1.prod.collab.uhi.ac.uk [194.35.219.184])
- BY eyewitness.mr.itd.umich.edu ID 477D8300.AC098.32562 ;
- 3 Jan 2008 19:51:15 -0500
-Received: from paploo.uhi.ac.uk (localhost [127.0.0.1])
- by paploo.uhi.ac.uk (Postfix) with ESMTP id E6CC4B9F8A;
- Fri, 4 Jan 2008 00:36:06 +0000 (GMT)
-Message-ID: <200801040023.m040NpCc005473@nakamura.uits.iupui.edu>
-Mime-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Received: from prod.collab.uhi.ac.uk ([194.35.219.182])
- by paploo.uhi.ac.uk (JAMES SMTP Server 2.1.3) with SMTP ID 754
- for ;
- Fri, 4 Jan 2008 00:35:43 +0000 (GMT)
-Received: from nakamura.uits.iupui.edu (nakamura.uits.iupui.edu [134.68.220.122])
- by shmi.uhi.ac.uk (Postfix) with ESMTP id 8889842C49
- for ; Fri, 4 Jan 2008 00:25:00 +0000 (GMT)
-Received: from nakamura.uits.iupui.edu (localhost [127.0.0.1])
- by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11) with ESMTP id m040NpgM005475
- for ; Thu, 3 Jan 2008 19:23:51 -0500
-Received: (from apache@localhost)
- by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11/Submit) id m040NpCc005473
- for source@collab.sakaiproject.org; Thu, 3 Jan 2008 19:23:51 -0500
-Date: Thu, 3 Jan 2008 19:23:51 -0500
-X-Authentication-Warning: nakamura.uits.iupui.edu: apache set sender to louis@media.berkeley.edu using -f
-To: source@collab.sakaiproject.org
-From: louis@media.berkeley.edu
-Subject: [sakai] svn commit: r39749 - in bspace/site-manage/sakai_2-4-x/site-manage-tool/tool/src: bundle webapp/vm/sitesetup
-X-Content-Type-Outer-Envelope: text/plain; charset=UTF-8
-X-Content-Type-Message-Body: text/plain; charset=UTF-8
-Content-Type: text/plain; charset=UTF-8
-X-DSPAM-Result: Innocent
-X-DSPAM-Processed: Thu Jan 3 19:51:20 2008
-X-DSPAM-Confidence: 0.6956
-X-DSPAM-Probability: 0.0000
-
-Details: http://source.sakaiproject.org/viewsvn/?view=rev&rev=39749
-
-Author: louis@media.berkeley.edu
-Date: 2008-01-03 19:23:46 -0500 (Thu, 03 Jan 2008)
-New Revision: 39749
-
-Modified:
-bspace/site-manage/sakai_2-4-x/site-manage-tool/tool/src/bundle/sitesetupgeneric.properties
-bspace/site-manage/sakai_2-4-x/site-manage-tool/tool/src/webapp/vm/sitesetup/chef_site-importSites.vm
-Log:
-BSP-1420 Update text to clarify "Re-Use Materials..." option in WS Setup
-
-----------------------
-This automatic notification message was sent by Sakai Collab (https://collab.sakaiproject.org/portal) from the Source site.
-You can modify how you receive notifications at My Workspace > Preferences.
-
-
-
-From louis@media.berkeley.edu Thu Jan 3 17:18:23 2008
-Return-Path:
-Received: from murder (mail.umich.edu [141.211.14.91])
- by frankenstein.mail.umich.edu (Cyrus v2.3.8) with LMTPA;
- Thu, 03 Jan 2008 17:18:23 -0500
-X-Sieve: CMU Sieve 2.3
-Received: from murder ([unix socket])
- by mail.umich.edu (Cyrus v2.2.12) with LMTPA;
- Thu, 03 Jan 2008 17:18:23 -0500
-Received: from salemslot.mr.itd.umich.edu (salemslot.mr.itd.umich.edu [141.211.14.58])
- by jacknife.mail.umich.edu () with ESMTP id m03MIMXY027729;
- Thu, 3 Jan 2008 17:18:22 -0500
-Received: FROM paploo.uhi.ac.uk (app1.prod.collab.uhi.ac.uk [194.35.219.184])
- BY salemslot.mr.itd.umich.edu ID 477D5F23.797F6.16348 ;
- 3 Jan 2008 17:18:14 -0500
-Received: from paploo.uhi.ac.uk (localhost [127.0.0.1])
- by paploo.uhi.ac.uk (Postfix) with ESMTP id EF439B98CE;
- Thu, 3 Jan 2008 22:18:19 +0000 (GMT)
-Message-ID: <200801032216.m03MGhDa005292@nakamura.uits.iupui.edu>
-Mime-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Received: from prod.collab.uhi.ac.uk ([194.35.219.182])
- by paploo.uhi.ac.uk (JAMES SMTP Server 2.1.3) with SMTP ID 236
- for ;
- Thu, 3 Jan 2008 22:18:04 +0000 (GMT)
-Received: from nakamura.uits.iupui.edu (nakamura.uits.iupui.edu [134.68.220.122])
- by shmi.uhi.ac.uk (Postfix) with ESMTP id 905D53C2FD
- for ; Thu, 3 Jan 2008 22:17:52 +0000 (GMT)
-Received: from nakamura.uits.iupui.edu (localhost [127.0.0.1])
- by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11) with ESMTP id m03MGhrs005294
- for ; Thu, 3 Jan 2008 17:16:43 -0500
-Received: (from apache@localhost)
- by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11/Submit) id m03MGhDa005292
- for source@collab.sakaiproject.org; Thu, 3 Jan 2008 17:16:43 -0500
-Date: Thu, 3 Jan 2008 17:16:43 -0500
-X-Authentication-Warning: nakamura.uits.iupui.edu: apache set sender to louis@media.berkeley.edu using -f
-To: source@collab.sakaiproject.org
-From: louis@media.berkeley.edu
-Subject: [sakai] svn commit: r39746 - in bspace/site-manage/sakai_2-4-x/site-manage-tool/tool/src: bundle webapp/vm/sitesetup
-X-Content-Type-Outer-Envelope: text/plain; charset=UTF-8
-X-Content-Type-Message-Body: text/plain; charset=UTF-8
-Content-Type: text/plain; charset=UTF-8
-X-DSPAM-Result: Innocent
-X-DSPAM-Processed: Thu Jan 3 17:18:23 2008
-X-DSPAM-Confidence: 0.6959
-X-DSPAM-Probability: 0.0000
-
-Details: http://source.sakaiproject.org/viewsvn/?view=rev&rev=39746
-
-Author: louis@media.berkeley.edu
-Date: 2008-01-03 17:16:39 -0500 (Thu, 03 Jan 2008)
-New Revision: 39746
-
-Modified:
-bspace/site-manage/sakai_2-4-x/site-manage-tool/tool/src/bundle/sitesetupgeneric.properties
-bspace/site-manage/sakai_2-4-x/site-manage-tool/tool/src/webapp/vm/sitesetup/chef_site-siteInfo-duplicate.vm
-Log:
-BSP-1421 Add text to clarify "Duplicate Site" option in Site Info
-
-----------------------
-This automatic notification message was sent by Sakai Collab (https://collab.sakaiproject.org/portal) from the Source site.
-You can modify how you receive notifications at My Workspace > Preferences.
-
-
-
-From ray@media.berkeley.edu Thu Jan 3 17:07:00 2008
-Return-Path:
-Received: from murder (mail.umich.edu [141.211.14.39])
- by frankenstein.mail.umich.edu (Cyrus v2.3.8) with LMTPA;
- Thu, 03 Jan 2008 17:07:00 -0500
-X-Sieve: CMU Sieve 2.3
-Received: from murder ([unix socket])
- by mail.umich.edu (Cyrus v2.2.12) with LMTPA;
- Thu, 03 Jan 2008 17:07:00 -0500
-Received: from anniehall.mr.itd.umich.edu (anniehall.mr.itd.umich.edu [141.211.93.141])
- by faithful.mail.umich.edu () with ESMTP id m03M6xaq014868;
- Thu, 3 Jan 2008 17:06:59 -0500
-Received: FROM paploo.uhi.ac.uk (app1.prod.collab.uhi.ac.uk [194.35.219.184])
- BY anniehall.mr.itd.umich.edu ID 477D5C7A.4FE1F.22211 ;
- 3 Jan 2008 17:06:53 -0500
-Received: from paploo.uhi.ac.uk (localhost [127.0.0.1])
- by paploo.uhi.ac.uk (Postfix) with ESMTP id 0BC8D7225E;
- Thu, 3 Jan 2008 22:06:57 +0000 (GMT)
-Message-ID: <200801032205.m03M5Ea7005273@nakamura.uits.iupui.edu>
-Mime-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Received: from prod.collab.uhi.ac.uk ([194.35.219.182])
- by paploo.uhi.ac.uk (JAMES SMTP Server 2.1.3) with SMTP ID 554
- for ;
- Thu, 3 Jan 2008 22:06:34 +0000 (GMT)
-Received: from nakamura.uits.iupui.edu (nakamura.uits.iupui.edu [134.68.220.122])
- by shmi.uhi.ac.uk (Postfix) with ESMTP id 2AB513C2FD
- for ; Thu, 3 Jan 2008 22:06:23 +0000 (GMT)
-Received: from nakamura.uits.iupui.edu (localhost [127.0.0.1])
- by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11) with ESMTP id m03M5EQa005275
- for ; Thu, 3 Jan 2008 17:05:14 -0500
-Received: (from apache@localhost)
- by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11/Submit) id m03M5Ea7005273
- for source@collab.sakaiproject.org; Thu, 3 Jan 2008 17:05:14 -0500
-Date: Thu, 3 Jan 2008 17:05:14 -0500
-X-Authentication-Warning: nakamura.uits.iupui.edu: apache set sender to ray@media.berkeley.edu using -f
-To: source@collab.sakaiproject.org
-From: ray@media.berkeley.edu
-Subject: [sakai] svn commit: r39745 - providers/trunk/cm/cm-authz-provider/src/java/org/sakaiproject/coursemanagement/impl/provider
-X-Content-Type-Outer-Envelope: text/plain; charset=UTF-8
-X-Content-Type-Message-Body: text/plain; charset=UTF-8
-Content-Type: text/plain; charset=UTF-8
-X-DSPAM-Result: Innocent
-X-DSPAM-Processed: Thu Jan 3 17:07:00 2008
-X-DSPAM-Confidence: 0.7556
-X-DSPAM-Probability: 0.0000
-
-Details: http://source.sakaiproject.org/viewsvn/?view=rev&rev=39745
-
-Author: ray@media.berkeley.edu
-Date: 2008-01-03 17:05:11 -0500 (Thu, 03 Jan 2008)
-New Revision: 39745
-
-Modified:
-providers/trunk/cm/cm-authz-provider/src/java/org/sakaiproject/coursemanagement/impl/provider/CourseManagementGroupProvider.java
-Log:
-SAK-12602 Fix logic when a user has multiple roles in a section
-
-----------------------
-This automatic notification message was sent by Sakai Collab (https://collab.sakaiproject.org/portal) from the Source site.
-You can modify how you receive notifications at My Workspace > Preferences.
-
-
-
-From cwen@iupui.edu Thu Jan 3 16:34:40 2008
-Return-Path:
-Received: from murder (mail.umich.edu [141.211.14.34])
- by frankenstein.mail.umich.edu (Cyrus v2.3.8) with LMTPA;
- Thu, 03 Jan 2008 16:34:40 -0500
-X-Sieve: CMU Sieve 2.3
-Received: from murder ([unix socket])
- by mail.umich.edu (Cyrus v2.2.12) with LMTPA;
- Thu, 03 Jan 2008 16:34:40 -0500
-Received: from icestorm.mr.itd.umich.edu (icestorm.mr.itd.umich.edu [141.211.93.149])
- by chaos.mail.umich.edu () with ESMTP id m03LYdY1029538;
- Thu, 3 Jan 2008 16:34:39 -0500
-Received: FROM paploo.uhi.ac.uk (app1.prod.collab.uhi.ac.uk [194.35.219.184])
- BY icestorm.mr.itd.umich.edu ID 477D54EA.13F34.26602 ;
- 3 Jan 2008 16:34:36 -0500
-Received: from paploo.uhi.ac.uk (localhost [127.0.0.1])
- by paploo.uhi.ac.uk (Postfix) with ESMTP id CC710ADC79;
- Thu, 3 Jan 2008 21:34:29 +0000 (GMT)
-Message-ID: <200801032133.m03LX3gG005191@nakamura.uits.iupui.edu>
-Mime-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Received: from prod.collab.uhi.ac.uk ([194.35.219.182])
- by paploo.uhi.ac.uk (JAMES SMTP Server 2.1.3) with SMTP ID 611
- for ;
- Thu, 3 Jan 2008 21:34:08 +0000 (GMT)
-Received: from nakamura.uits.iupui.edu (nakamura.uits.iupui.edu [134.68.220.122])
- by shmi.uhi.ac.uk (Postfix) with ESMTP id 43C4242B55
- for ; Thu, 3 Jan 2008 21:34:12 +0000 (GMT)
-Received: from nakamura.uits.iupui.edu (localhost [127.0.0.1])
- by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11) with ESMTP id m03LX3Vb005193
- for ; Thu, 3 Jan 2008 16:33:03 -0500
-Received: (from apache@localhost)
- by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11/Submit) id m03LX3gG005191
- for source@collab.sakaiproject.org; Thu, 3 Jan 2008 16:33:03 -0500
-Date: Thu, 3 Jan 2008 16:33:03 -0500
-X-Authentication-Warning: nakamura.uits.iupui.edu: apache set sender to cwen@iupui.edu using -f
-To: source@collab.sakaiproject.org
-From: cwen@iupui.edu
-Subject: [sakai] svn commit: r39744 - oncourse/branches/oncourse_OPC_122007
-X-Content-Type-Outer-Envelope: text/plain; charset=UTF-8
-X-Content-Type-Message-Body: text/plain; charset=UTF-8
-Content-Type: text/plain; charset=UTF-8
-X-DSPAM-Result: Innocent
-X-DSPAM-Processed: Thu Jan 3 16:34:40 2008
-X-DSPAM-Confidence: 0.9846
-X-DSPAM-Probability: 0.0000
-
-Details: http://source.sakaiproject.org/viewsvn/?view=rev&rev=39744
-
-Author: cwen@iupui.edu
-Date: 2008-01-03 16:33:02 -0500 (Thu, 03 Jan 2008)
-New Revision: 39744
-
-Modified:
-oncourse/branches/oncourse_OPC_122007/
-oncourse/branches/oncourse_OPC_122007/.externals
-Log:
-update external for GB.
-
-----------------------
-This automatic notification message was sent by Sakai Collab (https://collab.sakaiproject.org/portal) from the Source site.
-You can modify how you receive notifications at My Workspace > Preferences.
-
-
-
-From cwen@iupui.edu Thu Jan 3 16:29:07 2008
-Return-Path:
-Received: from murder (mail.umich.edu [141.211.14.46])
- by frankenstein.mail.umich.edu (Cyrus v2.3.8) with LMTPA;
- Thu, 03 Jan 2008 16:29:07 -0500
-X-Sieve: CMU Sieve 2.3
-Received: from murder ([unix socket])
- by mail.umich.edu (Cyrus v2.2.12) with LMTPA;
- Thu, 03 Jan 2008 16:29:07 -0500
-Received: from galaxyquest.mr.itd.umich.edu (galaxyquest.mr.itd.umich.edu [141.211.93.145])
- by fan.mail.umich.edu () with ESMTP id m03LT6uw027749;
- Thu, 3 Jan 2008 16:29:06 -0500
-Received: FROM paploo.uhi.ac.uk (app1.prod.collab.uhi.ac.uk [194.35.219.184])
- BY galaxyquest.mr.itd.umich.edu ID 477D5397.E161D.20326 ;
- 3 Jan 2008 16:28:58 -0500
-Received: from paploo.uhi.ac.uk (localhost [127.0.0.1])
- by paploo.uhi.ac.uk (Postfix) with ESMTP id DEC65ADC79;
- Thu, 3 Jan 2008 21:28:52 +0000 (GMT)
-Message-ID: <200801032127.m03LRUqH005177@nakamura.uits.iupui.edu>
-Mime-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Received: from prod.collab.uhi.ac.uk ([194.35.219.182])
- by paploo.uhi.ac.uk (JAMES SMTP Server 2.1.3) with SMTP ID 917
- for ;
- Thu, 3 Jan 2008 21:28:39 +0000 (GMT)
-Received: from nakamura.uits.iupui.edu (nakamura.uits.iupui.edu [134.68.220.122])
- by shmi.uhi.ac.uk (Postfix) with ESMTP id 1FBB042B30
- for ; Thu, 3 Jan 2008 21:28:38 +0000 (GMT)
-Received: from nakamura.uits.iupui.edu (localhost [127.0.0.1])
- by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11) with ESMTP id m03LRUk4005179
- for ; Thu, 3 Jan 2008 16:27:30 -0500
-Received: (from apache@localhost)
- by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11/Submit) id m03LRUqH005177
- for source@collab.sakaiproject.org; Thu, 3 Jan 2008 16:27:30 -0500
-Date: Thu, 3 Jan 2008 16:27:30 -0500
-X-Authentication-Warning: nakamura.uits.iupui.edu: apache set sender to cwen@iupui.edu using -f
-To: source@collab.sakaiproject.org
-From: cwen@iupui.edu
-Subject: [sakai] svn commit: r39743 - gradebook/branches/oncourse_2-4-2/app/ui/src/java/org/sakaiproject/tool/gradebook/ui
-X-Content-Type-Outer-Envelope: text/plain; charset=UTF-8
-X-Content-Type-Message-Body: text/plain; charset=UTF-8
-Content-Type: text/plain; charset=UTF-8
-X-DSPAM-Result: Innocent
-X-DSPAM-Processed: Thu Jan 3 16:29:07 2008
-X-DSPAM-Confidence: 0.8509
-X-DSPAM-Probability: 0.0000
-
-Details: http://source.sakaiproject.org/viewsvn/?view=rev&rev=39743
-
-Author: cwen@iupui.edu
-Date: 2008-01-03 16:27:29 -0500 (Thu, 03 Jan 2008)
-New Revision: 39743
-
-Modified:
-gradebook/branches/oncourse_2-4-2/app/ui/src/java/org/sakaiproject/tool/gradebook/ui/RosterBean.java
-Log:
-svn merge -c 39403 https://source.sakaiproject.org/svn/gradebook/trunk
-U app/ui/src/java/org/sakaiproject/tool/gradebook/ui/RosterBean.java
-
-svn log -r 39403 https://source.sakaiproject.org/svn/gradebook/trunk
-------------------------------------------------------------------------
-r39403 | wagnermr@iupui.edu | 2007-12-17 17:11:08 -0500 (Mon, 17 Dec 2007) | 3 lines
-
-SAK-12504
-http://jira.sakaiproject.org/jira/browse/SAK-12504
-Viewing "All Grades" page as a TA with grader permissions causes stack trace
-------------------------------------------------------------------------
-
-
-----------------------
-This automatic notification message was sent by Sakai Collab (https://collab.sakaiproject.org/portal) from the Source site.
-You can modify how you receive notifications at My Workspace > Preferences.
-
-
-
-From cwen@iupui.edu Thu Jan 3 16:23:48 2008
-Return-Path:
-Received: from murder (mail.umich.edu [141.211.14.91])
- by frankenstein.mail.umich.edu (Cyrus v2.3.8) with LMTPA;
- Thu, 03 Jan 2008 16:23:48 -0500
-X-Sieve: CMU Sieve 2.3
-Received: from murder ([unix socket])
- by mail.umich.edu (Cyrus v2.2.12) with LMTPA;
- Thu, 03 Jan 2008 16:23:48 -0500
-Received: from salemslot.mr.itd.umich.edu (salemslot.mr.itd.umich.edu [141.211.14.58])
- by jacknife.mail.umich.edu () with ESMTP id m03LNlf0002115;
- Thu, 3 Jan 2008 16:23:47 -0500
-Received: FROM paploo.uhi.ac.uk (app1.prod.collab.uhi.ac.uk [194.35.219.184])
- BY salemslot.mr.itd.umich.edu ID 477D525E.1448.30389 ;
- 3 Jan 2008 16:23:44 -0500
-Received: from paploo.uhi.ac.uk (localhost [127.0.0.1])
- by paploo.uhi.ac.uk (Postfix) with ESMTP id 9D005B9D06;
- Thu, 3 Jan 2008 21:23:38 +0000 (GMT)
-Message-ID: <200801032122.m03LMFo4005148@nakamura.uits.iupui.edu>
-Mime-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Received: from prod.collab.uhi.ac.uk ([194.35.219.182])
- by paploo.uhi.ac.uk (JAMES SMTP Server 2.1.3) with SMTP ID 6
- for ;
- Thu, 3 Jan 2008 21:23:24 +0000 (GMT)
-Received: from nakamura.uits.iupui.edu (nakamura.uits.iupui.edu [134.68.220.122])
- by shmi.uhi.ac.uk (Postfix) with ESMTP id 3535542B69
- for ; Thu, 3 Jan 2008 21:23:24 +0000 (GMT)
-Received: from nakamura.uits.iupui.edu (localhost [127.0.0.1])
- by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11) with ESMTP id m03LMFtT005150
- for ; Thu, 3 Jan 2008 16:22:15 -0500
-Received: (from apache@localhost)
- by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11/Submit) id m03LMFo4005148
- for source@collab.sakaiproject.org; Thu, 3 Jan 2008 16:22:15 -0500
-Date: Thu, 3 Jan 2008 16:22:15 -0500
-X-Authentication-Warning: nakamura.uits.iupui.edu: apache set sender to cwen@iupui.edu using -f
-To: source@collab.sakaiproject.org
-From: cwen@iupui.edu
-Subject: [sakai] svn commit: r39742 - gradebook/branches/oncourse_2-4-2/app/ui/src/java/org/sakaiproject/tool/gradebook/ui
-X-Content-Type-Outer-Envelope: text/plain; charset=UTF-8
-X-Content-Type-Message-Body: text/plain; charset=UTF-8
-Content-Type: text/plain; charset=UTF-8
-X-DSPAM-Result: Innocent
-X-DSPAM-Processed: Thu Jan 3 16:23:48 2008
-X-DSPAM-Confidence: 0.9907
-X-DSPAM-Probability: 0.0000
-
-Details: http://source.sakaiproject.org/viewsvn/?view=rev&rev=39742
-
-Author: cwen@iupui.edu
-Date: 2008-01-03 16:22:14 -0500 (Thu, 03 Jan 2008)
-New Revision: 39742
-
-Modified:
-gradebook/branches/oncourse_2-4-2/app/ui/src/java/org/sakaiproject/tool/gradebook/ui/RosterBean.java
-Log:
-svn merge -c 35014 https://source.sakaiproject.org/svn/gradebook/trunk
-U app/ui/src/java/org/sakaiproject/tool/gradebook/ui/RosterBean.java
-
-svn log -r 35014 https://source.sakaiproject.org/svn/gradebook/trunk
-------------------------------------------------------------------------
-r35014 | wagnermr@iupui.edu | 2007-09-12 16:17:59 -0400 (Wed, 12 Sep 2007) | 3 lines
-
-SAK-11458
-http://bugs.sakaiproject.org/jira/browse/SAK-11458
-Course grade does not appear on "All Grades" page if no categories in gb
-------------------------------------------------------------------------
-
-
-----------------------
-This automatic notification message was sent by Sakai Collab (https://collab.sakaiproject.org/portal) from the Source site.
-You can modify how you receive notifications at My Workspace > Preferences.
-
diff --git a/ficheros/test.txt b/ficheros/test.txt
deleted file mode 100644
index af070b5..0000000
--- a/ficheros/test.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Esto está en mayúsculas
-y esto también
\ No newline at end of file
diff --git a/ficheros/words.txt b/ficheros/words.txt
deleted file mode 100644
index a2f4fe0..0000000
--- a/ficheros/words.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-Writing programs or programming is a very creative
-and rewarding activity You can write programs for
-many reasons ranging from making your living to solving
-a difficult data analysis problem to having fun to helping
-someone else solve a problem This book assumes that
-{\em everyone} needs to know how to program and that once
-you know how to program, you will figure out what you want
-to do with your newfound skills
-
-We are surrounded in our daily lives with computers ranging
-from laptops to cell phones We can think of these computers
-as our personal assistants who can take care of many things
-on our behalf The hardware in our current-day computers
-is essentially built to continuously ask us the question
-What would you like me to do next
-
-Our computers are fast and have vasts amounts of memory and
-could be very helpful to us if we only knew the language to
-speak to explain to the computer what we would like it to
-do next If we knew this language we could tell the
-computer to do tasks on our behalf that were reptitive
-Interestingly, the kinds of things computers can do best
-are often the kinds of things that we humans find boring
-and mind-numbing
diff --git a/ficheros/de_csv_a_md/site/fonts/fontawesome-webfont.eot b/fonts/fontawesome-webfont.eot
similarity index 100%
rename from ficheros/de_csv_a_md/site/fonts/fontawesome-webfont.eot
rename to fonts/fontawesome-webfont.eot
diff --git a/ficheros/de_csv_a_md/site/fonts/fontawesome-webfont.svg b/fonts/fontawesome-webfont.svg
similarity index 100%
rename from ficheros/de_csv_a_md/site/fonts/fontawesome-webfont.svg
rename to fonts/fontawesome-webfont.svg
diff --git a/ficheros/de_csv_a_md/site/fonts/fontawesome-webfont.ttf b/fonts/fontawesome-webfont.ttf
similarity index 100%
rename from ficheros/de_csv_a_md/site/fonts/fontawesome-webfont.ttf
rename to fonts/fontawesome-webfont.ttf
diff --git a/ficheros/de_csv_a_md/site/fonts/fontawesome-webfont.woff b/fonts/fontawesome-webfont.woff
similarity index 100%
rename from ficheros/de_csv_a_md/site/fonts/fontawesome-webfont.woff
rename to fonts/fontawesome-webfont.woff
diff --git a/ficheros/de_csv_a_md/site/fonts/fontawesome-webfont.woff2 b/fonts/fontawesome-webfont.woff2
similarity index 100%
rename from ficheros/de_csv_a_md/site/fonts/fontawesome-webfont.woff2
rename to fonts/fontawesome-webfont.woff2
diff --git a/ficheros/de_csv_a_md/site/fonts/glyphicons-halflings-regular.eot b/fonts/glyphicons-halflings-regular.eot
similarity index 100%
rename from ficheros/de_csv_a_md/site/fonts/glyphicons-halflings-regular.eot
rename to fonts/glyphicons-halflings-regular.eot
diff --git a/ficheros/de_csv_a_md/site/fonts/glyphicons-halflings-regular.svg b/fonts/glyphicons-halflings-regular.svg
similarity index 100%
rename from ficheros/de_csv_a_md/site/fonts/glyphicons-halflings-regular.svg
rename to fonts/glyphicons-halflings-regular.svg
diff --git a/ficheros/de_csv_a_md/site/fonts/glyphicons-halflings-regular.ttf b/fonts/glyphicons-halflings-regular.ttf
similarity index 100%
rename from ficheros/de_csv_a_md/site/fonts/glyphicons-halflings-regular.ttf
rename to fonts/glyphicons-halflings-regular.ttf
diff --git a/ficheros/de_csv_a_md/site/fonts/glyphicons-halflings-regular.woff b/fonts/glyphicons-halflings-regular.woff
similarity index 100%
rename from ficheros/de_csv_a_md/site/fonts/glyphicons-halflings-regular.woff
rename to fonts/glyphicons-halflings-regular.woff
diff --git a/ficheros/de_csv_a_md/site/fonts/glyphicons-halflings-regular.woff2 b/fonts/glyphicons-halflings-regular.woff2
similarity index 100%
rename from ficheros/de_csv_a_md/site/fonts/glyphicons-halflings-regular.woff2
rename to fonts/glyphicons-halflings-regular.woff2
diff --git a/ficheros/de_csv_a_md/site/hoja01/index.html b/hoja01/index.html
similarity index 100%
rename from ficheros/de_csv_a_md/site/hoja01/index.html
rename to hoja01/index.html
diff --git a/ficheros/de_csv_a_md/site/img/favicon.ico b/img/favicon.ico
similarity index 100%
rename from ficheros/de_csv_a_md/site/img/favicon.ico
rename to img/favicon.ico
diff --git a/ficheros/de_csv_a_md/site/index.html b/index.html
similarity index 100%
rename from ficheros/de_csv_a_md/site/index.html
rename to index.html
diff --git a/ficheros/de_csv_a_md/site/js/base.js b/js/base.js
similarity index 100%
rename from ficheros/de_csv_a_md/site/js/base.js
rename to js/base.js
diff --git a/ficheros/de_csv_a_md/site/js/bootstrap-3.3.7.js b/js/bootstrap-3.3.7.js
similarity index 100%
rename from ficheros/de_csv_a_md/site/js/bootstrap-3.3.7.js
rename to js/bootstrap-3.3.7.js
diff --git a/ficheros/de_csv_a_md/site/js/bootstrap-3.3.7.min.js b/js/bootstrap-3.3.7.min.js
similarity index 100%
rename from ficheros/de_csv_a_md/site/js/bootstrap-3.3.7.min.js
rename to js/bootstrap-3.3.7.min.js
diff --git a/ficheros/de_csv_a_md/site/js/elasticlunr.js b/js/elasticlunr.js
similarity index 100%
rename from ficheros/de_csv_a_md/site/js/elasticlunr.js
rename to js/elasticlunr.js
diff --git a/ficheros/de_csv_a_md/site/js/elasticlunr.min.js b/js/elasticlunr.min.js
similarity index 100%
rename from ficheros/de_csv_a_md/site/js/elasticlunr.min.js
rename to js/elasticlunr.min.js
diff --git a/ficheros/de_csv_a_md/site/js/highlight.pack.js b/js/highlight.pack.js
similarity index 100%
rename from ficheros/de_csv_a_md/site/js/highlight.pack.js
rename to js/highlight.pack.js
diff --git a/ficheros/de_csv_a_md/site/js/jquery-3.2.1.js b/js/jquery-3.2.1.js
similarity index 100%
rename from ficheros/de_csv_a_md/site/js/jquery-3.2.1.js
rename to js/jquery-3.2.1.js
diff --git a/ficheros/de_csv_a_md/site/js/jquery-3.2.1.min.js b/js/jquery-3.2.1.min.js
similarity index 100%
rename from ficheros/de_csv_a_md/site/js/jquery-3.2.1.min.js
rename to js/jquery-3.2.1.min.js
diff --git a/listas/01.py b/listas/01.py
deleted file mode 100644
index 970c06e..0000000
--- a/listas/01.py
+++ /dev/null
@@ -1,31 +0,0 @@
-"""
-Ejercicio 01
-
-Descargar una copia del archivo "romeo.txt" desde
-http://www.pythonlearn.com/code3/romeo.txt. Escribir un programa para abrir el
-fichero y leerlo línea a línea. Por cada línea separar las palabras en una
-lista de palabras usando la función split. Las palabras no deben estar
-repetidas en la lista. Cuando la lista esté completa, visualizar el resultado
-en orden alfabético.
-"""
-
-
-try:
- fhandle = open("romeo.txt")
-except IOError:
- print("El fichero no existe.")
- exit()
-
-words_list = list()
-
-
-for line in fhandle:
- for word in line.split():
- if word not in words_list:
- words_list.append(word)
-words_list.sort()
-
-for word in words_list:
- print(word, sep=' ', end=' ')
-
-print()
diff --git a/listas/02.py b/listas/02.py
deleted file mode 100644
index db25e85..0000000
--- a/listas/02.py
+++ /dev/null
@@ -1,39 +0,0 @@
-"""
-Ejercicio 02
-
-Escribe un programa que lea del fichero de buzón de correo
-mbox-short.txt (http://www.pythonlearn.com/code/mbox-short.txt) y cada vez que
-se encuentre una línea que empiece por "From" separarla en palabras. Interesa
-quién envió el mensaje (segunda palabra de la línea "From") sin la parte del
-dominio. Es decir, de:
-
-From stephen.marquard@uct.ac.za Sat Jan 5 09:14:16 2008
-
-mostraremos solo "stephen.marquard".
-
-El programa debe mostrar la lista de los usuarios ordenada alfabéticamente,
-sin repetir ninguno y finalizar visualizando el total de líneas encontradas.
-"""
-
-try:
- fhandle = open("mbox-short.txt")
-except IOError:
- print("El fichero no existe.")
- exit()
-
-users = list()
-
-cont = 0
-for line in fhandle:
- if line.startswith("From "):
- cont += 1
- candidate = line.split()[1].split('@')[0]
- if candidate not in users:
- users.append(candidate)
-users.sort()
-
-
-for user in users:
- print(user)
-print('Número de líneas encontradas:', cont)
-print('Número de usuarios encontrados:', len(users))
diff --git a/listas/03.py b/listas/03.py
deleted file mode 100644
index 468314f..0000000
--- a/listas/03.py
+++ /dev/null
@@ -1,27 +0,0 @@
-"""
-Ejercicio 6
-
-Reescribir el programa que solicita al usuario una lista de número y muestra
-el valor máximo y mínimo de entre ellos y acaba con la palabra "done". Hacerlo
-ahora almacenando los números en una lista y hacer uso de la funciones max() y
-min().
-"""
-
-numbers_list = list()
-done = False
-while not done:
- reading = True
- while reading:
- string = input('Introduzca un número ("fin" para terminar):')
- if string == "fin":
- done = True
- break
- try:
- number = float(string)
- reading = False
- except IOError:
- print("Entrada incorrecta, pruebe de nuevo.")
- continue
- numbers_list.append(number)
-print("El valor máximo es %.2f y el mínimo %.2f" % (max(numbers_list),
- min(numbers_list)))
diff --git a/listas/Ejercicios de Listas (Soluciones).ipynb b/listas/Ejercicios de Listas (Soluciones).ipynb
deleted file mode 100644
index ec56636..0000000
--- a/listas/Ejercicios de Listas (Soluciones).ipynb
+++ /dev/null
@@ -1,138 +0,0 @@
-{
- "cells": [
- {
- "cell_type": "markdown",
- "metadata": {},
- "source": [
- "Ejercicio 4.- Descargar una copia del archivo \"romeo.txt\" desde http://www.pythonlearn.com/code3/romeo.txt. Escribir un programa para abrir el fichero y leerlo línea a línea. Por cada línea separar las palabras en una lista de palabras usando la función split. Las palabras no deben estar repetidas en la lista. Cuando la lista esté completa, visualizar el resultado en orden alfabético."
- ]
- },
- {
- "cell_type": "code",
- "execution_count": null,
- "metadata": {
- "collapsed": false
- },
- "outputs": [],
- "source": [
- "# pylint: disable = I0011, C0103\n",
- "\n",
- "\"\"\"DocString\n",
- "\"\"\"\n",
- "\n",
- "fhandle = open(\"romeo.txt\")\n",
- "words_list = []\n",
- "for line in fhandle:\n",
- " words_line = line.split()\n",
- " for word in words_line:\n",
- " if word not in words_list:\n",
- " words_list.append(word)\n",
- "words_list.sort()\n",
- "for word in words_list:\n",
- " print(word, end=\" \")\n"
- ]
- },
- {
- "cell_type": "markdown",
- "metadata": {},
- "source": [
- "Ejercicio 5.- Escribe un programa que lea del fichero de buzón de correo mbox-short.txt (http://www.pythonlearn.com/code/mbox-short.txt) y cada vez que se encuentre una línea que empiece por \"From\" separarla en palabras. Interesa quién envió el mensaje (segunda palabra de la línea \"From\") sin la parte del dominio. Es decir, de:\n",
- "\n",
- "From stephen.marquard@uct.ac.za Sat Jan 5 09:14:16 2008\n",
- "\n",
- "mostraremos solo \"stephen.marquard\".\n",
- "\n",
- "El programa debe mostrar la lista de los usuarios ordenada alfabéticamente, sin repetir ninguno y finalizar visualizando el total de líneas encontradas."
- ]
- },
- {
- "cell_type": "code",
- "execution_count": null,
- "metadata": {
- "collapsed": true
- },
- "outputs": [],
- "source": [
- "#pylint: disable = i0011, c0103\n",
- "\n",
- "\"\"\"DocString\n",
- "\"\"\"\n",
- "\n",
- "fhandle = open(\"mbox-short.txt\")\n",
- "users = []\n",
- "lines = 0\n",
- "for line in fhandle:\n",
- " if line.startswith(\"From\"):\n",
- " user = line.split()[1].split(\"@\")[0]\n",
- " lines += 1\n",
- " if user not in users:\n",
- " users.append(user)\n",
- "users.sort()\n",
- "for user in users:\n",
- " print(user, end=\" \")\n",
- "print(\"\\nTotal de líneas From encontradas :\", lines)\n"
- ]
- },
- {
- "cell_type": "markdown",
- "metadata": {},
- "source": [
- "Ejercicio 6.- Reescribir el programa que solicita al usuario una lista de número y muestra el valor máximo y mínimo de entre ellos y acaba con la palabra \"done\". Hacerlo ahora almacenando los números en una lista y hacer uso de la funciones max() y min()."
- ]
- },
- {
- "cell_type": "code",
- "execution_count": null,
- "metadata": {
- "collapsed": false
- },
- "outputs": [],
- "source": [
- "#pylint: disable = i0011, c0103\n",
- "\n",
- "\"\"\"DocString\n",
- "\"\"\"\n",
- "\n",
- "numbers_list = list()\n",
- "done = False\n",
- "while not done:\n",
- " reading = True\n",
- " while reading:\n",
- " string = input('Introduzca un número (\"fin\" para terminar):')\n",
- " if string == \"fin\":\n",
- " done = True\n",
- " break\n",
- " try:\n",
- " number = float(string)\n",
- " reading = False\n",
- " except IOError:\n",
- " print(\"Entrada incorrecta, pruebe de nuevo.\")\n",
- " continue\n",
- " numbers_list.append(number)\n",
- "print(\"El valor máximo es %.2f y el mínimo %.2f\" % (max(numbers_list), min(numbers_list)))\n"
- ]
- }
- ],
- "metadata": {
- "anaconda-cloud": {},
- "kernelspec": {
- "display_name": "Python [conda root]",
- "language": "python",
- "name": "conda-root-py"
- },
- "language_info": {
- "codemirror_mode": {
- "name": "ipython",
- "version": 3
- },
- "file_extension": ".py",
- "mimetype": "text/x-python",
- "name": "python",
- "nbconvert_exporter": "python",
- "pygments_lexer": "ipython3",
- "version": "3.5.2"
- }
- },
- "nbformat": 4,
- "nbformat_minor": 1
-}
diff --git a/listas/mbox-short.txt b/listas/mbox-short.txt
deleted file mode 100644
index 684d15e..0000000
--- a/listas/mbox-short.txt
+++ /dev/null
@@ -1,1910 +0,0 @@
-From stephen.marquard@uct.ac.za Sat Jan 5 09:14:16 2008
-Return-Path:
-Received: from murder (mail.umich.edu [141.211.14.90])
- by frankenstein.mail.umich.edu (Cyrus v2.3.8) with LMTPA;
- Sat, 05 Jan 2008 09:14:16 -0500
-X-Sieve: CMU Sieve 2.3
-Received: from murder ([unix socket])
- by mail.umich.edu (Cyrus v2.2.12) with LMTPA;
- Sat, 05 Jan 2008 09:14:16 -0500
-Received: from holes.mr.itd.umich.edu (holes.mr.itd.umich.edu [141.211.14.79])
- by flawless.mail.umich.edu () with ESMTP id m05EEFR1013674;
- Sat, 5 Jan 2008 09:14:15 -0500
-Received: FROM paploo.uhi.ac.uk (app1.prod.collab.uhi.ac.uk [194.35.219.184])
- BY holes.mr.itd.umich.edu ID 477F90B0.2DB2F.12494 ;
- 5 Jan 2008 09:14:10 -0500
-Received: from paploo.uhi.ac.uk (localhost [127.0.0.1])
- by paploo.uhi.ac.uk (Postfix) with ESMTP id 5F919BC2F2;
- Sat, 5 Jan 2008 14:10:05 +0000 (GMT)
-Message-ID: <200801051412.m05ECIaH010327@nakamura.uits.iupui.edu>
-Mime-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Received: from prod.collab.uhi.ac.uk ([194.35.219.182])
- by paploo.uhi.ac.uk (JAMES SMTP Server 2.1.3) with SMTP ID 899
- for ;
- Sat, 5 Jan 2008 14:09:50 +0000 (GMT)
-Received: from nakamura.uits.iupui.edu (nakamura.uits.iupui.edu [134.68.220.122])
- by shmi.uhi.ac.uk (Postfix) with ESMTP id A215243002
- for ; Sat, 5 Jan 2008 14:13:33 +0000 (GMT)
-Received: from nakamura.uits.iupui.edu (localhost [127.0.0.1])
- by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11) with ESMTP id m05ECJVp010329
- for ; Sat, 5 Jan 2008 09:12:19 -0500
-Received: (from apache@localhost)
- by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11/Submit) id m05ECIaH010327
- for source@collab.sakaiproject.org; Sat, 5 Jan 2008 09:12:18 -0500
-Date: Sat, 5 Jan 2008 09:12:18 -0500
-X-Authentication-Warning: nakamura.uits.iupui.edu: apache set sender to stephen.marquard@uct.ac.za using -f
-To: source@collab.sakaiproject.org
-From: stephen.marquard@uct.ac.za
-Subject: [sakai] svn commit: r39772 - content/branches/sakai_2-5-x/content-impl/impl/src/java/org/sakaiproject/content/impl
-X-Content-Type-Outer-Envelope: text/plain; charset=UTF-8
-X-Content-Type-Message-Body: text/plain; charset=UTF-8
-Content-Type: text/plain; charset=UTF-8
-X-DSPAM-Result: Innocent
-X-DSPAM-Processed: Sat Jan 5 09:14:16 2008
-X-DSPAM-Confidence: 0.8475
-X-DSPAM-Probability: 0.0000
-
-Details: http://source.sakaiproject.org/viewsvn/?view=rev&rev=39772
-
-Author: stephen.marquard@uct.ac.za
-Date: 2008-01-05 09:12:07 -0500 (Sat, 05 Jan 2008)
-New Revision: 39772
-
-Modified:
-content/branches/sakai_2-5-x/content-impl/impl/src/java/org/sakaiproject/content/impl/ContentServiceSqlOracle.java
-content/branches/sakai_2-5-x/content-impl/impl/src/java/org/sakaiproject/content/impl/DbContentService.java
-Log:
-SAK-12501 merge to 2-5-x: r39622, r39624:5, r39632:3 (resolve conflict from differing linebreaks for r39622)
-
-----------------------
-This automatic notification message was sent by Sakai Collab (https://collab.sakaiproject.org/portal) from the Source site.
-You can modify how you receive notifications at My Workspace > Preferences.
-
-
-
-From louis@media.berkeley.edu Fri Jan 4 18:10:48 2008
-Return-Path:
-Received: from murder (mail.umich.edu [141.211.14.97])
- by frankenstein.mail.umich.edu (Cyrus v2.3.8) with LMTPA;
- Fri, 04 Jan 2008 18:10:48 -0500
-X-Sieve: CMU Sieve 2.3
-Received: from murder ([unix socket])
- by mail.umich.edu (Cyrus v2.2.12) with LMTPA;
- Fri, 04 Jan 2008 18:10:48 -0500
-Received: from icestorm.mr.itd.umich.edu (icestorm.mr.itd.umich.edu [141.211.93.149])
- by sleepers.mail.umich.edu () with ESMTP id m04NAbGa029441;
- Fri, 4 Jan 2008 18:10:37 -0500
-Received: FROM paploo.uhi.ac.uk (app1.prod.collab.uhi.ac.uk [194.35.219.184])
- BY icestorm.mr.itd.umich.edu ID 477EBCE3.161BB.4320 ;
- 4 Jan 2008 18:10:31 -0500
-Received: from paploo.uhi.ac.uk (localhost [127.0.0.1])
- by paploo.uhi.ac.uk (Postfix) with ESMTP id 07969BB706;
- Fri, 4 Jan 2008 23:10:33 +0000 (GMT)
-Message-ID: <200801042308.m04N8v6O008125@nakamura.uits.iupui.edu>
-Mime-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Received: from prod.collab.uhi.ac.uk ([194.35.219.182])
- by paploo.uhi.ac.uk (JAMES SMTP Server 2.1.3) with SMTP ID 710
- for ;
- Fri, 4 Jan 2008 23:10:10 +0000 (GMT)
-Received: from nakamura.uits.iupui.edu (nakamura.uits.iupui.edu [134.68.220.122])
- by shmi.uhi.ac.uk (Postfix) with ESMTP id 4BA2F42F57
- for ; Fri, 4 Jan 2008 23:10:10 +0000 (GMT)
-Received: from nakamura.uits.iupui.edu (localhost [127.0.0.1])
- by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11) with ESMTP id m04N8vHG008127
- for ; Fri, 4 Jan 2008 18:08:57 -0500
-Received: (from apache@localhost)
- by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11/Submit) id m04N8v6O008125
- for source@collab.sakaiproject.org; Fri, 4 Jan 2008 18:08:57 -0500
-Date: Fri, 4 Jan 2008 18:08:57 -0500
-X-Authentication-Warning: nakamura.uits.iupui.edu: apache set sender to louis@media.berkeley.edu using -f
-To: source@collab.sakaiproject.org
-From: louis@media.berkeley.edu
-Subject: [sakai] svn commit: r39771 - in bspace/site-manage/sakai_2-4-x/site-manage-tool/tool/src: bundle java/org/sakaiproject/site/tool
-X-Content-Type-Outer-Envelope: text/plain; charset=UTF-8
-X-Content-Type-Message-Body: text/plain; charset=UTF-8
-Content-Type: text/plain; charset=UTF-8
-X-DSPAM-Result: Innocent
-X-DSPAM-Processed: Fri Jan 4 18:10:48 2008
-X-DSPAM-Confidence: 0.6178
-X-DSPAM-Probability: 0.0000
-
-Details: http://source.sakaiproject.org/viewsvn/?view=rev&rev=39771
-
-Author: louis@media.berkeley.edu
-Date: 2008-01-04 18:08:50 -0500 (Fri, 04 Jan 2008)
-New Revision: 39771
-
-Modified:
-bspace/site-manage/sakai_2-4-x/site-manage-tool/tool/src/bundle/sitesetupgeneric.properties
-bspace/site-manage/sakai_2-4-x/site-manage-tool/tool/src/java/org/sakaiproject/site/tool/SiteAction.java
-Log:
-BSP-1415 New (Guest) user Notification
-
-----------------------
-This automatic notification message was sent by Sakai Collab (https://collab.sakaiproject.org/portal) from the Source site.
-You can modify how you receive notifications at My Workspace > Preferences.
-
-
-
-From zqian@umich.edu Fri Jan 4 16:10:39 2008
-Return-Path:
-Received: from murder (mail.umich.edu [141.211.14.25])
- by frankenstein.mail.umich.edu (Cyrus v2.3.8) with LMTPA;
- Fri, 04 Jan 2008 16:10:39 -0500
-X-Sieve: CMU Sieve 2.3
-Received: from murder ([unix socket])
- by mail.umich.edu (Cyrus v2.2.12) with LMTPA;
- Fri, 04 Jan 2008 16:10:39 -0500
-Received: from ghostbusters.mr.itd.umich.edu (ghostbusters.mr.itd.umich.edu [141.211.93.144])
- by panther.mail.umich.edu () with ESMTP id m04LAcZw014275;
- Fri, 4 Jan 2008 16:10:38 -0500
-Received: FROM paploo.uhi.ac.uk (app1.prod.collab.uhi.ac.uk [194.35.219.184])
- BY ghostbusters.mr.itd.umich.edu ID 477EA0C6.A0214.25480 ;
- 4 Jan 2008 16:10:33 -0500
-Received: from paploo.uhi.ac.uk (localhost [127.0.0.1])
- by paploo.uhi.ac.uk (Postfix) with ESMTP id C48CDBB490;
- Fri, 4 Jan 2008 21:10:31 +0000 (GMT)
-Message-ID: <200801042109.m04L92hb007923@nakamura.uits.iupui.edu>
-Mime-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Received: from prod.collab.uhi.ac.uk ([194.35.219.182])
- by paploo.uhi.ac.uk (JAMES SMTP Server 2.1.3) with SMTP ID 906
- for ;
- Fri, 4 Jan 2008 21:10:18 +0000 (GMT)
-Received: from nakamura.uits.iupui.edu (nakamura.uits.iupui.edu [134.68.220.122])
- by shmi.uhi.ac.uk (Postfix) with ESMTP id 7D13042F71
- for ; Fri, 4 Jan 2008 21:10:14 +0000 (GMT)
-Received: from nakamura.uits.iupui.edu (localhost [127.0.0.1])
- by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11) with ESMTP id m04L927E007925
- for ; Fri, 4 Jan 2008 16:09:02 -0500
-Received: (from apache@localhost)
- by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11/Submit) id m04L92hb007923
- for source@collab.sakaiproject.org; Fri, 4 Jan 2008 16:09:02 -0500
-Date: Fri, 4 Jan 2008 16:09:02 -0500
-X-Authentication-Warning: nakamura.uits.iupui.edu: apache set sender to zqian@umich.edu using -f
-To: source@collab.sakaiproject.org
-From: zqian@umich.edu
-Subject: [sakai] svn commit: r39770 - site-manage/branches/sakai_2-5-x/site-manage-tool/tool/src/webapp/vm/sitesetup
-X-Content-Type-Outer-Envelope: text/plain; charset=UTF-8
-X-Content-Type-Message-Body: text/plain; charset=UTF-8
-Content-Type: text/plain; charset=UTF-8
-X-DSPAM-Result: Innocent
-X-DSPAM-Processed: Fri Jan 4 16:10:39 2008
-X-DSPAM-Confidence: 0.6961
-X-DSPAM-Probability: 0.0000
-
-Details: http://source.sakaiproject.org/viewsvn/?view=rev&rev=39770
-
-Author: zqian@umich.edu
-Date: 2008-01-04 16:09:01 -0500 (Fri, 04 Jan 2008)
-New Revision: 39770
-
-Modified:
-site-manage/branches/sakai_2-5-x/site-manage-tool/tool/src/webapp/vm/sitesetup/chef_site-siteInfo-list.vm
-Log:
-merge fix to SAK-9996 into 2-5-x branch: svn merge -r 39687:39688 https://source.sakaiproject.org/svn/site-manage/trunk/
-
-----------------------
-This automatic notification message was sent by Sakai Collab (https://collab.sakaiproject.org/portal) from the Source site.
-You can modify how you receive notifications at My Workspace > Preferences.
-
-
-
-From rjlowe@iupui.edu Fri Jan 4 15:46:24 2008
-Return-Path:
-Received: from murder (mail.umich.edu [141.211.14.25])
- by frankenstein.mail.umich.edu (Cyrus v2.3.8) with LMTPA;
- Fri, 04 Jan 2008 15:46:24 -0500
-X-Sieve: CMU Sieve 2.3
-Received: from murder ([unix socket])
- by mail.umich.edu (Cyrus v2.2.12) with LMTPA;
- Fri, 04 Jan 2008 15:46:24 -0500
-Received: from dreamcatcher.mr.itd.umich.edu (dreamcatcher.mr.itd.umich.edu [141.211.14.43])
- by panther.mail.umich.edu () with ESMTP id m04KkNbx032077;
- Fri, 4 Jan 2008 15:46:23 -0500
-Received: FROM paploo.uhi.ac.uk (app1.prod.collab.uhi.ac.uk [194.35.219.184])
- BY dreamcatcher.mr.itd.umich.edu ID 477E9B13.2F3BC.22965 ;
- 4 Jan 2008 15:46:13 -0500
-Received: from paploo.uhi.ac.uk (localhost [127.0.0.1])
- by paploo.uhi.ac.uk (Postfix) with ESMTP id 4AE03BB552;
- Fri, 4 Jan 2008 20:46:13 +0000 (GMT)
-Message-ID: <200801042044.m04Kiem3007881@nakamura.uits.iupui.edu>
-Mime-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Received: from prod.collab.uhi.ac.uk ([194.35.219.182])
- by paploo.uhi.ac.uk (JAMES SMTP Server 2.1.3) with SMTP ID 38
- for ;
- Fri, 4 Jan 2008 20:45:56 +0000 (GMT)
-Received: from nakamura.uits.iupui.edu (nakamura.uits.iupui.edu [134.68.220.122])
- by shmi.uhi.ac.uk (Postfix) with ESMTP id A55D242F57
- for ; Fri, 4 Jan 2008 20:45:52 +0000 (GMT)
-Received: from nakamura.uits.iupui.edu (localhost [127.0.0.1])
- by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11) with ESMTP id m04KieqE007883
- for ; Fri, 4 Jan 2008 15:44:40 -0500
-Received: (from apache@localhost)
- by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11/Submit) id m04Kiem3007881
- for source@collab.sakaiproject.org; Fri, 4 Jan 2008 15:44:40 -0500
-Date: Fri, 4 Jan 2008 15:44:40 -0500
-X-Authentication-Warning: nakamura.uits.iupui.edu: apache set sender to rjlowe@iupui.edu using -f
-To: source@collab.sakaiproject.org
-From: rjlowe@iupui.edu
-Subject: [sakai] svn commit: r39769 - in gradebook/trunk/app/ui/src: java/org/sakaiproject/tool/gradebook/ui/helpers/beans java/org/sakaiproject/tool/gradebook/ui/helpers/producers webapp/WEB-INF webapp/WEB-INF/bundle
-X-Content-Type-Outer-Envelope: text/plain; charset=UTF-8
-X-Content-Type-Message-Body: text/plain; charset=UTF-8
-Content-Type: text/plain; charset=UTF-8
-X-DSPAM-Result: Innocent
-X-DSPAM-Processed: Fri Jan 4 15:46:24 2008
-X-DSPAM-Confidence: 0.7565
-X-DSPAM-Probability: 0.0000
-
-Details: http://source.sakaiproject.org/viewsvn/?view=rev&rev=39769
-
-Author: rjlowe@iupui.edu
-Date: 2008-01-04 15:44:39 -0500 (Fri, 04 Jan 2008)
-New Revision: 39769
-
-Modified:
-gradebook/trunk/app/ui/src/java/org/sakaiproject/tool/gradebook/ui/helpers/beans/AssignmentGradeRecordBean.java
-gradebook/trunk/app/ui/src/java/org/sakaiproject/tool/gradebook/ui/helpers/producers/GradeGradebookItemProducer.java
-gradebook/trunk/app/ui/src/webapp/WEB-INF/applicationContext.xml
-gradebook/trunk/app/ui/src/webapp/WEB-INF/bundle/messages.properties
-gradebook/trunk/app/ui/src/webapp/WEB-INF/requestContext.xml
-Log:
-SAK-12180 - Fixed errors with grading helper
-
-----------------------
-This automatic notification message was sent by Sakai Collab (https://collab.sakaiproject.org/portal) from the Source site.
-You can modify how you receive notifications at My Workspace > Preferences.
-
-
-
-From zqian@umich.edu Fri Jan 4 15:03:18 2008
-Return-Path:
-Received: from murder (mail.umich.edu [141.211.14.46])
- by frankenstein.mail.umich.edu (Cyrus v2.3.8) with LMTPA;
- Fri, 04 Jan 2008 15:03:18 -0500
-X-Sieve: CMU Sieve 2.3
-Received: from murder ([unix socket])
- by mail.umich.edu (Cyrus v2.2.12) with LMTPA;
- Fri, 04 Jan 2008 15:03:18 -0500
-Received: from firestarter.mr.itd.umich.edu (firestarter.mr.itd.umich.edu [141.211.14.83])
- by fan.mail.umich.edu () with ESMTP id m04K3HGF006563;
- Fri, 4 Jan 2008 15:03:17 -0500
-Received: FROM paploo.uhi.ac.uk (app1.prod.collab.uhi.ac.uk [194.35.219.184])
- BY firestarter.mr.itd.umich.edu ID 477E9100.8F7F4.1590 ;
- 4 Jan 2008 15:03:15 -0500
-Received: from paploo.uhi.ac.uk (localhost [127.0.0.1])
- by paploo.uhi.ac.uk (Postfix) with ESMTP id 57770BB477;
- Fri, 4 Jan 2008 20:03:09 +0000 (GMT)
-Message-ID: <200801042001.m04K1cO0007738@nakamura.uits.iupui.edu>
-Mime-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Received: from prod.collab.uhi.ac.uk ([194.35.219.182])
- by paploo.uhi.ac.uk (JAMES SMTP Server 2.1.3) with SMTP ID 622
- for ;
- Fri, 4 Jan 2008 20:02:46 +0000 (GMT)
-Received: from nakamura.uits.iupui.edu (nakamura.uits.iupui.edu [134.68.220.122])
- by shmi.uhi.ac.uk (Postfix) with ESMTP id AB4D042F4D
- for ; Fri, 4 Jan 2008 20:02:50 +0000 (GMT)
-Received: from nakamura.uits.iupui.edu (localhost [127.0.0.1])
- by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11) with ESMTP id m04K1cXv007740
- for ; Fri, 4 Jan 2008 15:01:38 -0500
-Received: (from apache@localhost)
- by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11/Submit) id m04K1cO0007738
- for source@collab.sakaiproject.org; Fri, 4 Jan 2008 15:01:38 -0500
-Date: Fri, 4 Jan 2008 15:01:38 -0500
-X-Authentication-Warning: nakamura.uits.iupui.edu: apache set sender to zqian@umich.edu using -f
-To: source@collab.sakaiproject.org
-From: zqian@umich.edu
-Subject: [sakai] svn commit: r39766 - site-manage/branches/sakai_2-4-x/site-manage-tool/tool/src/java/org/sakaiproject/site/tool
-X-Content-Type-Outer-Envelope: text/plain; charset=UTF-8
-X-Content-Type-Message-Body: text/plain; charset=UTF-8
-Content-Type: text/plain; charset=UTF-8
-X-DSPAM-Result: Innocent
-X-DSPAM-Processed: Fri Jan 4 15:03:18 2008
-X-DSPAM-Confidence: 0.7626
-X-DSPAM-Probability: 0.0000
-
-Details: http://source.sakaiproject.org/viewsvn/?view=rev&rev=39766
-
-Author: zqian@umich.edu
-Date: 2008-01-04 15:01:37 -0500 (Fri, 04 Jan 2008)
-New Revision: 39766
-
-Modified:
-site-manage/branches/sakai_2-4-x/site-manage-tool/tool/src/java/org/sakaiproject/site/tool/SiteAction.java
-Log:
-merge fix to SAK-10788 into site-manage 2.4.x branch:
-
-Sakai Source Repository #38024 Wed Nov 07 14:54:46 MST 2007 zqian@umich.edu Fix to SAK-10788: If a provided id in a couse site is fake or doesn't provide any user information, Site Info appears to be like project site with empty participant list
-
-Watch for enrollments object being null and concatenate provider ids when there are more than one.
-Files Changed
-MODIFY /site-manage/trunk/site-manage-tool/tool/src/java/org/sakaiproject/site/tool/SiteAction.java
-
-
-
-
-----------------------
-This automatic notification message was sent by Sakai Collab (https://collab.sakaiproject.org/portal) from the Source site.
-You can modify how you receive notifications at My Workspace > Preferences.
-
-
-
-From rjlowe@iupui.edu Fri Jan 4 14:50:18 2008
-Return-Path:
-Received: from murder (mail.umich.edu [141.211.14.93])
- by frankenstein.mail.umich.edu (Cyrus v2.3.8) with LMTPA;
- Fri, 04 Jan 2008 14:50:18 -0500
-X-Sieve: CMU Sieve 2.3
-Received: from murder ([unix socket])
- by mail.umich.edu (Cyrus v2.2.12) with LMTPA;
- Fri, 04 Jan 2008 14:50:18 -0500
-Received: from eyewitness.mr.itd.umich.edu (eyewitness.mr.itd.umich.edu [141.211.93.142])
- by mission.mail.umich.edu () with ESMTP id m04JoHJi019755;
- Fri, 4 Jan 2008 14:50:17 -0500
-Received: FROM paploo.uhi.ac.uk (app1.prod.collab.uhi.ac.uk [194.35.219.184])
- BY eyewitness.mr.itd.umich.edu ID 477E8DF2.67B91.5278 ;
- 4 Jan 2008 14:50:13 -0500
-Received: from paploo.uhi.ac.uk (localhost [127.0.0.1])
- by paploo.uhi.ac.uk (Postfix) with ESMTP id 2D1B9BB492;
- Fri, 4 Jan 2008 19:47:10 +0000 (GMT)
-Message-ID: <200801041948.m04JmdwO007705@nakamura.uits.iupui.edu>
-Mime-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Received: from prod.collab.uhi.ac.uk ([194.35.219.182])
- by paploo.uhi.ac.uk (JAMES SMTP Server 2.1.3) with SMTP ID 960
- for ;
- Fri, 4 Jan 2008 19:46:50 +0000 (GMT)
-Received: from nakamura.uits.iupui.edu (nakamura.uits.iupui.edu [134.68.220.122])
- by shmi.uhi.ac.uk (Postfix) with ESMTP id B3E6742F4A
- for ; Fri, 4 Jan 2008 19:49:51 +0000 (GMT)
-Received: from nakamura.uits.iupui.edu (localhost [127.0.0.1])
- by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11) with ESMTP id m04JmeV9007707
- for ; Fri, 4 Jan 2008 14:48:40 -0500
-Received: (from apache@localhost)
- by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11/Submit) id m04JmdwO007705
- for source@collab.sakaiproject.org; Fri, 4 Jan 2008 14:48:39 -0500
-Date: Fri, 4 Jan 2008 14:48:39 -0500
-X-Authentication-Warning: nakamura.uits.iupui.edu: apache set sender to rjlowe@iupui.edu using -f
-To: source@collab.sakaiproject.org
-From: rjlowe@iupui.edu
-Subject: [sakai] svn commit: r39765 - in gradebook/trunk/app: business/src/java/org/sakaiproject/tool/gradebook/business business/src/java/org/sakaiproject/tool/gradebook/business/impl ui ui/src/java/org/sakaiproject/tool/gradebook/ui/helpers/beans ui/src/java/org/sakaiproject/tool/gradebook/ui/helpers/entity ui/src/java/org/sakaiproject/tool/gradebook/ui/helpers/params ui/src/java/org/sakaiproject/tool/gradebook/ui/helpers/producers ui/src/webapp/WEB-INF ui/src/webapp/WEB-INF/bundle ui/src/webapp/content/templates
-X-Content-Type-Outer-Envelope: text/plain; charset=UTF-8
-X-Content-Type-Message-Body: text/plain; charset=UTF-8
-Content-Type: text/plain; charset=UTF-8
-X-DSPAM-Result: Innocent
-X-DSPAM-Processed: Fri Jan 4 14:50:18 2008
-X-DSPAM-Confidence: 0.7556
-X-DSPAM-Probability: 0.0000
-
-Details: http://source.sakaiproject.org/viewsvn/?view=rev&rev=39765
-
-Author: rjlowe@iupui.edu
-Date: 2008-01-04 14:48:37 -0500 (Fri, 04 Jan 2008)
-New Revision: 39765
-
-Added:
-gradebook/trunk/app/ui/src/java/org/sakaiproject/tool/gradebook/ui/helpers/beans/AssignmentGradeRecordBean.java
-gradebook/trunk/app/ui/src/java/org/sakaiproject/tool/gradebook/ui/helpers/beans/AssignmentGradeRecordCreator.java
-gradebook/trunk/app/ui/src/java/org/sakaiproject/tool/gradebook/ui/helpers/entity/GradebookEntryGradeEntityProvider.java
-gradebook/trunk/app/ui/src/java/org/sakaiproject/tool/gradebook/ui/helpers/params/GradeGradebookItemViewParams.java
-gradebook/trunk/app/ui/src/java/org/sakaiproject/tool/gradebook/ui/helpers/producers/GradeGradebookItemProducer.java
-gradebook/trunk/app/ui/src/webapp/content/templates/grade-gradebook-item.html
-Modified:
-gradebook/trunk/app/business/src/java/org/sakaiproject/tool/gradebook/business/GradebookManager.java
-gradebook/trunk/app/business/src/java/org/sakaiproject/tool/gradebook/business/impl/GradebookManagerHibernateImpl.java
-gradebook/trunk/app/ui/pom.xml
-gradebook/trunk/app/ui/src/java/org/sakaiproject/tool/gradebook/ui/helpers/beans/GradebookItemBean.java
-gradebook/trunk/app/ui/src/java/org/sakaiproject/tool/gradebook/ui/helpers/entity/GradebookEntryEntityProvider.java
-gradebook/trunk/app/ui/src/java/org/sakaiproject/tool/gradebook/ui/helpers/producers/AddGradebookItemProducer.java
-gradebook/trunk/app/ui/src/webapp/WEB-INF/applicationContext.xml
-gradebook/trunk/app/ui/src/webapp/WEB-INF/bundle/messages.properties
-gradebook/trunk/app/ui/src/webapp/WEB-INF/requestContext.xml
-Log:
-SAK-12180 - New helper tool to grade an assignment
-
-----------------------
-This automatic notification message was sent by Sakai Collab (https://collab.sakaiproject.org/portal) from the Source site.
-You can modify how you receive notifications at My Workspace > Preferences.
-
-
-
-From cwen@iupui.edu Fri Jan 4 11:37:30 2008
-Return-Path:
-Received: from murder (mail.umich.edu [141.211.14.46])
- by frankenstein.mail.umich.edu (Cyrus v2.3.8) with LMTPA;
- Fri, 04 Jan 2008 11:37:30 -0500
-X-Sieve: CMU Sieve 2.3
-Received: from murder ([unix socket])
- by mail.umich.edu (Cyrus v2.2.12) with LMTPA;
- Fri, 04 Jan 2008 11:37:30 -0500
-Received: from tadpole.mr.itd.umich.edu (tadpole.mr.itd.umich.edu [141.211.14.72])
- by fan.mail.umich.edu () with ESMTP id m04GbT9x022078;
- Fri, 4 Jan 2008 11:37:29 -0500
-Received: FROM paploo.uhi.ac.uk (app1.prod.collab.uhi.ac.uk [194.35.219.184])
- BY tadpole.mr.itd.umich.edu ID 477E60B2.82756.9904 ;
- 4 Jan 2008 11:37:09 -0500
-Received: from paploo.uhi.ac.uk (localhost [127.0.0.1])
- by paploo.uhi.ac.uk (Postfix) with ESMTP id 8D13DBB001;
- Fri, 4 Jan 2008 16:37:07 +0000 (GMT)
-Message-ID: <200801041635.m04GZQGZ007313@nakamura.uits.iupui.edu>
-Mime-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Received: from prod.collab.uhi.ac.uk ([194.35.219.182])
- by paploo.uhi.ac.uk (JAMES SMTP Server 2.1.3) with SMTP ID 120
- for ;
- Fri, 4 Jan 2008 16:36:40 +0000 (GMT)
-Received: from nakamura.uits.iupui.edu (nakamura.uits.iupui.edu [134.68.220.122])
- by shmi.uhi.ac.uk (Postfix) with ESMTP id D430B42E42
- for ; Fri, 4 Jan 2008 16:36:37 +0000 (GMT)
-Received: from nakamura.uits.iupui.edu (localhost [127.0.0.1])
- by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11) with ESMTP id m04GZQ7W007315
- for ; Fri, 4 Jan 2008 11:35:26 -0500
-Received: (from apache@localhost)
- by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11/Submit) id m04GZQGZ007313
- for source@collab.sakaiproject.org; Fri, 4 Jan 2008 11:35:26 -0500
-Date: Fri, 4 Jan 2008 11:35:26 -0500
-X-Authentication-Warning: nakamura.uits.iupui.edu: apache set sender to cwen@iupui.edu using -f
-To: source@collab.sakaiproject.org
-From: cwen@iupui.edu
-Subject: [sakai] svn commit: r39764 - in msgcntr/trunk/messageforums-app/src/java/org/sakaiproject/tool/messageforums: . ui
-X-Content-Type-Outer-Envelope: text/plain; charset=UTF-8
-X-Content-Type-Message-Body: text/plain; charset=UTF-8
-Content-Type: text/plain; charset=UTF-8
-X-DSPAM-Result: Innocent
-X-DSPAM-Processed: Fri Jan 4 11:37:30 2008
-X-DSPAM-Confidence: 0.7002
-X-DSPAM-Probability: 0.0000
-
-Details: http://source.sakaiproject.org/viewsvn/?view=rev&rev=39764
-
-Author: cwen@iupui.edu
-Date: 2008-01-04 11:35:25 -0500 (Fri, 04 Jan 2008)
-New Revision: 39764
-
-Modified:
-msgcntr/trunk/messageforums-app/src/java/org/sakaiproject/tool/messageforums/PrivateMessagesTool.java
-msgcntr/trunk/messageforums-app/src/java/org/sakaiproject/tool/messageforums/ui/PrivateMessageDecoratedBean.java
-Log:
-unmerge Xingtang's checkin for SAK-12488.
-
-svn merge -r39558:39557 https://source.sakaiproject.org/svn/msgcntr/trunk
-U messageforums-app/src/java/org/sakaiproject/tool/messageforums/PrivateMessagesTool.java
-U messageforums-app/src/java/org/sakaiproject/tool/messageforums/ui/PrivateMessageDecoratedBean.java
-
-svn log -r 39558
-------------------------------------------------------------------------
-r39558 | hu2@iupui.edu | 2007-12-20 15:25:38 -0500 (Thu, 20 Dec 2007) | 3 lines
-
-SAK-12488
-when send a message to yourself. click reply to all, cc row should be null.
-http://jira.sakaiproject.org/jira/browse/SAK-12488
-------------------------------------------------------------------------
-
-
-----------------------
-This automatic notification message was sent by Sakai Collab (https://collab.sakaiproject.org/portal) from the Source site.
-You can modify how you receive notifications at My Workspace > Preferences.
-
-
-
-From cwen@iupui.edu Fri Jan 4 11:35:08 2008
-Return-Path: