Gabriel Detraz
30bb38d75f
Serialisation des roles et réglages par vlan des switches
2018-09-27 16:32:21 +02:00
Gabriel Detraz
20126a3cd6
Serialisation de la liste des vlans
2018-09-27 16:32:21 +02:00
Gabriel Detraz
aec2c645a2
Serialisation de la conf des swicthes
2018-09-27 16:32:21 +02:00
chirac
916ec9789f
Merge branch 'show_more_info_switch' into 'dev'
...
Added info on switch page
See merge request federez/re2o!314
2018-09-26 15:44:51 +02:00
edpibu
b2c871556a
Modified arguments passed to template
2018-09-26 15:44:27 +02:00
edpibu
bc5b7c63be
Added info on switch page
2018-09-26 15:44:27 +02:00
chirac
311b13e694
Merge branch 'add_switch_name_to_ports_search_results' into 'dev'
...
Added switch name to port search results, moved link to switch on switch name…
See merge request federez/re2o!312
2018-09-26 15:34:32 +02:00
edpibu
7e36cbc7ba
Added switch name to port search results, moved link to switch on switch name rather than port number
2018-09-26 15:33:49 +02:00
chirac
c7949ac684
Merge branch 'fix_affichage_solde' into 'dev'
...
Fix affichage du solde
See merge request federez/re2o!311
2018-09-26 15:31:16 +02:00
edpibu
783c724f94
Fix affichage du solde
2018-09-26 15:29:56 +02:00
chirac
a6f65fd967
Merge branch 'js_fix_load_order' into 'dev'
...
Fix JavaScript not being load before the code using it.
See merge request federez/re2o!305
2018-09-24 17:21:07 +02:00
Alexandre Iooss
b6e4344893
Fix JavaScript not being load before the code using it.
2018-09-24 17:20:55 +02:00
chirac
1703d79bd8
Merge branch 'frontend_change_navbar_color' into 'dev'
...
Change navbar color back to black
See merge request federez/re2o!306
2018-09-24 17:20:49 +02:00
Alexandre Iooss
794aa65c06
Change navbar color back to black
2018-09-24 12:02:15 +02:00
chirac
3fd554041d
Merge branch 'gen_contrib_normalize' into 'dev'
...
Update gen_contrib.py to match current contributors.py
See merge request federez/re2o!300
2018-09-23 23:37:51 +02:00
Alexandre Iooss
1f35e6340b
Update gen_contrib.py to match current contributors.py
...
Now `manage.py gen_contrib` generates a contributors.py matching the
already existing format. It normalizes names to make the list more
enjoyable.
Before using this to seriously generate contributors.py we need to
figure out a way to add pseudo names, or tell everyone to change their
name on GitLab.
2018-09-23 23:31:26 +02:00
chirac
a584c37bcb
Merge branch 'apt_requirements_add_git' into 'dev'
...
Add git in apt_requirements.txt
See merge request federez/re2o!302
2018-09-23 23:30:58 +02:00
Alexandre Iooss
1f583643ab
Add git in apt_requirements
...
re2o/management/commands/gen_contrib.py uses git but it isn't in apt requirements.
Fix issue 174.
2018-09-23 23:01:45 +02:00
chirac
774388fca6
Merge branch 'add_link_port_search_results_from_dev' into 'dev'
...
Added link to the switch on switch ports search results
See merge request federez/re2o!304
2018-09-23 22:05:21 +02:00
edpibu
98facee5e0
Added link to the switch on switch ports search results
2018-09-22 20:16:03 +02:00
klafyvel
38e1cabddd
Merge branch 'frontend_fix' into 'dev'
...
Frontend changes
See merge request federez/re2o!296
2018-09-22 10:24:37 +02:00
Alexandre Iooss
67a7b2b325
Change Rézo Supélec Metz en Rézo Metz
2018-09-22 10:15:51 +02:00
Alexandre Iooss
8492b8c59b
Remove "next" in login template
...
The next field isn't used at all so this removes the associated dead code.
Also it removes the double error messages when an error occures in the form.
2018-09-22 10:15:51 +02:00
Alexandre Iooss
c20a28b15e
Add changelog information
2018-09-22 10:15:51 +02:00
Alexandre Iooss
0ef6ec5b28
Sapphire.js cleanup
...
Make sapphire.js follow new javascript conventions. Also fix a dirty JS
in base.html.
2018-09-22 10:15:51 +02:00
Alexandre Iooss
033c22bf1d
Fix other font-awesome icons
2018-09-22 10:15:51 +02:00
Alexandre Iooss
2702bee918
Make navbar look less Bootstrap-ed
...
Change navbar colors to match re2o colors.
2018-09-22 10:15:51 +02:00
Alexandre Iooss
dabf484422
Change base layout
...
Make CSS a bit cleaner and remove useless separator.
2018-09-22 10:15:51 +02:00
Alexandre Iooss
4a4ba06112
Use debian font-awesome
...
Rather than going online, use fonts-font-awesome debian package. Also
icons were updated to font-awesome 4.7.0 (in debian 9).
2018-09-22 10:15:51 +02:00
Alexandre Iooss
e571751c70
Fix footer and about
...
* Rather than using href="\\host/about/" in page footer, use
href="protocol://host/about/"
* The old footer uses hacks to be staticly on the bottom. To make it
much simpler one solution is to turn it white and use official
Bootstrap code. This leads to less CSS to maintain and better
cross-browser compatibility.
* On re2o about page (/about/) there is some typos such as :
* assocations > associations
* legitlab > le gitlab
* Use Bootstrap navbar-static-top rather than custom CSS.
The result is the same, so we should be better using directly
Bootstrap CSS.
2018-09-22 10:15:51 +02:00
klafyvel
1f1063bf06
Merge branch 'gitignore_add' into 'dev'
...
Update .gitignore to ignore more files
See merge request federez/re2o!301
2018-09-22 09:57:41 +02:00
Alexandre Iooss
a0bb34f740
Update .gitignore to ignore more files
...
Based on the Python template : https://github.com/github/gitignore/
I'm using PyCharm which creates .idea folders. So I need this to
make my life easier.
2018-09-21 12:47:59 +02:00
chirac
1d8095f223
Merge branch 'fix_mr294' into 'dev'
...
Fix merge request 294
See merge request federez/re2o!299
2018-09-20 16:21:47 +02:00
Alexandre Iooss
9e578bf93d
Fix merge request 294
2018-09-20 15:38:36 +02:00
chirac
e1c6c84c72
Merge branch 'former_user_checkbox_fix170' into 'dev'
...
Changed AdherentForm usage and fixed issue #170
See merge request federez/re2o!294
2018-09-20 14:35:41 +02:00
edpibu
2db88d628a
Added checkbox for GTU.
2018-09-20 14:35:01 +02:00
edpibu
d0fdf841cf
Fixed label creation on AdherentCreationForm. Added AdherentEditForm. shell and gpg_fingerprint fields have been moved from AdherentForm to AdherentEditForm.
2018-09-20 14:35:01 +02:00
edpibu
1d107d33f2
Fixed field creation
2018-09-20 14:35:01 +02:00
edpibu
b7359f5b38
Fix 170: Ajout d'une case à cocher pour éviter les doublons de comptes
2018-09-20 14:35:01 +02:00
chirac
eb712c7c6f
Merge branch 'fix_inital_migration' into 'dev'
...
Fix initial migration
See merge request federez/re2o!295
2018-09-20 14:32:28 +02:00
Alexandre Iooss
992dc97024
Fix initial migration
...
Initial migration was failing due to change_facture_pdf not being
initialised at the right time.
2018-09-19 10:06:09 +02:00
Benjamin Graillot
0e56f22fdf
Merge branch 'divers_fix' into 'dev'
...
Divers fix
See merge request federez/re2o!290
2018-09-08 21:49:28 +02:00
detraz
f2c132016f
Les factures sont validées en post_paiement + bug fix paiement relation
2018-09-08 21:17:08 +02:00
detraz
9fdadaf478
Le home est une methode + règle les problèmes de la casse sur le pseudo
2018-09-08 21:17:08 +02:00
detraz
5b347f3db4
Fix, utilise la bonne fonction d'envoie de mails
2018-09-08 21:17:08 +02:00
detraz
52f3d4d550
Not yet member, possibilité de trouver les users pas encore adhérents
2018-09-08 21:17:08 +02:00
chirac
d3271c5cbf
Merge branch 'feature_mailto_link_on_user_profile' into 'dev'
...
Lien pour envoyer un mail directement à un utilisateur sur la page profil
See merge request federez/re2o!289
2018-09-03 12:18:50 +02:00
Hugo LEVY-FALK
6661487306
Lien pour envoyer un mail directement à un utilisateur sur la page profil
2018-09-03 12:12:12 +02:00
klafyvel
712df09f2d
Merge branch 'search_user' into 'dev'
...
Permet la recherche avec telephone et email des users
See merge request federez/re2o!287
2018-09-02 20:29:29 +02:00
detraz
eae05e4b7c
Permet la recherche avec telephone et email des users
2018-09-02 20:22:25 +02:00
