mirror_php/humhub
1
0
Fork 0
mirror of https://github.com/humhub/humhub.git synced 2025-01-17 22:28:51 +01:00
Code Issues Projects Releases Wiki Activity
3,231 Commits 102 Branches 157 Tags
Commit Graph

3231 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lucas Bartholemy
bd8a0f4d6f Translation message rebuild & combined directory message categories 2017-02-09 18:40:14 +01:00
Lucas Bartholemy
2d35f44b7e Combined all directory translation messages in base category 2017-02-09 18:17:45 +01:00
Lucas Bartholemy
b250924f88 Regenerated translation message files 2017-02-09 17:21:20 +01:00
Lucas Bartholemy
a67900324b Updated translation message archives 2017-02-09 17:17:04 +01:00
Lucas Bartholemy
30eb200965 Merge branch 'Becold-transl-fr' 2017-02-09 16:47:11 +01:00
Lucas Bartholemy
9981e4c240 Merge branch 'transl-fr' of https://github.com/Becold/humhub into Becold-transl-fr 
# Conflicts:
#	protected/humhub/messages/fr/base.php
#	protected/humhub/modules/user/messages/fr/base.php
 2017-02-09 16:46:33 +01:00
Lucas Bartholemy
83d88ced88 Merge branch 'master' of github.com:humhub/humhub 2017-02-09 16:29:35 +01:00
Lucas Bartholemy
4e7af75493 update spelling for internalAllowAnonymousRegistration (danielkesselberg) 2017-02-09 16:29:23 +01:00
Lucas Bartholemy
86071de985 Merge pull request #2239 from acidjames/patch-1 
[security] Update .htaccess
 2017-02-09 16:25:17 +01:00
Lucas Bartholemy
87bcdd7757 Merge pull request #2241 from benmag/patch-1 
Correct PHP Version hint
 2017-02-09 16:24:57 +01:00
Lucas Bartholemy
a06430ebe4 Merge pull request #2246 from glombers/patch-1 
Update error.php
 2017-02-09 16:19:01 +01:00
Lucas Bartholemy
a4eee7e345 Merge pull request #2247 from glombers/patch-2 
Update base.php
 2017-02-09 16:18:19 +01:00
Lucas Bartholemy
734376cb23 Make sure AppDynamicAsset is included after AppAsset 2017-02-09 16:11:39 +01:00
buddh4
b3061399cd Merge pull request #2250 from acs-ferreira/patch-20 
Require PHP >= 5.6
 2017-02-09 16:01:20 +01:00
buddh4
e67a5c2452 Asset Rebuild. 2017-02-09 15:55:32 +01:00
buddh4
4cce8fdf6b Fixed showMore syntax issue. 2017-02-09 15:35:43 +01:00
buddh4
df84ef633d Minified theme.css 2017-02-09 15:26:28 +01:00
buddh4
3a027c8989 Fixed markdown comment rendering. + Added collapsable text to comments. 2017-02-09 15:25:01 +01:00
Carlos Ferreira
f6511ad4ac Update composer.json 2017-02-09 12:30:35 +01:00
buddh4
0182c83c64 Merge branch 'master' of https://github.com/humhub/humhub 2017-02-09 11:20:26 +01:00
buddh4
59e90445f5 Theme rebuild. 2017-02-09 11:20:14 +01:00
Webus
cbcd85c7df Update base.php 
Update base.php Polish language
 2017-02-08 23:55:00 +01:00
Webus
5b75a904ea Update error.php 
Update error.php Polish language
 2017-02-08 23:50:05 +01:00
Lucas Bartholemy
0d9bf69102 Fix: TimeAgo locale not loaded in production mode, added AppDynamicAsset 2017-02-08 23:48:06 +01:00
buddh4
ce76ef0bb9 Fixed Markdown space issue. 2017-02-08 18:27:21 +01:00
buddh4
162bd64671 Fixed search links. 2017-02-08 16:49:11 +01:00
buddh4
7d9f5cd1dc Merge branch 'master' of https://github.com/humhub/humhub 2017-02-08 16:33:10 +01:00
buddh4
1808381e1e Fixed confirm modal + guest user js issues. 2017-02-08 16:32:36 +01:00
Lucas Bartholemy
f74ec8a2f6 Added release date to CHANGELOG.md 2017-02-08 16:11:48 +01:00
buddh4
dc302d8286 Removed client validation in password-recovery form. 2017-02-08 14:47:01 +01:00
buddh4
8cf508e810 Merge branch 'master' of https://github.com/humhub/humhub 2017-02-08 14:46:21 +01:00
buddh4
ee74441921 Fixed guest ActivityStream. 2017-02-08 14:46:03 +01:00
Lucas Bartholemy
710fc99beb Added missing Exception import 2017-02-08 14:40:43 +01:00
Lucas Bartholemy
800049e093 Better error handling on foreign key migrations 2017-02-08 14:40:26 +01:00
Lucas Bartholemy
e2019bb3e4 Merge branch 'master' of github.com:humhub/humhub v1.2.0-beta.1 2017-02-08 12:42:16 +01:00
Lucas Bartholemy
d62b208802 Fixed PolymorphicRelation caching problem 2017-02-08 12:41:58 +01:00
buddh4
dfbc33335b Merge branch 'master' of https://github.com/humhub/humhub 2017-02-08 12:28:26 +01:00
buddh4
afa1d18150 Travis Test alignment. 2017-02-08 12:28:09 +01:00
Lucas Bartholemy
6ba8211fb1 Enhanced user integrity check with contentcontainer validation 2017-02-08 12:27:38 +01:00
Lucas Bartholemy
fce97082f0 Added post integrity checker method 2017-02-08 12:26:39 +01:00
benmag
f1c3e31f59 Correct PHP Version hint 2017-02-08 10:40:43 +10:00
Lucas Bartholemy
0491830670 Only automatically set aliases when not defined yet 2017-02-07 23:54:49 +01:00
Lucas Bartholemy
911884618f Added @webroot-static to Console Application 2017-02-07 23:41:50 +01:00
Lucas Bartholemy
bd237ea6c5 Better MailSummaryProcessor error handling 2017-02-07 19:54:07 +01:00
Lucas Bartholemy
8712d42cda Return null instead of exception when getViewFile not exists 2017-02-07 19:49:30 +01:00
Lucas Bartholemy
c0d4b220df Added @web-static alias in console application 2017-02-07 19:44:45 +01:00
Lucas Bartholemy
e2da89c15c Readded clickable view param to BaseActivity 2017-02-07 18:58:49 +01:00
buddh4
5bed9c0161 Built assets. 2017-02-07 18:56:08 +01:00
Lucas Bartholemy
9ae6e94811 Improved mail summary error handling 2017-02-07 18:08:48 +01:00
Lucas Bartholemy
24fecc9345 Fixed path for activity mail templates 2017-02-07 18:08:11 +01:00