Romain Neutron
|
c07a024a3d
|
Merge pull request #784 from romainneutron/insight-recommendations
[3.9] Insight recommendations
|
2013-11-13 22:48:33 -08:00 |
|
Romain Neutron
|
d974da8be1
|
Remove user specific files from gitignore
|
2013-11-13 17:55:31 +01:00 |
|
Romain Neutron
|
dca6667052
|
Merge branch '3.8'
|
2013-11-13 17:07:45 +01:00 |
|
Romain Neutron
|
73e0d5cb6b
|
Remove thesaurus patchs globals, cleanup
|
2013-11-13 14:54:47 +01:00 |
|
Romain Neutron
|
3e9f3418ce
|
Remove dead code
|
2013-11-13 14:54:47 +01:00 |
|
Romain Neutron
|
954ba1c0b4
|
Remove test functions in loop whenever it's possible
|
2013-11-13 14:32:02 +01:00 |
|
Romain Neutron
|
694aecf752
|
Merge pull request #781 from nlegoff/fix1570_bis
[3.8] Fix #1570 Remove accept tou link if there are no TOU
|
2013-11-12 11:16:53 -08:00 |
|
Romain Neutron
|
21f0df2cfe
|
Merge pull request #779 from romainneutron/http-request
[3.9] Remove http_request
|
2013-11-12 11:16:04 -08:00 |
|
Nicolas Le Goff
|
7c36829f11
|
Fix #1570 Remove accept tou link if there are no TOU
|
2013-11-12 19:59:54 +01:00 |
|
Romain Neutron
|
d7a68dbec3
|
Remove http_request
|
2013-11-12 19:39:22 +01:00 |
|
Romain Neutron
|
5a4b9e5f5f
|
Fix unit tests
|
2013-11-12 19:38:43 +01:00 |
|
Romain Neutron
|
4963349ce3
|
Fix latest merge
|
2013-11-12 19:30:56 +01:00 |
|
Romain Neutron
|
432252f5f8
|
Merge branch '3.8'
Conflicts:
lib/Alchemy/Phrasea/Controller/Admin/TaskManager.php
lib/Alchemy/Phrasea/Controller/Root/Account.php
lib/Alchemy/Phrasea/Core/Version.php
lib/classes/User/Adapter.php
lib/classes/eventsmanager/broker.php
lib/classes/eventsmanager/notify/autoregister.php
lib/classes/eventsmanager/notify/order.php
lib/classes/eventsmanager/notify/register.php
lib/classes/eventsmanager/notify/uploadquarantine.php
lib/classes/eventsmanager/notify/validationdone.php
templates/web/admin/index.html.twig
|
2013-11-12 19:19:13 +01:00 |
|
Romain Neutron
|
421795883c
|
Merge pull request #782 from romainneutron/insight-recommendation
[3.8] Insight recommendations
|
2013-11-12 09:35:58 -08:00 |
|
Romain Neutron
|
a2899f6934
|
Insight recommendations
|
2013-11-12 17:58:03 +01:00 |
|
Romain Neutron
|
7e75591d1a
|
Remove demo file
|
2013-11-12 17:49:58 +01:00 |
|
Romain Neutron
|
80f6209591
|
Merge pull request #773 from romainneutron/fix-1573
[3.8] Fix #1573 : Propose rights reset prior apply template
|
2013-11-12 07:52:16 -08:00 |
|
Romain Neutron
|
07fa4c4911
|
Merge pull request #768 from romainneutron/fix-1571
[3.8] Fix #1571 : Cleanup user settings, fix user settings calls
|
2013-11-12 07:51:09 -08:00 |
|
Romain Neutron
|
cc574ac7bd
|
Bump to 3.8.1 alpha 3
|
2013-11-12 15:16:55 +01:00 |
|
Romain Neutron
|
866a3e94e0
|
Fix events manager eroneous notification availability detection
|
2013-11-12 15:16:55 +01:00 |
|
Romain Neutron
|
bea211074b
|
Fix #1571 : Cleanup user settings, fix user settings calls
|
2013-11-12 15:16:54 +01:00 |
|
Romain Neutron
|
1a2487d398
|
Fix JS codestyle
|
2013-11-12 15:07:16 +01:00 |
|
Romain Neutron
|
9f2f1a4217
|
Fix #1573 : Propose rights reset prior apply template
Conflicts:
templates/web/admin/index.html.twig
|
2013-11-12 13:29:30 +01:00 |
|
Romain Neutron
|
3cf2cbd6f1
|
Merge branch '3.8'
|
2013-11-12 13:26:15 +01:00 |
|
Romain Neutron
|
e48c2cc158
|
Merge pull request #778 from romainneutron/fix-js-cs-3.8
[3.8] Fix JS codestyle
|
2013-11-12 04:24:48 -08:00 |
|
Romain Neutron
|
9fa95db23c
|
Fix JS codestyle
|
2013-11-12 12:49:23 +01:00 |
|
Romain Neutron
|
89fb774f96
|
Merge branch '3.8'
|
2013-11-12 12:10:40 +01:00 |
|
Romain Neutron
|
51fb364d13
|
Merge pull request #776 from romainneutron/fix-js-cs-3.8
[3.8] Fix JS code style
|
2013-11-12 03:09:46 -08:00 |
|
Romain Neutron
|
090451197d
|
Update dependencies
|
2013-11-11 11:34:45 +01:00 |
|
Romain Neutron
|
dc5c12a592
|
Fix JS code style
|
2013-11-11 11:25:52 +01:00 |
|
Romain Neutron
|
cab32f870c
|
Merge pull request #765 from nlegoff/reset_sys_admin_right
[3.9] Add ACL manipulator && Refactor reset sys admin rights
|
2013-11-11 01:45:55 -08:00 |
|
Romain Neutron
|
2072f9e0e0
|
Merge branch '3.8'
Conflicts:
composer.lock
lib/Alchemy/Phrasea/Core/Version.php
|
2013-11-08 19:04:26 +01:00 |
|
Romain Neutron
|
ea6b93b88a
|
Fix typo
|
2013-11-08 18:48:58 +01:00 |
|
Nicolas Le Goff
|
b24b4fdb00
|
Fix #1578 Checks field source validation
|
2013-11-08 18:48:58 +01:00 |
|
Nicolas Le Goff
|
4cef82083c
|
Add ACL Manipulator
|
2013-11-08 17:51:14 +01:00 |
|
Romain Neutron
|
35b20ba9f2
|
Merge pull request #769 from romainneutron/fix-1579
Fix #1579 : Update old geonames server address
|
2013-11-08 04:07:54 -08:00 |
|
Romain Neutron
|
43ae164e67
|
Merge pull request #770 from romainneutron/fix-1574
[3.8] Fix #1574 : Set correct date sort on advanced search reset
|
2013-11-08 02:53:04 -08:00 |
|
Romain Neutron
|
b5e944caf0
|
Fix #1579 : Update old geonames server address
|
2013-11-08 11:52:43 +01:00 |
|
Romain Neutron
|
d2aa52e67b
|
Merge pull request #767 from romainneutron/fix-1577
[3.8] Fix 1577 : Use semantic versioning for Phraseanet
|
2013-11-08 02:50:58 -08:00 |
|
Romain Neutron
|
fec01341b6
|
Fix #1574 : Set correct date sort on advanced search reset
|
2013-11-07 18:34:36 +01:00 |
|
Romain Neutron
|
f8411a604e
|
Fix patch naming mess
|
2013-11-07 17:49:39 +01:00 |
|
Romain Neutron
|
95b0c24d4b
|
Use semver for Phraseanet version numbers
|
2013-11-07 17:49:39 +01:00 |
|
Romain Neutron
|
ac95b907d8
|
Merge pull request #766 from romainneutron/fix-1575
[3.8] Fix #1575 : Allow stemmed search only if stemming is enabled
|
2013-11-07 08:10:35 -08:00 |
|
Romain Neutron
|
cfa726f2ee
|
Fix #1575 : Allow stemmed search only if stemming is enabled
|
2013-11-07 12:12:26 +01:00 |
|
Romain Neutron
|
f39af8b64e
|
Merge branch '3.8'
|
2013-11-06 11:26:47 +01:00 |
|
Romain Neutron
|
973e9f7907
|
Merge pull request #759 from jygaulier/3.8-utest-disconnected
added tests for "phrasea_public_query" and "phrasea_highlight" in consol...
|
2013-11-05 09:06:08 -08:00 |
|
Romain Neutron
|
675520c623
|
Merge pull request #739 from nlegoff/user_manip
[3.9] User notifications are set with user manipulator
|
2013-11-05 09:05:45 -08:00 |
|
Romain Neutron
|
664513ab4c
|
Merge pull request #762 from nlegoff/fix_ie
[3.8] Fix #1564 Fields selection in advanced search is broken
|
2013-11-05 09:05:14 -08:00 |
|
Romain Neutron
|
53b9c4a02c
|
Merge pull request #764 from romainneutron/fix-1566
[3.8] Fix #1566 : Fix basket export
|
2013-11-05 09:04:43 -08:00 |
|
Romain Neutron
|
af312b65f8
|
Merge pull request #763 from romainneutron/fix-1567
[3.8] Fix #1567 : Disallow a user to remove himself from DB
|
2013-11-05 08:09:32 -08:00 |
|