ansol/adistancia.ansol.org
7
0
Fork 0
mirror of https://gitlab.com/ubuntu-pt/open-edu.git synced 2024-12-22 03:54:14 +00:00
Code Issues Projects Releases Wiki Activity
65 Commits 1 Branch 0 Tags 125 KiB
cddb03e4b7
Commit Graph

65 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gustavo Silva
cddb03e4b7 Merge branch 'master' into 'master' 
adicionar o Etherpad

See merge request ubuntu-pt/open-edu!27
 2020-03-18 21:08:25 +00:00
bossatossa
b74471453c adicionar o Etherpad 2020-03-17 10:58:37 +00:00
Gustavo Silva
bfe6b86331 Merge branch 'wordpress' into 'master' 
wordpress: actualização da descrição

See merge request ubuntu-pt/open-edu!25
 2020-03-16 18:21:06 +00:00
Gustavo Silva
55da1abe9e Merge branch 'master' into 'master' 
Actualizado o index.md para incluir Drupal e uma referência a Opigno LMS

See merge request ubuntu-pt/open-edu!26
 2020-03-16 18:20:40 +00:00
João Machado
663fab6367 Update index.md to include Drupal and a reference to Opigno LMS 2020-03-16 16:10:07 +00:00
Marcos Marado
ef16b03af6 wordpress: actualização da descrição 
* remoção de palavra redundante, para termos uma descrição mais curta
  (e que não ocupe duas linhas no site)
* remoção de ponto final
 2020-03-16 12:52:49 +00:00
Gustavo Silva
8dbb1adcf5 Merge branch 'gsilvapt-master-patch-37643' into 'master' 
solves #6 - footer only

See merge request ubuntu-pt/open-edu!24
 2020-03-15 22:11:50 +00:00
Gustavo Silva
f51d1e3cce Merge branch 'patch-1' into 'master' 
Correcção do item WordPress

See merge request ubuntu-pt/open-edu!23
 2020-03-15 22:11:22 +00:00
Gustavo Silva
30356b2b6c solves #6 - footer only 2020-03-15 22:10:37 +00:00
Pedro Mendonça
c456715b19 Correcção do item WordPress 2020-03-15 21:51:59 +00:00
Gustavo Silva
f2b3ebae9a Merge branch 'SL' into 'master' 
Adicionado link em "Software Livre"

See merge request ubuntu-pt/open-edu!22
 2020-03-15 16:26:23 +00:00
Marcos Marado
062fe41ee2 Adicionado link em "Software Livre" 
Esta página fala sobre Software Livre sem o definir, mas há quem não saiba o
que quer dizer Software Livre. Assim, agora passamos a linkar "Software Livre"
para a página da ANSOL que explica o termo.
 2020-03-15 15:48:19 +00:00
Gustavo Silva
fb84059c31 Removes except master from test job 
Ensures `test` jobs will run for every source branch name.
 2020-03-14 22:10:55 +00:00
Gustavo Silva
53be352d58 Merge branch 'master' into 'master' 
Update index.md add openvpn

See merge request ubuntu-pt/open-edu!21
 2020-03-14 21:57:55 +00:00
MalMen
29bb4cf3c2 Update index.md add openvpn 2020-03-14 16:29:26 +00:00
Tiago Carrondo
169104b277 Merge branch 'patch-1' into 'master' 
rocket chat e mattermost

See merge request ubuntu-pt/open-edu!20
 2020-03-13 15:03:03 +00:00
Tiago Carrondo
4c8c20d123 Update _config.yml 2020-03-13 12:10:25 +00:00
Tiago Carrondo
1231125f2f Update _config.yml 2020-03-13 12:08:10 +00:00
Tiago Carrondo
e84771cc04 Update _config.yml 2020-03-13 12:07:46 +00:00
Eduardo Santos
ce636d40cb rocket chat e mattermost 2020-03-13 02:17:05 +00:00
Gustavo Silva
01e99579d2 Merge branch 'ft-footer_improved' into 'master' 
Fixes description in two places

See merge request ubuntu-pt/open-edu!19
 2020-03-12 23:17:43 +00:00
Gustavo Silva
b9e6e8c7cf
Fixes description in two places 2020-03-12 23:16:32 +00:00
Gustavo Silva
abb5da1cc9 Merge branch 'collabora' into 'master' 
Collabora é server-side

See merge request ubuntu-pt/open-edu!18
 2020-03-12 23:11:31 +00:00
Gustavo Silva
2c8a6a7590 Merge branch 'ft-footer_improved' into 'master' 
Ft footer improved

See merge request ubuntu-pt/open-edu!17
 2020-03-12 23:11:21 +00:00
