hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-23 18:03:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,926 Commits 268 Branches 107 Tags
4c820d9cedd4ebbeb59486fc7a96cf7f6f555ba8
Commit Graph

11926 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nicolas Maillat
4c820d9ced Translated using Weblate (English) 
Currently translated at 99.8% (2281 of 2284 strings)
 2017-08-28 17:11:10 +02:00
Jennifer
ccaf69b0c4 Translated using Weblate (German) 
Currently translated at 100.0% (5 of 5 strings)
 2017-08-28 17:11:10 +02:00
Nicolas Maillat
fa603256da Translated using Weblate (French) 
Currently translated at 99.8% (2281 of 2284 strings)
 2017-08-28 17:11:10 +02:00
Nicolas Maillat
860ae74d23 Translated using Weblate (French) 
Currently translated at 99.8% (2281 of 2284 strings)
 2017-08-28 17:11:10 +02:00
Nicolas Maillat
453c21d190 Translated using Weblate (English) 
Currently translated at 99.8% (2281 of 2284 strings)
 2017-08-28 17:11:10 +02:00
Nicolas Maillat
0cb2f895f2 Translated using Weblate (French) 
Currently translated at 99.8% (2281 of 2284 strings)
 2017-08-28 17:11:10 +02:00
Nicolas Maillat
510a27cf07 Translated using Weblate (English) 
Currently translated at 99.8% (2281 of 2284 strings)
 2017-08-28 17:11:10 +02:00
Anthony C
91317460ce Translated using Weblate (English) 
Currently translated at 99.8% (2280 of 2284 strings)
 2017-08-28 17:11:10 +02:00
Anthony C
29ecbcace3 Translated using Weblate (French) 
Currently translated at 99.8% (2280 of 2284 strings)
 2017-08-28 17:11:10 +02:00
moctardiouf
c715f6319e Translated using Weblate (French) 
Currently translated at 99.8% (2280 of 2284 strings)
 2017-08-28 17:11:10 +02:00
Anthony C
8e38eaae21 Translated using Weblate (French) 
Currently translated at 99.8% (2280 of 2284 strings)
 2017-08-28 17:11:10 +02:00
Nicolas Maillat
b03b050b33 Translated using Weblate (French) 
Currently translated at 99.6% (2276 of 2284 strings)
 2017-08-28 17:11:09 +02:00
Nicolas Maillat
0fcd88b6ca Merge pull request #2222 from mike-esokia/PHRAS-1505_port_PHRAS-1399 
PHRAS-1505 port PHRAS-1399
 2017-08-28 17:12:49 +02:00
Nicolas Maillat
376a9d79d9 Merge pull request #2221 from mike-esokia/PHRAS-1504_port_PHRAS-392 
PHRAS-1504 port PHRAS-392
 2017-08-28 16:56:43 +02:00
Nicolas Maillat
4c03eb6997 Merge pull request #2220 from mike-esokia/PHRAS-1503_port_PHRAS-1400 
PHRAS-1503 port PHRAS-1400
 2017-08-28 16:40:27 +02:00
