Commit Graph

44603 Commits

Author SHA1 Message Date
Laurent Destailleur
bca0ccb4e3 Merge pull request #2088 from marcosgdf/bug-1691
Fixed [ bug #1691 ] Don't think the ID should be displayed in holiday module
2014-11-28 01:01:52 +01:00
Laurent Destailleur
806719b562 Merge pull request #2089 from marcosgdf/bug-1718
Fixed [ bug #1718 ] Mistakenly searching for text in amount field breaks
2014-11-28 00:37:56 +01:00
Laurent Destailleur
d9cb9c1585 Merge pull request #2102 from aspangaro/develop-center
Task 1603 - Remove <center> deprecated HTML5 tags
2014-11-27 23:58:44 +01:00
Laurent Destailleur
f01c5d0ea3 Merge pull request #2111 from frederic34/patch-13
Update Invoice Preview to be like order and propal preview
2014-11-27 23:25:49 +01:00
Laurent Destailleur
e6d200d83a Merge pull request #2104 from frederic34/patch-10
Rearrange Help Block in left menu
2014-11-27 23:19:18 +01:00
Frédéric FRANCE
bc58641828 Update Invoice Preview to be like order and propal preview 2014-11-27 22:07:18 +01:00
Laurent Destailleur
60e5369db2 Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
	htdocs/bookmarks/card.php
2014-11-27 22:01:02 +01:00
Laurent Destailleur
8d33a6947b Merge pull request #2105 from frederic34/patch-11
Fix 1733 Homepage boxes close button translation error
2014-11-27 21:51:00 +01:00
Laurent Destailleur
d4ac3c96dd Merge pull request #2108 from frederic34/patch-14
Update Order Preview
2014-11-27 21:50:21 +01:00
Laurent Destailleur
6f3dde8a9b Merge pull request #2109 from frederic34/patch-15
Update Invoice Preview
2014-11-27 21:50:09 +01:00
Laurent Destailleur
8a8f9aaee3 Merge pull request #2106 from frederic34/patch-12
Fix 1655 Proposal amount not computed in preview
2014-11-27 21:49:43 +01:00
Frédéric FRANCE
6483b34d0d Update apercu.php 2014-11-27 21:03:51 +01:00
Frédéric FRANCE
f769295999 Update apercu.php 2014-11-27 21:03:01 +01:00
Frédéric FRANCE
950fad9227 Update apercu.php 2014-11-27 17:49:48 +01:00
Laurent Destailleur
0fc768fefc Merge pull request #2107 from frederic34/patch-13
Fix 1660 ECM tabs help tooltips not showing
2014-11-27 13:57:01 +01:00
Laurent Destailleur
9088ca943b Merge pull request #2110 from aternatik/fix_ws_3.7
Missing extrafields management for order webservice
2014-11-27 13:56:40 +01:00
jfefe
1b35c5e77b Missing extrafields management for order webservice 2014-11-27 12:56:10 +01:00
Frédéric FRANCE
755732ce58 Update apercu.php 2014-11-26 20:35:08 +01:00
Frédéric FRANCE
96e0ecd1a7 Update Invoice Preview 2014-11-26 20:07:47 +01:00
Frédéric FRANCE
238b139274 Update apercu.php 2014-11-26 19:52:38 +01:00
Frédéric FRANCE
2ee55a39fd Update ecm.lib.php 2014-11-26 18:35:16 +01:00
Frédéric FRANCE
2a25f990ac Fix 1660 ECM tabs help tooltips not showing 2014-11-26 18:33:03 +01:00
Frédéric FRANCE
e179e7d5a5 Fix 1655 Proposal amount not computed in preview 2014-11-26 17:24:26 +01:00
Frédéric FRANCE
90b582b1f3 Fix 1733 Homepage boxes close button translation error
In french : Close -> Clotûrer (Close a propal)
Close2 ->Fermer (Close a window)
2014-11-26 16:58:54 +01:00
Frédéric FRANCE
ebc0f842fc Rearrange Help Block in left menu 2014-11-26 16:48:37 +01:00
aspangaro
38d94bac33 Correct login page 2014-11-25 21:47:08 +01:00
aspangaro
559bf93acb Correct 2014-11-25 20:40:00 +01:00
aspangaro
c4c69e191b Replace <center> tags 2014-11-25 20:13:43 +01:00
Laurent Destailleur
ab25b149c5 Fix: Download of user files 2014-11-24 15:40:40 +01:00
Marcos García de La Fuente
082f67a6e4 Fixed [ bug #1718 ] Mistakenly searching for text in amount field breaks 2014-11-24 12:49:33 +01:00
Marcos García de La Fuente
d9958efcd7 Fixed [ bug #1691 ] Don't think the ID should be displayed in holiday module 2014-11-24 12:45:46 +01:00
aspangaro
ef991e6c5d HTML5 - <center> is deprecated - Need CSS - continue working 2014-11-24 06:43:15 +01:00
aspangaro
c56af23faa Merge remote-tracking branch 'Upstream/develop' into develop-center 2014-11-24 05:20:59 +01:00
Laurent Destailleur
bc1d88d324 Fixed: The visualization of status with mutualized picto was lost, so i
restore old feature to keep same visual for all status and add hidden
option to switch to new.
2014-11-24 01:16:26 +01:00
Laurent Destailleur
29bfe7050d Fix: W3C. 2014-11-24 01:11:30 +01:00
Marcos García de La Fuente
3ab8cff641 Removed unused action of card.php 2014-11-24 01:09:11 +01:00
Marcos García de La Fuente
6304895d75 Fixed typo 2014-11-24 01:05:18 +01:00
Marcos García de La Fuente
601710a4dc Highlight of required fields should be only in edit mode
Conflicts:
	htdocs/bookmarks/card.php
2014-11-24 01:05:01 +01:00
Laurent Destailleur
9b9e6403ae Merge pull request #2081 from marcosgdf/bookmarks
Fixed several problems with bookmarks page
2014-11-24 01:02:31 +01:00
Marcos García de La Fuente
6159591a02 Fixed [ bug #1679 ] Can't sort groups by user count in user groups list 2014-11-24 01:01:33 +01:00
Laurent Destailleur
dc63388746 Merge pull request #2082 from marcosgdf/bug-1679
Fixed [ bug #1679 ] Can't sort groups by user count in user groups list
2014-11-24 01:01:07 +01:00
Laurent Destailleur
00031cbdab Merge pull request #2085 from frederic34/patch-2
Put label into div
2014-11-24 00:59:38 +01:00
Laurent Destailleur
ca1a21012e Merge pull request #2086 from aspangaro/3.7-patch1
Patch module resource
2014-11-24 00:58:41 +01:00
Laurent Destailleur
71e3eb006d Merge pull request #2087 from aspangaro/develop-search
Add function purge criteria in project module
2014-11-24 00:58:07 +01:00
Laurent Destailleur
891e39189a Fixed: missing css class 2014-11-23 23:31:35 +01:00
Laurent Destailleur
7a18240d2f Doxygen 2014-11-23 23:22:49 +01:00
aspangaro
bbdd25f97c Add function purge criteria in project module 2014-11-23 21:37:45 +01:00
aspangaro
aa8c165f06 Presentation 2014-11-23 21:03:34 +01:00
aspangaro
aa4f16ce99 Add resource language file in transifex 2014-11-23 21:02:49 +01:00
Frédéric FRANCE
6cc79c2dd7 Put label into div 2014-11-23 18:42:48 +01:00