hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-12 04:23:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,668 Commits 268 Branches 107 Tags
00979f2d6d256e8b8ff580090acb5ba80f498ebd
Commit Graph

245 Commits

Author SHA1 Message Date
aina esokia
215562ab74 PHRAS-3256 take in account langage in mail 2021-02-03 11:44:42 +03:00
jygaulier
99be4ea1d3 WIP DO NOT MERGE 
- add : route GET:records
- add : route POST:records (can create a record without document)
- add : json can be passed in body OR in a multiparm parm named "body" (to allow upload of file along with json)
- change : story content (children) is now a list of urls (=get action on each child)
 2020-09-17 18:57:13 +02:00
aynsix
92502d8caa search user on like %...% 2020-05-29 11:25:37 +03:00
aynsix
2545d41e8d trim email from form 2020-04-23 12:14:40 +03:00
aynsix
ca2611f4c9 Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-2979-41-fix-right-access 2020-03-18 14:18:34 +03:00
aynsix
597216429a fix right access and right on story elements per user 2020-03-12 16:16:41 +03:00
Nicolas Maillat
4714f7b95d Merge branch 'master' into PHRAS-2680-webhook-privacy-and-security 2020-02-26 20:15:37 +01:00
gjacobjn
2f02cef4b0 Update Edit.php 2020-02-06 10:48:16 +01:00
Nicolas Maillat
8019cc3bd0 Merge branch 'master' into PHRAS-2680-webhook-privacy-and-security 2019-09-30 15:49:33 +02:00
aynsix
5d8132b08d user webhook: registration and delete 2019-09-20 18:01:23 +04:00
Jean-Yves Gaulier
3ae0c94863 PHRAS-2666_slow-notifications_4.1 
fix bad fct arg type "string"
!!! WIP !!!
 2019-07-25 17:33:21 +02:00
Jean-Yves Gaulier
2fcbd7e6d7 PHRAS-2666_slow-notifications_4.1 
removed join on basket_elements where useless
code style + type hints
!!! WIP !!!
 2019-07-25 17:23:10 +02:00