mike-esokia
4c7228b702 update gulp-sass and bower (#2234) 2017-08-28 15:41:22 +02:00
Mike Ng
d72739672d update dependencies 2017-08-25 11:42:45 +04:00
Mike Ng
c27f9728cf update dependencies 2017-08-25 11:31:56 +04:00
Mike Ng
f467398bfc update dependencies 2017-08-25 10:39:26 +04:00
Mike Ng
64ad521d61 add filter to user list 2017-08-03 14:31:03 +04:00
Mike Ng
a07bfecd85 add feedback and reload side menu when activating collection 2017-08-03 11:55:53 +04:00
Mike Ng
9e258cfae4 fix navigation user list and refactor layout 2017-08-02 17:18:53 +04:00
Nicolas Maillat
888440529e Merge pull request #2135 from moctardiouf/patch-6 
PHRAS-1409_fix-push-list-management-error-500_master
 2017-07-04 09:49:20 +02:00
moctardiouf
cf0440dda6 PHRAS-1409_fix-push-list-management-error-500 2017-06-14 11:05:19 +02:00
moctardiouf
e591a4160f PHRAS-1359_remove_back_slash_n (#2098) 
removing \n into SQL requests causing memcached content deletion issues.
 2017-05-18 11:04:20 +02:00
Nicolas Maillat
4386cb6391 Merge pull request #2083 from xrousset78800/fix/update-ansible-provisionning 
Update Vagrant provisionning (master).
 2017-05-10 12:10:17 +02:00
jygaulier
ef7d3e365a Update main.yml 2017-05-04 15:55:31 +02:00
jygaulier
2ab7dcdd26 Update main.yml 2017-05-04 15:39:49 +02:00
jygaulier
addb445835 Update main.yml 2017-05-04 15:25:41 +02:00
Nicolas Maillat
42b49e5e08 Merge pull request #2081 from bryant1410/master 
Fix broken headings in Markdown files
 2017-05-04 14:31:10 +02:00
Xavier Rousset
3c3d324fc5 Go travis ! go ! 2017-05-03 12:08:30 +02:00
Xavier Rousset
9b2ffed737 Update Vagrant provisionning. fix mariaDB vars names, fix windows.sh paths 2017-04-21 18:08:29 +02:00
Santiago Castro
326d1375ad Fix broken Markdown headings 2017-04-16 21:03:41 -03:00
jygaulier
bc53f83db8 PHRAS-1304_BUMP-PROD-LIB (#2071) 
* Bump lib Phraseanet-production-client to 0.19.24 (fixed jquery-ui dependency)

* fix circle-ci build due to broken lib
 2017-03-01 11:36:52 +01:00
jygaulier
f668ddd3ac PHRAS-1304_AUTO-COMPLETION_MASTER_2 (#2065) 
bump lib  "Phraseanet-production-client" to 0.32.0
 2017-02-15 17:34:54 +01:00
jygaulier
f8075ce313 PHRAS-1304_AUTO-COMPLETION_MASTER_2 (#2064) 
* PHRAS-1304_AUTO-COMPLETION_MASTER_2
bump lib  "Phraseanet-production-client" to 0.31.0

* PHRAS-1304_AUTO-COMPLETION_MASTER_2
bump lib  "Phraseanet-production-client" to 0.30.0

* Update package.json

bump to 0.31 due to auto-increment by npm publish
 2017-02-09 20:05:30 +01: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
Thibaud Fabre
cefb2f99f4 Merge pull request #2033 from alchemy-fr/4.0 
Port PHRAS-1292 in master
 2016-12-19 13:41:41 +01:00
Nicolas Maillat
3547d33ba3 Change right mask to asset dir PHRAS-1294 
Change right mask to asset dir PHRAS-1294 into master
 2016-12-12 16:45:02 +01:00
Nicolas Maillat
b151faaba7 Change right mask to asset dir PHRAS-1294 
Change right mask to asset dir PHRAS-1294
 2016-12-12 16:44:02 +01:00
jygaulier
f412a031b9 Update BuildSubdefs.php 2016-12-12 14:46:44 +01:00
jygaulier
0f491e640a Update BuildSubdefs.php 2016-12-12 14:44:55 +01:00
Nicolas Maillat
1657d96610 add bin/developer orm:generate-proxies deployement 
add bin/developer orm:generate-proxies for automated deployement
 2016-12-12 11:25:45 +01:00
Nicolas Maillat
e8d0bfc6dc Merge pull request #2034 from jygaulier/PHRAS-1293_CLI-BUILD-SUBDEFS-RECORDS-IGNORED 
PHRAS-1293_CLI-BUILD-SUBDEFS-RECORDS-IGNORED
 2016-12-09 10:36:00 +01:00
Jean-Yves Gaulier
a16ce93110 PHRAS-1293_CLI-BUILD-SUBDEFS-RECORDS-IGNORED 
- fix : no more subdefs ignored when mode=scheduled
- change : --min_record is now --min_record_id ; --max_record is now --max_record_id
- add : options --maxrecs, --maxduration, --ttl
 2016-12-08 19:34:45 +01:00
Thibaud Fabre
eb329096fd Merge pull request #2032 from jygaulier/PHRAS-1292_BAD-CHARS-IN-PERMALINKS 
PHRAS-1292_BAD-CHARS-IN-PERMALINKS
 2016-12-07 18:45:59 +01:00
Jean-Yves Gaulier
a88608636a PHRAS-1292_BAD-CHARS-IN-PERMALINKS 
fix : some invalid chars are now replaced by "_" in permalinks labels
 2016-12-07 16:29:21 +01:00
Thibaud Fabre
cc6efb0dc9 Merge 4.0 into master 2016-12-06 15:34:13 +01:00
Thibaud Fabre
6a7e8830db Merge pull request #2031 from alchemy-fr/feature/admin-collection-id 
Change order and wording for base ID in collection details
 2016-12-06 15:32:40 +01:00
Thibaud Fabre
7ac6318436 Merge pull request #2030 from alchemy-fr/fix/config-file-permissions 
PHRAS-1289 Add group rights to compiled configuration
 2016-12-06 15:32:29 +01:00