Master (!365) · Merge requests · afi / opacce

Merged Master

master into dev#14605_library_field_in_purchase_suggestion_form

Merged Ghislain Loas requested to merge master into dev#14605_library_field_in_purchase_suggestion_form 10 years ago

Sep 01, 2014
- VERSIONS + 6.52.0 · c6a9ab55
  gloas authored 10 years ago
  
  c6a9ab55
- Merge branch 'dev_#15525_easy_register_to_newsletter' into 'master' · 327bccf0
  Ghislain Loas authored 10 years ago
```
Dev #15525 easy register to newsletter

See merge request !362
```
  327bccf0
- Merge branch 'hotline_6.50' · 403e5677
  gloas authored 10 years ago
```
Conflicts:
	VERSIONS
	cosmogramme/php/classes/classe_notice_integration.php
```
  403e5677
- fix link avis edit / add · 231a8ac3
  gloas authored 10 years ago
  
  231a8ac3
- fix test failures on avis edit link · c93d62d1
  gloas authored 10 years ago
  
  c93d62d1
- hotline #15778 fix failures + implements liste_format in Class CriteresRechercche · 8287f64f
  Ghislain Loas authored 10 years ago
  
  8287f64f
- remove xdebug_break() · 1deeb159
  Ghislain Loas authored 10 years ago
  
  1deeb159
- ressurect public/captcha/.gitignore · 5bb3521c
  Ghislain Loas authored 10 years ago
  
  5bb3521c
- fix syntax + translation of newsletter · 52353487
  Ghislain Loas authored 10 years ago
  
  52353487
Aug 29, 2014
- Merge branch 'hotline#15778_keep_liste_format_in_pager' into 'hotline_6.50' · 223652a1
  Meusburger authored 10 years ago
```
Hotline#15778 keep liste format in pager

See merge request !358
```
  223652a1
- hotline # 15778 : Keep liste_format parameter in pager for results list. · 07d29cf9
  Matthias Meusburger authored 10 years ago
  
  07d29cf9
- Merge branch 'dev_15640_customfields_for_trainings' · 267c52db
  Ghislain Loas authored 10 years ago
```
Conflicts:
	VERSIONS
```
  267c52db
- dev #15525 fix login and email size (limited in sql) · 81320763
  Ghislain Loas authored 10 years ago and Julian Maurice committed 10 years ago
  
  81320763
- dev #15525 remove guest from autosubscribe newsletter · 47377b59
  Ghislain Loas authored 10 years ago and Julian Maurice committed 10 years ago
  
  47377b59
- dev #15525 fix performance isssu on users loader · d69fb286
  Ghislain Loas authored 10 years ago and Julian Maurice committed 10 years ago
  
  d69fb286
- dev #15525 add space between message and log action · 39a084d4
  Ghislain Loas authored 10 years ago and Julian Maurice committed 10 years ago
  
  39a084d4
- dev #15525 upgrade test to fix failure · 1655c713
  Ghislain Loas authored 10 years ago and Julian Maurice committed 10 years ago
  
  1655c713
- dev #15525 s'abonner to s'inscrire · 87ef9862
  Ghislain Loas authored 10 years ago and Julian Maurice committed 10 years ago
  
  87ef9862
- dev #15525 add space between message · 74958144
  Ghislain Loas authored 10 years ago and Julian Maurice committed 10 years ago
  
  74958144
- dev #15525 change .it to .com · fa97bda3
  Ghislain Loas authored 10 years ago and Julian Maurice committed 10 years ago
  
  fa97bda3
- dev #15525 fix mail spelling · 2e7c69c7
  Ghislain Loas authored 10 years ago and Julian Maurice committed 10 years ago
  
  2e7c69c7
- dev #15525 Fix versions · 0a5db641
  Ghislain Loas authored 10 years ago and Julian Maurice committed 10 years ago
  
  0a5db641
- dev #15752 : mail body is a view · 1938885f
  Ghislain Loas authored 10 years ago and Julian Maurice committed 10 years ago
  
  1938885f
- dev #15696 user has only one subscription by newsletter · 48bc93c7
  Ghislain Loas authored 10 years ago and Julian Maurice committed 10 years ago
  
  48bc93c7
- dev #15696 fix key unicity · c676fb32
  Ghislain Loas authored 10 years ago and Julian Maurice committed 10 years ago
  
  c676fb32
- dev #15696 : user activation delete all pending users with same key · 4c17b6be
  Ghislain Loas authored 10 years ago and Julian Maurice committed 10 years ago
  
  4c17b6be
- dev #15695 display message when an error occured in sending mail process · 8e93a249
  Ghislain Loas authored 10 years ago and Julian Maurice committed 10 years ago
  
  8e93a249
- MAJ VERSIONS · 44c9b2b7
  Ghislain Loas authored 10 years ago and Julian Maurice committed 10 years ago
  
  44c9b2b7
