]>
git.parisson.com Git - telemeta.git/log
Guillaume Pellerin [Wed, 11 May 2016 09:04:10 +0000 (11:04 +0200)]
Merge pull request #108 from ThomasBalastegui/dev
balastegui [Tue, 10 May 2016 14:59:10 +0000 (16:59 +0200)]
Validation du popup playlist
Thomas Fillon [Thu, 28 Apr 2016 09:35:09 +0000 (11:35 +0200)]
Merge branch 'dev' of github.com:Parisson/Telemeta into dev
Thomas Fillon [Thu, 28 Apr 2016 09:34:55 +0000 (11:34 +0200)]
Fix redundant line in telemeta/views/item.py
Guillaume Pellerin [Thu, 28 Apr 2016 00:40:33 +0000 (02:40 +0200)]
dont't use timeside item use for now (goto diadems branch)
Guillaume Pellerin [Thu, 28 Apr 2016 00:36:36 +0000 (02:36 +0200)]
comment diadems button
Guillaume Pellerin [Mon, 25 Apr 2016 21:42:01 +0000 (23:42 +0200)]
Merge branch 'dev' of github.com:Parisson/Telemeta into dev
Guillaume Pellerin [Wed, 20 Apr 2016 20:13:42 +0000 (22:13 +0200)]
fix watchmedo patterns, cleanup
Guillaume Pellerin [Wed, 20 Apr 2016 20:13:42 +0000 (22:13 +0200)]
fix warchmedo patterns, cleanup
Guillaume Pellerin [Mon, 18 Apr 2016 14:59:00 +0000 (16:59 +0200)]
Merge branch 'master' into dev
Guillaume Pellerin [Mon, 18 Apr 2016 14:57:59 +0000 (16:57 +0200)]
fix default regex codes
Guillaume Pellerin [Mon, 18 Apr 2016 09:24:48 +0000 (11:24 +0200)]
Merge branch 'master' into dev
Guillaume Pellerin [Mon, 18 Apr 2016 09:00:33 +0000 (11:00 +0200)]
update pages
Guillaume Pellerin [Mon, 18 Apr 2016 08:56:07 +0000 (10:56 +0200)]
fix no ts_item_id
Guillaume Pellerin [Mon, 18 Apr 2016 08:54:30 +0000 (10:54 +0200)]
fix home styles
Guillaume Pellerin [Mon, 18 Apr 2016 08:54:30 +0000 (10:54 +0200)]
fix home styles
Guillaume Pellerin [Wed, 13 Apr 2016 22:45:36 +0000 (00:45 +0200)]
Merge branch 'dev' of github.com:Parisson/Telemeta into dev
Guillaume Pellerin [Wed, 13 Apr 2016 22:45:14 +0000 (00:45 +0200)]
fix init, use bash
Thomas Fillon [Wed, 13 Apr 2016 17:01:25 +0000 (19:01 +0200)]
Merge branch 'dev' into feature/ts-server
Thomas Fillon [Wed, 13 Apr 2016 17:00:32 +0000 (19:00 +0200)]
Preliminary work on timseside.server use
Guillaume Pellerin [Wed, 13 Apr 2016 14:27:33 +0000 (16:27 +0200)]
once init commands
Guillaume Pellerin [Wed, 13 Apr 2016 14:14:47 +0000 (16:14 +0200)]
Merge branch 'dev'
Guillaume Pellerin [Wed, 13 Apr 2016 14:09:37 +0000 (16:09 +0200)]
use min.css
Guillaume Pellerin [Wed, 13 Apr 2016 14:07:21 +0000 (16:07 +0200)]
fix icon
Guillaume Pellerin [Wed, 13 Apr 2016 14:06:43 +0000 (16:06 +0200)]
use django-bootstrap3 css plus patches
Guillaume Pellerin [Wed, 13 Apr 2016 13:35:49 +0000 (15:35 +0200)]
use bash
Guillaume Pellerin [Wed, 13 Apr 2016 13:30:09 +0000 (15:30 +0200)]
bugfix
Guillaume Pellerin [Wed, 13 Apr 2016 13:23:32 +0000 (15:23 +0200)]
bug fix (closes #103)
Guillaume Pellerin [Wed, 13 Apr 2016 12:21:50 +0000 (14:21 +0200)]
fix SM2 url
Guillaume Pellerin [Wed, 13 Apr 2016 12:06:11 +0000 (14:06 +0200)]
fix app start tests
Guillaume Pellerin [Wed, 13 Apr 2016 11:56:54 +0000 (13:56 +0200)]
Merge remote-tracking branch 'origin/app' into test
Guillaume Pellerin [Wed, 13 Apr 2016 11:55:33 +0000 (13:55 +0200)]
update locale
Guillaume Pellerin [Wed, 13 Apr 2016 11:47:37 +0000 (13:47 +0200)]
refactor app
Guillaume Pellerin [Wed, 13 Apr 2016 11:30:30 +0000 (13:30 +0200)]
Merge branch 'dev' of github.com:Parisson/Telemeta into dev
Guillaume Pellerin [Wed, 13 Apr 2016 11:30:09 +0000 (13:30 +0200)]
use source code in prod, update pages
Thomas Fillon [Mon, 11 Apr 2016 07:35:15 +0000 (09:35 +0200)]
Merge branch 'dev' into feature/ts-server
Guillaume Pellerin [Thu, 7 Apr 2016 12:49:03 +0000 (14:49 +0200)]
update link
Guillaume Pellerin [Thu, 7 Apr 2016 12:49:03 +0000 (14:49 +0200)]
fix playlist filter
Guillaume Pellerin [Wed, 6 Apr 2016 23:14:00 +0000 (01:14 +0200)]
fix download url and boilerplate access rights
Guillaume Pellerin [Tue, 5 Apr 2016 05:55:50 +0000 (07:55 +0200)]
fix media access rights at init
Guillaume Pellerin [Tue, 5 Apr 2016 04:51:41 +0000 (06:51 +0200)]
update Manifest
Guillaume Pellerin [Mon, 4 Apr 2016 21:59:10 +0000 (23:59 +0200)]
Merge branch 'dev'
Guillaume Pellerin [Mon, 4 Apr 2016 21:58:31 +0000 (23:58 +0200)]
update pages
Guillaume Pellerin [Mon, 4 Apr 2016 21:32:44 +0000 (23:32 +0200)]
update doc
Guillaume Pellerin [Mon, 4 Apr 2016 20:46:54 +0000 (22:46 +0200)]
fix about
Guillaume Pellerin [Mon, 4 Apr 2016 20:45:15 +0000 (22:45 +0200)]
fix link
Guillaume Pellerin [Mon, 4 Apr 2016 20:44:35 +0000 (22:44 +0200)]
fix links and exs
Guillaume Pellerin [Mon, 4 Apr 2016 20:33:45 +0000 (22:33 +0200)]
fix doc
Guillaume Pellerin [Mon, 4 Apr 2016 20:31:39 +0000 (22:31 +0200)]
fix image url
Guillaume Pellerin [Mon, 4 Apr 2016 20:29:04 +0000 (22:29 +0200)]
fix logo
Guillaume Pellerin [Mon, 4 Apr 2016 20:27:35 +0000 (22:27 +0200)]
fix conflict
Guillaume Pellerin [Mon, 4 Apr 2016 20:25:42 +0000 (22:25 +0200)]
fix image
Guillaume Pellerin [Mon, 4 Apr 2016 20:24:36 +0000 (22:24 +0200)]
update doc
Guillaume Pellerin [Mon, 4 Apr 2016 20:22:35 +0000 (22:22 +0200)]
update readme and 1.6
Guillaume Pellerin [Mon, 4 Apr 2016 20:06:17 +0000 (22:06 +0200)]
cleanup
Guillaume Pellerin [Sun, 3 Apr 2016 19:52:42 +0000 (21:52 +0200)]
fix doc
Guillaume Pellerin [Sat, 2 Apr 2016 23:48:45 +0000 (01:48 +0200)]
add infos
Guillaume Pellerin [Sat, 2 Apr 2016 23:37:52 +0000 (01:37 +0200)]
fix link
Guillaume Pellerin [Sat, 2 Apr 2016 23:35:13 +0000 (01:35 +0200)]
fix doc
Guillaume Pellerin [Sat, 2 Apr 2016 23:12:21 +0000 (01:12 +0200)]
fix urls
Guillaume Pellerin [Sat, 2 Apr 2016 23:07:07 +0000 (01:07 +0200)]
Merge branch 'dev' of github.com:Parisson/Telemeta into dev
Guillaume Pellerin [Sat, 2 Apr 2016 23:07:00 +0000 (01:07 +0200)]
update projects, release and features
Guillaume Pellerin [Sat, 2 Apr 2016 22:24:04 +0000 (00:24 +0200)]
addd wait-for-db command
Thomas Fillon [Wed, 30 Mar 2016 10:28:19 +0000 (12:28 +0200)]
Link TM Item with TimeSide Item
Guillaume Pellerin [Wed, 30 Mar 2016 08:43:51 +0000 (10:43 +0200)]
Merge branch 'master' of github.com:Parisson/Telemeta
Guillaume Pellerin [Wed, 30 Mar 2016 08:43:41 +0000 (10:43 +0200)]
Merge branch 'dev'
Thomas Fillon [Wed, 30 Mar 2016 07:00:22 +0000 (09:00 +0200)]
Merge branch 'dev' of github.com:Parisson/Telemeta into dev
Thomas Fillon [Wed, 30 Mar 2016 07:00:00 +0000 (09:00 +0200)]
Add Werkzeug debugger for use with runserver_plus
Guillaume Pellerin [Tue, 29 Mar 2016 17:52:53 +0000 (19:52 +0200)]
comment staging apps after rebuilding (ok)
Guillaume Pellerin [Tue, 29 Mar 2016 17:25:09 +0000 (19:25 +0200)]
use runserver_plus
Guillaume Pellerin [Tue, 29 Mar 2016 16:39:36 +0000 (18:39 +0200)]
update partners, links, projects
Thomas Fillon [Tue, 29 Mar 2016 16:03:27 +0000 (18:03 +0200)]
Deployment: Set proper owner for cache directory
Guillaume Pellerin [Mon, 28 Mar 2016 23:33:25 +0000 (01:33 +0200)]
fix doc
Guillaume Pellerin [Mon, 28 Mar 2016 23:10:14 +0000 (01:10 +0200)]
fix waiting for DB
Guillaume Pellerin [Mon, 28 Mar 2016 22:12:43 +0000 (00:12 +0200)]
fix backup/restore scripts, fix doc
Guillaume Pellerin [Mon, 28 Mar 2016 13:52:52 +0000 (15:52 +0200)]
rename utils to tags
Guillaume Pellerin [Mon, 28 Mar 2016 13:50:27 +0000 (15:50 +0200)]
cleanup
Guillaume Pellerin [Mon, 28 Mar 2016 13:41:35 +0000 (15:41 +0200)]
update README against AGPL
Guillaume Pellerin [Mon, 28 Mar 2016 13:38:31 +0000 (15:38 +0200)]
change licence from CeCILL to AGPLv3 (closes #93)
Guillaume Pellerin [Mon, 28 Mar 2016 10:16:41 +0000 (12:16 +0200)]
finally add saved searches with links (closes #89)
Guillaume Pellerin [Sun, 27 Mar 2016 22:03:25 +0000 (00:03 +0200)]
add saved_search views
Guillaume Pellerin [Sun, 27 Mar 2016 21:47:02 +0000 (23:47 +0200)]
rename files, add more compose env files, prepare saved_searches
Guillaume Pellerin [Thu, 24 Mar 2016 15:48:34 +0000 (16:48 +0100)]
Merge branch 'dev' of github.com:Parisson/Telemeta into dev
Guillaume Pellerin [Thu, 24 Mar 2016 15:48:21 +0000 (16:48 +0100)]
WARNING : data/mysql is not used anymore as a default volume for the composition
Thomas Fillon [Wed, 23 Mar 2016 08:22:56 +0000 (09:22 +0100)]
Settings: Fix django-angular settings
Thomas Fillon [Tue, 22 Mar 2016 17:07:08 +0000 (18:07 +0100)]
Travis: show logs after failure
Thomas Fillon [Tue, 22 Mar 2016 16:48:52 +0000 (17:48 +0100)]
Travis: try to let docker-compose more time to start everything
Thomas Fillon [Fri, 18 Mar 2016 10:49:20 +0000 (11:49 +0100)]
Travis: curl should now throw an error code with the --fail option
Thomas Fillon [Thu, 17 Mar 2016 17:01:14 +0000 (18:01 +0100)]
Travis: use docker-compose
Thomas Fillon [Thu, 17 Mar 2016 16:15:00 +0000 (17:15 +0100)]
Travis setup: pip install TimeSide from Github rather than Pypi
Thomas Fillon [Thu, 17 Mar 2016 11:31:14 +0000 (12:31 +0100)]
Fix Docker build
Thomas Fillon [Thu, 17 Mar 2016 11:31:14 +0000 (12:31 +0100)]
Fix Docker build
Guillaume Pellerin [Mon, 7 Mar 2016 08:38:29 +0000 (09:38 +0100)]
Merge branch 'dev'
Guillaume Pellerin [Mon, 29 Feb 2016 23:58:39 +0000 (00:58 +0100)]
add password arg and smart time for restore script
Guillaume Pellerin [Mon, 29 Feb 2016 23:38:24 +0000 (00:38 +0100)]
add volume for scripts
Guillaume Pellerin [Fri, 26 Feb 2016 10:06:26 +0000 (11:06 +0100)]
add staging apps
Guillaume Pellerin [Fri, 26 Feb 2016 09:58:15 +0000 (10:58 +0100)]
makes admin target blank
Guillaume Pellerin [Fri, 26 Feb 2016 09:06:10 +0000 (10:06 +0100)]
center maps on France
Guillaume Pellerin [Tue, 23 Feb 2016 00:08:22 +0000 (01:08 +0100)]
Merge branch 'dev'
Guillaume Pellerin [Fri, 19 Feb 2016 17:06:06 +0000 (18:06 +0100)]
back to HTML5 = flase (cursor scrolling is buggy)
projects / telemeta.git / log