Sylvain
|
ff316f7bdd
|
updated changes log
|
2016-05-03 16:33:06 +02:00 |
|
Nicolas Florentin
|
8187c11b34
|
Merge branch 'dev'
|
2016-05-03 11:32:05 +02:00 |
|
Nicolas Florentin
|
726593c2f7
|
fix typo readme
|
2016-05-03 11:29:38 +02:00 |
|
Nicolas Florentin
|
806d9df331
|
fix typo readme
|
2016-05-03 11:29:14 +02:00 |
|
Nicolas Florentin
|
434107646d
|
update readme: open projects
|
2016-05-03 11:27:01 +02:00 |
|
cyril
|
0859e42db7
|
Merge branch 'dev'
|
2016-05-03 09:41:26 +02:00 |
|
Sylvain
|
82a9980c20
|
[bug] is not defined after sso profile sync
|
2016-05-03 09:37:15 +02:00 |
|
cyril
|
ad510af829
|
fix initializers openlab_ruby for env dev
|
2016-05-02 20:00:39 +02:00 |
|
cyril
|
d0ff7b7a21
|
Merge branch 'dev'
|
2016-05-02 18:36:29 +02:00 |
|
Nicolas Florentin
|
30105e5af4
|
fix, openlab_ruby initializer was erasing base_uri
|
2016-05-02 18:35:59 +02:00 |
|
cyril
|
b059271dd9
|
Merge branch 'dev'
|
2016-05-02 18:15:52 +02:00 |
|
Nicolas Florentin
|
b6918f824c
|
update openlab_ruby
|
2016-05-02 18:13:21 +02:00 |
|
cyril
|
8864863343
|
Merge branch 'release-2.1.0'
|
2016-05-02 17:15:50 +02:00 |
|
cyril
|
ce6979729a
|
add changelog file
|
2016-05-02 17:14:21 +02:00 |
|
cyril
|
65c19b3462
|
fix translate
|
2016-05-02 17:14:01 +02:00 |
|
cyril
|
c271d50991
|
Merge branch 'projects-openfablab' into dev
|
2016-05-02 16:56:31 +02:00 |
|
cyril
|
f84e633f7c
|
Merge branch 'projects-openfablab' of git.sleede.com:projets/fab-manager into projects-openfablab
|
2016-05-02 16:21:26 +02:00 |
|
cyril
|
31d5fbbb15
|
fix ui projects list
|
2016-05-02 16:21:23 +02:00 |
|
Nicolas Florentin
|
d29deaad51
|
projects/index now save in url query param if whole_network is true
|
2016-05-02 16:18:24 +02:00 |
|
cyril
|
12bc556038
|
Merge branch 'projects-openfablab' of git.sleede.com:projets/fab-manager into projects-openfablab
|
2016-05-02 16:10:54 +02:00 |
|
cyril
|
7288834417
|
ui projects list
|
2016-05-02 16:10:48 +02:00 |
|
Nicolas Florentin
|
4afb968750
|
fix select option for machines themes and materials when you get back to page and want your history back
|
2016-05-02 12:48:26 +02:00 |
|
cyril
|
79b69f21ba
|
Merge branch 'projects-openfablab' of git.sleede.com:projets/fab-manager into projects-openfablab
|
2016-05-02 11:55:15 +02:00 |
|
Nicolas Florentin
|
faf78b7f82
|
fix bug custom asset favicon-file favicon file is not set
|
2016-04-25 17:55:37 +02:00 |
|
Sylvain
|
b483b76042
|
fix arrows in SSO completion
|
2016-04-25 15:20:00 +02:00 |
|
Sylvain
|
8b8ed342c1
|
improve responsivness of SSO completion form
|
2016-04-25 15:14:12 +02:00 |
|
Sylvain
|
33f83180fa
|
fix typo and css
|
2016-04-25 14:34:09 +02:00 |
|
Sylvain
|
b4ad735d7f
|
change interface for SSO/email already used
|
2016-04-25 14:30:03 +02:00 |
|
Nicolas Florentin
|
542efe363b
|
projects#index adds tooltip to explain what search over the whole network means
|
2016-04-25 12:57:35 +02:00 |
|
Nicolas Florentin
|
960f312dc9
|
projects search params are saved in url query params and remain in browser history
|
2016-04-25 12:46:30 +02:00 |
|
Sylvain
|
0ee36ca022
|
refactor interface for SSO profile completion
|
2016-04-25 12:35:43 +02:00 |
|
Nicolas Florentin
|
4cfcbb47aa
|
openlab_projects ctrl, rescue all standard error
|
2016-04-25 10:07:54 +02:00 |
|
Nicolas Florentin
|
5403386c75
|
fallback and message if openlab server not available
|
2016-04-25 10:06:35 +02:00 |
|
Nicolas Florentin
|
1a446bf646
|
frontend openlab search view, ctrl, services
|
2016-04-22 18:17:55 +02:00 |
|
Nicolas Florentin
|
5ee27da51e
|
index updated_at, created_at, published_at datetimes
|
2016-04-21 18:19:55 +02:00 |
|
Nicolas Florentin
|
ec203a8ef8
|
adds minimal validation to projects
|
2016-04-21 17:10:50 +02:00 |
|
Nicolas Florentin
|
f65bb95575
|
almost finishes synchro with openlab system
|
2016-04-21 11:42:43 +02:00 |
|
Nicolas Florentin
|
711b18f6cd
|
initial commit
|
2016-04-20 18:13:36 +02:00 |
|
cyril
|
1099adb208
|
Merge branch 'tests' into dev
|
2016-04-20 11:58:09 +02:00 |
|
cyril
|
3ead00eabf
|
Merge branch '2-0-rc1' into dev
|
2016-04-20 11:48:50 +02:00 |
|
cyril
|
bbe4cebbf5
|
Merge branch '2-0-rc1'
|
2016-04-20 11:48:19 +02:00 |
|
Nicolas Florentin
|
ed478f95c7
|
UsersCredits::Manager accept an event Reservation but do not do nothing, acting as a blackbox
|
2016-04-20 11:24:28 +02:00 |
|
cyril
|
0f09795243
|
fix traduction trainings.completed
|
2016-04-19 16:47:43 +02:00 |
|
Sylvain
|
34648c7e9e
|
event test
|
2016-04-13 18:33:43 +02:00 |
|
Sylvain
|
d880a8f0f4
|
fix unable to reserve Event
|
2016-04-13 18:21:01 +02:00 |
|
Sylvain
|
3016ac1e82
|
tests for availabilities
|
2016-04-13 17:26:17 +02:00 |
|
Sylvain
|
6f4e795d9f
|
machine availabilities test
|
2016-04-13 15:19:57 +02:00 |
|
Sylvain
|
423431dc72
|
make availability fixtures dynamic
|
2016-04-13 15:08:49 +02:00 |
|
Sylvain
|
eb2bc54cec
|
Merge branch '2-0-rc1' into tests
|
2016-04-13 14:03:28 +02:00 |
|
Sylvain
|
a0397a2c15
|
[bug taiga#25] allow event update if changing ng_places
|
2016-04-13 13:37:05 +02:00 |
|