- dev #15752 : refacto mail generation in controller, delete unused view helper · 6d5d49b4
  Ghislain Loas authored 10 years ago and Julian Maurice committed 10 years ago
  
  6d5d49b4
- dev #15694 fix too many redirects issus · f5595402
  Ghislain Loas authored 10 years ago and Julian Maurice committed 10 years ago
  
  f5595402
- dev #15696 implments unsubscribes actions · 5dff8aef
  Ghislain Loas authored 10 years ago and Julian Maurice committed 10 years ago
  
  5dff8aef
- dev #15695 allow only one pending subscription · 56fdda25
  Ghislain Loas authored 10 years ago and Julian Maurice committed 10 years ago
  
  56fdda25
- dev #15694 implements logging user action · 02c42a09
  Ghislain Loas authored 10 years ago and Julian Maurice committed 10 years ago
  
  02c42a09
- dev #15694 add login link in newsletter-register · abbb3b63
  Ghislain Loas authored 10 years ago and Julian Maurice committed 10 years ago
  
  abbb3b63
- dev #15694 newsletter widget is now visible when your are no connected · 449e0906
  Ghislain Loas authored 10 years ago and Julian Maurice committed 10 years ago
  
  449e0906
- dev #15695 implements news form for newsletter subscription · fa1a29d9
  Ghislain Loas authored 10 years ago and Julian Maurice committed 10 years ago
  
  fa1a29d9
- dev #15695 implement newsletter active user action · 1948807b
  Ghislain Loas authored 10 years ago and Julian Maurice committed 10 years ago
  
  1948807b
- dev #15695 add login and password to sent mail · 58070400
  Ghislain Loas authored 10 years ago and Julian Maurice committed 10 years ago
  
  58070400
- dev #15695 implements send mail for newsletter subscription · 793c4306
  Ghislain Loas authored 10 years ago and Julian Maurice committed 10 years ago
  
  793c4306
Aug 28, 2014
- dev #15640 Update VERSIONS · 77186e4f
  Alex Arnaud authored 10 years ago and Julian Maurice committed 10 years ago
  
  77186e4f
- dev #15640 - Add custom fields for 'add action' · 379d7c4f
  Alex Arnaud authored 10 years ago and Julian Maurice committed 10 years ago
  
  379d7c4f
- dev #15640 Fix trainings printing since refactoring · bb401739
  Alex Arnaud authored 10 years ago and Julian Maurice committed 10 years ago
  
  bb401739
- dev #15640 UserGroups fix cascade deletion of users and groups · 0805f709
  Alex Arnaud authored 10 years ago and Julian Maurice committed 10 years ago
  
  0805f709
- dev #15640 fix display of CkEditor in printing list · 6512942f
  Alex Arnaud authored 10 years ago and Julian Maurice committed 10 years ago
  
  6512942f
- dev #15640 - refaction of FormationController to extract a SessionController · a30ddb21
  Alex Arnaud authored 10 years ago and Julian Maurice committed 10 years ago
  
  a30ddb21
- Add custom fields on training form · 1227085d
  Alex Arnaud authored 10 years ago and Julian Maurice committed 10 years ago
  
  1227085d
Aug 27, 2014
- Update VERSIONS · 55574df4
  Patrick Barroca authored 10 years ago
  
  55574df4
- Merge branch 'hotline#15767_use_Bokeh_for_validation_email' into 'hotline_6.50' · ef8a3952
  Patrick Barroca authored 10 years ago
```
Hotline#15767 use bokeh for validation email

Use Bokeh instead of AFI-OPAC for article validation email.

See merge request !351
```
  ef8a3952
- hotline # 15767 : Use Bokeh instead of AFI-OPAC for article validation email. · 93ef0ee7
  Matthias Meusburger authored 10 years ago
  
  93ef0ee7
- Update VERSIONS · 8e4e6f22
  Patrick Barroca authored 10 years ago
  
  8e4e6f22
- Merge branch 'hotline#15779_fix_newsletter_with_catalog' into 'hotline_6.50' · 395cf93e
  Patrick Barroca authored 10 years ago
```
Hotline#15779 fix newsletter with catalog

See merge request !349
```
  395cf93e
- hotline # 15779 : Fix newsletter with catalog. · cd0125fc
  Matthias Meusburger authored 10 years ago
  
  cd0125fc
- Merge branch 'hotline#15759_fix_patron_parsing' into 'hotline_6.50' · f9679a40
  Patrick Barroca authored 10 years ago
```
Hotline#15759 fix patron parsing

See merge request !348
```
  f9679a40
- hotline # 15759: Fix patron parsing · 9cae4113
  Matthias Meusburger authored 10 years ago
```
 Card number were wrongly unset in some cases.
```
  9cae4113

Admin message

Master

Merge request reports

Activity