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
12,324 Commits 268 Branches 107 Tags
acb7a53e16a99d8597cfd1ddf784d0db68a0bf9d
Commit Graph

501 Commits

Author SHA1 Message Date
mike-esokia
acb7a53e16 refactor code 2018-05-24 16:43:17 +04:00
Mike Ng
9183bdb6c5 Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-859_validation_special_characters_status 2018-05-24 15:25:51 +04:00
aina-esokia
339de4399b port to 4.1 fix user cvs file import error on windows 2018-05-23 15:43:16 +04:00
mike-esokia
70c12a7086 add validation for special characters in statusbit screen 2018-05-23 11:11:21 +04:00
xrousset78800
81b3e75d3d PHRAS-2007 Update wording keys (#2566) 2018-05-02 18:40:32 +02:00
Nicolas Maillat
236a0c95c7 Merge pull request #2530 from aynsix/PHRAS-1387-update-translation 
PHRAS-1387 update translation
 2018-03-27 10:41:41 +02:00
Mike Ng
ded2b5665a fix geoname autocomplete field and disable chrome autofill 2018-03-23 16:16:48 +04:00
aina-esokia
a136ecf58d update user filter translation 2018-03-22 14:57:05 +04:00
aina-esokia
eb455c7581 update translation 2018-03-21 17:55:19 +04:00
aynsix
ed29948a33 add filter to hide special account in user list (#2522) 2018-03-15 17:04:29 +01:00
Mike Ng
0c55bc7e09 update backend code for PHRAS-1783 2018-02-19 16:07:54 +04:00
Mike Ng
802c52d7ff refatored html code to use proper font-awesome classes 2018-01-19 13:32:20 +04:00
Mike Ng
431d9dc46a migrating dependencies from bower to npm 2018-01-16 09:42:29 +04:00
Mike Ng
4f518c605d Merge branch 'PHRAS-1734_PORT_PHRAS-1589' into PHRAS-1744_PORT_PHRAS-1578_1579_1621_1675_1404_1336 
# Conflicts:
#	resources/locales/messages.de.xlf
#	resources/locales/messages.en.xlf
#	resources/locales/messages.fr.xlf
#	resources/locales/messages.nl.xlf
#	resources/locales/validators.de.xlf
#	resources/locales/validators.en.xlf
#	resources/locales/validators.fr.xlf
#	resources/locales/validators.nl.xlf
#	resources/www/admin/styles/main.scss
 2018-01-09 11:00:03 +04:00
Mike Ng
a08a55b58e Merge branch 'PHRAS-1745_PORT_custom_links' into PHRAS-1735_add_git_log 
# Conflicts:
#	.bowerrc
 2018-01-08 16:37:46 +04:00
Mike Ng
30f49bdd35 resolve conflict 2018-01-08 15:57:13 +04:00
Mike Ng
bddc3781ba resolve conflict 2018-01-08 15:54:47 +04:00
Nicolas Maillat
a0eccc22e8 Merge pull request #2426 from mike-esokia/PHRAS-1783_PORT_PHRAS-1764 
PHRAS-1783 porting PHRAS-1764 to 4.1
 2018-01-08 12:31:05 +01:00
Mike Ng
ed15180c07 porting PHRAS-1764 to 4.1 2018-01-04 15:01:51 +04:00
Mike Ng
071ce25b31 porting PHRAS-1578/PHRAS-1579/PHRAS-1621/PHRAS-1675/PHRAS-1404/PHRAS-1336 to 4.1 2018-01-03 15:26:43 +04:00
Xavier Rousset
c7f6b325d8 PHRAS-1766 Add orderable checkbox for each subdef - Remove order option on groups 2017-12-18 18:02:48 +01:00
Xavier Rousset
3a6f2eb365 Fix travis tests 2017-12-14 11:59:42 +01:00
Xavier Rousset
1683191d19 PHRAS-1719 Add presets selection on subdef admin page 2017-12-13 01:58:36 +01:00
Mike Ng
e0063d00c0 Porting custom-links to 4.1 2017-12-11 17:44:55 +04:00
Mike Ng
36b2058add PORT PHRAS-1555/PHRAS-1568 to 4.1 2017-11-22 15:48:36 +04:00
Nicolas Maillat
43a629169a Merge pull request #2227 from mike-esokia/PHRAS-1516_port_PHRAS-1339 
PHRAS-1516 Port PHRAS-1339
 2017-11-14 14:05:10 +01: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
Mike Ng
a0cad9ec8f Fix localization in datepicker - admin 2017-08-14 10:26:52 +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
Thibaud Fabre
cc6efb0dc9 Merge 4.0 into master 2016-12-06 15:34:13 +01:00
Thibaud Fabre
aa5041dbf4 Change order and wording for base ID in collection details 2016-12-06 14:55:23 +01:00
Thibaud Fabre
97f2e66698 Merge 4.0 branch 2016-12-05 17:04:54 +01:00
Thibaud Fabre
b5bbb1851f Merge branch 4.0 2016-12-05 15:26:48 +01:00
Thibaud Fabre
b84c35ff66 Merge pull request #2022 from xrousset78800/fix/add-warning-message-on-admin 
Add warn message in admin
 2016-12-05 12:26:49 +01:00
Xavier Rousset
cadb9febab PHRAS-1220 Add warn message in admin fields setup 2016-12-02 15:26:31 +01:00
Xavier Rousset
e7dd94d5b8 Fix misplaced icon on admin dashboard 2016-12-01 15:03:34 +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
fd61435468 Improve task manager logs 
Available versions are now sorted by date in descending order
 2016-10-13 15:23:25 +02:00
Xavier Rousset
0b16fd577e PHRAS-1234 Change wording on setup template 2016-09-27 12:24:03 +02:00
Thibaud Fabre
884d59462c Remove autosubmit from order manager list 2016-07-29 15:05:39 +02:00
Thibaud Fabre
303a39e359 Allow removing order masters without adding a new one 2016-07-29 14:46:18 +02:00
Florian BLOUET
de2c283667 PHRAS-1121 - Admin: fix collection reordering 2016-05-26 11:29:42 +02:00
Thibaud Fabre
f4d71eeb63 Display unique collection IDs in collection admin 2016-05-24 17:30:02 +02:00
Florian BLOUET
4e1ebe7b0d PHRAS-1084 - fix admin tooltip conflict 2016-05-11 14:51:12 +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