aynsix
9809e8f176 modify create guest account and filter guest user (#2534) 2018-06-14 19:16:10 +02:00
mike-esokia
75db45ee87 PORT PHRAS-1879 to 4.1 (#2515) 2018-03-15 17:09:45 +01:00
aynsix
ed29948a33 add filter to hide special account in user list (#2522) 2018-03-15 17:04:29 +01:00
Mike Ng
30f49bdd35 resolve conflict 2018-01-08 15:57:13 +04:00
Mike Ng
e9e9a737c3 PORT PHRAS-1559 and PHRAS-1560 to 4.1 2017-12-13 10:26:24 +04:00
jygaulier
a70bf2fc70 PHRAS-1304_AUTO-COMPLETION_MASTER (#2061) 
* PHRAS-1304_AUTO-COMPLETION_MASTER
ported from 4.0

* PHRAS-1304_AUTO-COMPLETION_MASTER
fix

* PHRAS-1304_AUTO-COMPLETION_MASTER
fix

* PHRAS-1304_AUTO-COMPLETION_MASTER
bump php version to 5.5.31 (5.5.21 is obsolete in cicleci)

* PHRAS-1304_AUTO-COMPLETION_MASTER
bump php version to 5.5.31 : php.ini moved in circelci

* PHRAS-1304_AUTO-COMPLETION_MASTER
add zmq & date to php for circleci

* PHRAS-1304_AUTO-COMPLETION_MASTER
add zmq

* PHRAS-1304_AUTO-COMPLETION_MASTER
bump amqp

* PHRAS-1304_AUTO-COMPLETION_MASTER
downgrade amqp to 1.2 to test compilation against old librabbit 0.4 (ubuntu)

* PHRAS-1304_AUTO-COMPLETION_MASTER
add amqp.so to php.ini, (re)bump amqp to 1.6

* PHRAS-1304_AUTO-COMPLETION_MASTER
build rabittmq from git

* PHRAS-1304_AUTO-COMPLETION_MASTER
build rabittmq from git again

* PHRAS-1304_AUTO-COMPLETION_MASTER
build rabittmq from git again and again

* PHRAS-1304_AUTO-COMPLETION_MASTER
fix test on media rotation 600*400 -> 400*599 !!!

* PHRAS-1304_AUTO-COMPLETION_MASTER
restore facebook sdk to 4.0.1 due to mistake

* PHRAS-1304_AUTO-COMPLETION_MASTER
deleted unwanted file
 2017-02-06 18:26:56 +01:00
Jean-Yves Gaulier
0c75189a64 PHRAS-508_acl-cache 
- refactor : acl strings changed to ACL class constants
 - code cleanup
 - wip but try to merge for bc break test
 2016-10-26 16:13:47 +02:00
Jean-Yves Gaulier
642da0fca5 PHRAS-508_acl-cache 
- wip
 2016-10-26 16:13:47 +02:00
Jean-Yves Gaulier
6a2285f66d PHRAS-508_acl-cache 
- wip
 2016-10-26 16:13:47 +02:00
Thibaud Fabre
d924a8aad5 Fix JSON schema decode error 2016-05-17 23:17:10 +02:00
Benoît Burnichon
1e18b3e69f This is a combination of 33 commits. 
- Squashed Pull request #1730
- Squashed Pull request #1741
- Squashed Pull request #1742
- Squash merge branch 4.0
- Squashed Pull request #1744
- Squashed Pull request #1746
- Squashed merge branch 4.0
- Squashed merge branch 4.0
- Squashed merge branch 4.0
- Squashed merge branch 4.0
- Squashed Pull request #1758
- Avoid using imagine/imagine alias as it is causing install issues
- Squashed merge branch 4.0
- Squashed Pull request #1763
- Squashed merge branch 4.0
- Squash of 6 commits
- Squashed merge branch 4.0
- This is a combination of 2 commits.
- Squashed Pull request #1775
- Squashed Pull request #1777
- Squashed Pull request #1779
- Squashed Pull request #1780
- Squashed Pull request #1782
- Adds a Pull request template
- Squased Pull request #1783
- Squash Pull request #1786
- Squashed Pull request #1796
- Squashed merge branch 4.0
- Squash Pull request #1791
- Squashed merge branch 4.0
- Squashed Pull request #1808
- Squashed Pull request #1811
- Squashed Pull request #1809
 2016-04-20 16:22:14 +02:00
Florian BLOUET
4efc2dbba2 PHRAS-681 - fix variable initialisation 2016-02-17 15:09:30 +01:00
Florian BLOUET
a7b124940f PHRAS-681 - add missing initialisation for variable 2016-02-17 15:09:30 +01:00
Florian BLOUET
91edc4d822 PHRAS-681 - fix default value of advanced search options: sort value and sort order 2016-02-17 15:09:30 +01:00
Benoît Burnichon
d5bf3b742e Twig uses users User_Query instance, not result iterable 
Introduced by fad68369ca in PR #1690 PHRAS-962
 2016-02-15 15:08:15 +01:00
Benoît Burnichon
59e5b0b0e8 Reformat array and add offset_start variable 2016-02-12 17:29:22 +01:00
Benoît Burnichon
bf3d3ae8f1 Remove useless property 2016-02-12 17:29:22 +01:00
Benoît Burnichon
fad68369ca Remove possible bugs in UserManage helper 2016-02-12 17:29:22 +01:00
Benoît Burnichon
ae97ad90e6 Method renaming to remove underscores 2016-02-12 17:29:21 +01:00
Benoît Burnichon
f6f6feb4e9 Group generation of Email confirmation 2016-02-12 16:41:17 +01:00
Thibaud Fabre
c92d5da9fe Merge branch 'clean-boxes' into merge-clean-boxes 2016-01-06 19:53:43 +01:00
Benoît Burnichon
51023c5533 bump copyright year 2016-01-05 13:38:14 +01:00
Benoît Burnichon
30b8ec66ed Add API add/remove elements. Change prod basket management 2015-12-22 17:44:34 +01:00
Benoît Burnichon
985ec4a491 Extract JsonBodyHelper and use it 2015-12-22 14:24:32 +01:00
Jean-Yves Gaulier
ef7de07b1a #PHRAS-610 #time 10h 2015-08-18 16:50:55 +02:00
Jean-Yves Gaulier
3ac83408fc #PHRAS-610 #time 2d 
WIP
 2015-08-17 15:18:33 +02:00
Thibaud Fabre
ea6a4fdbf0 Extract repository and factory classes for collections 2015-07-09 12:32:06 +02:00
Benoît Burnichon
f920e8354a Replace phraseanet.appbox by getApplicationBox() method calls. 2015-07-02 12:33:19 +02:00
Benoît Burnichon
d645b92afa Add AclAware Trait 2015-07-02 12:33:18 +02:00
Benoît Burnichon
4880f2bf5a Add getAuthenticator usage 
Replace $app['authentication']->getUser() by $app->getAuthenticatedUser()
replace twig app['authentication'].getUser() with corresponding method
 2015-07-02 12:33:18 +02:00
Benoît Burnichon
6e651f3b07 Replace app['phraseanet.appbox']->get_databox using trait 2015-07-02 12:27:26 +02:00
Benoît Burnichon
7be5e332db Add LazyLocator 2015-06-04 12:22:47 +02:00
Benoît Burnichon
32204ebe7c Refactor PrinterController 2015-05-25 12:22:04 +02:00
Benoît Burnichon
beabf90fdf Refactor Notifier 2015-05-12 21:05:29 +02:00
Benoît Burnichon
feddae6ac7 UserController refactor 2015-04-01 10:23:05 +02:00
Benoît Burnichon
932ab09dc0 Remove some possible SQL injections by using IN (:parameter) prepared statements 2015-03-12 15:08:24 +01:00
Mathieu Darse
63eaaf1596 Merge remote-tracking branch 'upstream/master' into elastic-indexer 
Conflicts:
	composer.lock
	www/scripts/apps/admin/main/app.js
 2015-03-10 15:25:20 +01:00
Nicolas Le Goff
ed3ffb59a6 Merge remote-tracking branch 'upstream/master' into 20150306-elastic-indexer 
Conflicts:
	bin/console
	bower.json
	composer.json
	composer.lock
	lib/Alchemy/Phrasea/Application.php
	lib/Alchemy/Phrasea/Border/Manager.php
	lib/Alchemy/Phrasea/Controller/Api/V1.php
	lib/Alchemy/Phrasea/Core/PhraseaEvents.php
	lib/Alchemy/Phrasea/SearchEngine/SearchEngineOptions.php
	lib/classes/caption/field.php
	lib/classes/record/Interface.php
	templates/web/prod/index.html.twig
	www/skins/prod/000000/prodcolor.css
 2015-03-10 14:36:31 +01:00