Commits · 267c52dbf10e98027a5f29a7f23535571ff81363 · afi / opacce

Aug 29, 2014
- Merge branch 'dev_15640_customfields_for_trainings' · 267c52db
  Ghislain Loas authored 10 years ago
```
Conflicts:
	VERSIONS
```
  267c52db
- dev #15525 upgrade test to fix failure · 1655c713
  Ghislain Loas authored 10 years ago and Julian Maurice committed 10 years ago
  
  1655c713
- 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 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 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 #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
- 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 #15752 : mail body is a view · 1938885f
  Ghislain Loas authored 10 years ago and Julian Maurice committed 10 years ago
  
  1938885f
- 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
- MAJ VERSIONS · 44c9b2b7
  Ghislain Loas authored 10 years ago and Julian Maurice committed 10 years ago
  
  44c9b2b7
- dev #15695 allow only one pending subscription · 56fdda25
  Ghislain Loas authored 10 years ago and Julian Maurice committed 10 years ago
  
  56fdda25
- dev #15696 implments unsubscribes actions · 5dff8aef
  Ghislain Loas authored 10 years ago and Julian Maurice committed 10 years ago
  
  5dff8aef
- dev #15694 fix too many redirects issus · f5595402
  Ghislain Loas authored 10 years ago and Julian Maurice committed 10 years ago
  
  f5595402
- 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 add login and password to sent mail · 58070400
  Ghislain Loas authored 10 years ago and Julian Maurice committed 10 years ago
  
  58070400
- dev #15695 implement newsletter active user action · 1948807b
  Ghislain Loas authored 10 years ago and Julian Maurice committed 10 years ago
  
  1948807b
- dev #15695 implements send mail for newsletter subscription · 793c4306
  Ghislain Loas authored 10 years ago and Julian Maurice committed 10 years ago
  
  793c4306
- dev #15695 implements news form for newsletter subscription · fa1a29d9
  Ghislain Loas authored 10 years ago and Julian Maurice committed 10 years ago
  
  fa1a29d9
Aug 28, 2014
- dev #15640 Update VERSIONS · 77186e4f
  Alex Arnaud authored 10 years ago and Julian Maurice committed 10 years ago
  
  77186e4f
- 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 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 - refaction of FormationController to extract a SessionController · a30ddb21
  Alex Arnaud authored 10 years ago and Julian Maurice committed 10 years ago
  
  a30ddb21
- dev #15640 - Add custom fields for 'add action' · 379d7c4f
  Alex Arnaud authored 10 years ago and Julian Maurice committed 10 years ago
  
  379d7c4f
- Add custom fields on training form · 1227085d
  Alex Arnaud authored 10 years ago and Julian Maurice committed 10 years ago
  
  1227085d
Aug 27, 2014
- Merge branch 'afi-hotline_6.50' into afi-master · 3826fe57
  Patrick Barroca authored 10 years ago
```
Conflicts:
	VERSIONS
```
  3826fe57
Aug 26, 2014
- 6.50.2 · d1e5b97a
  Patrick Barroca authored 10 years ago
  
  6.50.2
  
  d1e5b97a
- Merge branch 'dev#14279_integrations_exemplaires' into 'master' · c8bd3fa8
  Laurent authored 10 years ago
```
Dev#14279 integrations exemplaires

See merge request !343
```
  c8bd3fa8
- Merge remote-tracking branch 'refs/remotes/origin/master' into dev#14279_integrations_exemplaires · 001dc165
  Laurent authored 10 years ago
```
Conflicts:
	VERSIONS
```
  001dc165
- Merge branch 'hotline#13167_opds_search' into 'hotline_6.50' · d072f39b
  Patrick Barroca authored 10 years ago
```
Hotline#13167 opds search

hotline # 13167 : Do not display search field in admin when the OPDS resource does not provide search.

See merge request !342
```
  d072f39b

Admin message