Gustavo Silva
374d4aabd8
Attempts fixing footer 2020-03-12 23:10:17 +00:00
Marcos Marado
76afb56b47 Collabora é server-side 2020-03-12 23:10:03 +00:00
Gustavo Silva
252ab19fb6 Merge branch 'ft-footer_improved' into 'master' 
ensures pipeline runs every merge request

See merge request ubuntu-pt/open-edu!16
 2020-03-12 23:04:15 +00:00
Gustavo Silva
5e9eda231b Merge branch 'abc' into 'master' 
Organização por ordem alfabética

See merge request ubuntu-pt/open-edu!15
 2020-03-12 23:04:01 +00:00
Gustavo Silva
85a0652ca2
ensures pipeline runs every merge request 2020-03-12 23:02:57 +00:00
Gustavo Silva
91b152d585 Merge branch 'ft-footer_improved' into 'master' 
Swaps links for hrefs

See merge request ubuntu-pt/open-edu!14
 2020-03-12 23:02:20 +00:00
Marcos Marado
ffc7846e13 Organização por ordem alfabética 2020-03-12 23:02:07 +00:00
Gustavo Silva
1b3e527369
Swaps links for hrefs 2020-03-12 23:01:01 +00:00
Gustavo Silva
6a46bc021b Merge branch 'ft-improve_header_section' into 'master' 
Bolds contribution request and shortens footer text

See merge request ubuntu-pt/open-edu!13
 2020-03-12 22:53:34 +00:00
Gustavo Silva
fe332b3007 Merge branch 'correccao' into 'master' 
Adição do link ao Toonloop

See merge request ubuntu-pt/open-edu!12
 2020-03-12 22:52:37 +00:00
Gustavo Silva
bb78e990e1
Bolds contribution request and shortens footer text 2020-03-12 22:51:17 +00:00
Marcos Marado
db938ab7c1 Adição do link ao Toonloop 
A entrada já estava lá, mas o link "desapareceu" com o tempo.
 2020-03-12 22:50:46 +00:00
Gustavo Silva
de82dc86ed Merge branch 'encerramento' into 'master' 
foi anunciado hoje o encerramento das escolas

See merge request ubuntu-pt/open-edu!10
 2020-03-12 22:49:15 +00:00
Gustavo Silva
997fe4e92b Merge branch 'sitename' into 'master' 
Mudado o nome ao site

See merge request ubuntu-pt/open-edu!11
 2020-03-12 22:48:25 +00:00
Gustavo Silva
7b2bbcf9e1
Updates GitLab CI/CD pipelines 2020-03-12 22:47:24 +00:00
Marcos Marado
be95c9998b foi anunciado hoje o encerramento das escolas 
* actualizar o texto para reflectir isso
* aproveita-se e a referência à ANSOL passa a ter link
 2020-03-12 22:45:50 +00:00
Marcos Marado
a3ace460ca Mudado o nome ao site 
De "Awesome Open Edu" para "Software Livre Educativo"
 2020-03-12 22:43:11 +00:00
Gustavo Silva
495a182fb7 Merge branch 'title' into 'master' 
Mudança de título

See merge request ubuntu-pt/open-edu!9
 2020-03-12 22:40:48 +00:00
Marcos Marado
54c6ced9e7 Mudança de título 
"Software educativo livre CORONAVIRUS" não é grande título, mudado
para o (não muito, mas melhor) "COVID-19: Software Educativo Livre".

Acrescentada também pontuação à frase final.
 2020-03-12 22:36:01 +00:00
Gustavo Silva
016091a7c2 Merge branch 'gsilvapt-master-patch-99997' into 'master' 
Adds contributing section

See merge request ubuntu-pt/open-edu!8
 2020-03-12 15:56:07 +00:00
Gustavo Silva
1ee019f745 fix typo causing pipeline failures 2020-03-12 15:54:27 +00:00
Gustavo Silva
1f32961c90 Adds contributing section 2020-03-12 15:51:41 +00:00
Gustavo Silva
2f66219c0f Merge branch 'gsilvapt-master-patch-38532' into 'master' 
Gsilvapt master patch 38532

Closes #2

See merge request ubuntu-pt/open-edu!7
 2020-03-12 15:41:08 +00:00
Gustavo Silva
b920bf8948 Gsilvapt master patch 38532 2020-03-12 15:41:08 +00:00
Gustavo Silva
676386d4c7 Merge branch 'gsilvapt-master-patch-71342' into 'master' 
Limpa readme e index.md

Closes #4

See merge request ubuntu-pt/open-edu!6
 2020-03-11 23:42:32 +00:00
Gustavo Silva
75d01badcf Limpa readme e index.md 
closes issue #4
does some work for issue #2
 2020-03-11 23:41:11 +00:00