Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Adding show_completed argument to iCall #3897

Open
wants to merge 61 commits into
base: develop
Choose a base branch
from
Open

Adding show_completed argument to iCall #3897

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
61 commits
Select commit Hold shift + click to select a range
5c49aff
Adding show_completed argument to iCall
sanchezfauste Jul 17, 2017
6072102
Adding the abily to relate a Note with a Campaign
isleshocky77 Nov 29, 2017
694bf06
PSR-2 Convert tabs to spaces
isleshocky77 Dec 5, 2017
dc226fd
Code Format after tab -> spaces conversion
isleshocky77 Dec 5, 2017
84d69bf
Remove duplicate array key (clean warning)
isleshocky77 Dec 5, 2017
db5e166
Remove fullcalendar
Dillon-Brown Jan 2, 2019
cd67610
Fixed #3057 - FullCalendar update to version 3.1
Dillon-Brown Jan 2, 2019
5f4f128
Fixed #4511 - Upgrade of TinyMCE to latest 4.7.x version
Dillon-Brown Jan 2, 2019
818852e
Remove tinyMCE
Dillon-Brown Jan 2, 2019
a8837a0
Fixed #3100 - Upgrade for HTML Purifier [Request]
Dillon-Brown Jan 2, 2019
a6333ac
Merge pull request #6714 from gymad/develop_elasticpager_fix
Dillon-Brown Jan 7, 2019
56561b5
Merge branch 'develop' into tiny_mce
Dillon-Brown Jan 9, 2019
a076e9c
Merge pull request #6730 from Dillon-Brown/issue-6720
Dillon-Brown Jan 9, 2019
bf3271b
Merge branch 'develop' into fullcalendar
Dillon-Brown Jan 9, 2019
bd4aa13
Merge branch 'develop' into fullcalendar
Dillon-Brown Jan 16, 2019
c229b9e
Cleaning up the clean cache command
isleshocky77 Jan 22, 2019
aabff5c
Merge branch 'develop' into fix-clean-cache-command-config-cache-dir
Dillon-Brown Mar 3, 2019
b7d8b9a
Code formatting
isleshocky77 Mar 6, 2019
0582a6a
Merge remote-tracking branch 'upstream/develop' into feature/campaign…
Dillon-Brown Mar 14, 2019
442cf01
Reformat
Dillon-Brown Mar 14, 2019
be49f33
Fix test
Dillon-Brown Mar 14, 2019
8b57242
Merge pull request #4606 from isleshocky77/feature/campaign-notes
samus-aran Mar 14, 2019
b061fc8
Formatting
Dillon-Brown Mar 14, 2019
27e4e18
Merge pull request #6802 from isleshocky77/fix-clean-cache-command-co…
Dillon-Brown Mar 15, 2019
a9aa0e4
Merge remote-tracking branch 'upstream/develop' into fullcalendar
Dillon-Brown Mar 27, 2019
38f4085
Fixes #7111 - composer: include mpdf/mpdf 6.1 and drop in-tree versio…
lazka Mar 27, 2019
213de07
Merge remote-tracking branch 'upstream/hotfix' into develop_merge
Dillon-Brown Mar 29, 2019
d909b4e
Merge pull request #6702 from Dillon-Brown/fullcalendar
code-ph0y Apr 3, 2019
2fe0bb9
Merge branch 'develop' into develop_merge
Dillon-Brown Apr 5, 2019
1379f15
Merge pull request #6703 from Dillon-Brown/htmlpurifier
samus-aran Apr 23, 2019
a1d2618
Merge remote-tracking branch 'upstream/master' into develop_merge
Dillon-Brown May 2, 2019
df290d6
Merge remote-tracking branch 'origin/develop_merge' into develop_merge
Dillon-Brown May 2, 2019
7edbe5f
Update composer.lock
Dillon-Brown May 2, 2019
3e907f8
Merge pull request #7131 from Dillon-Brown/develop_merge
Dillon-Brown May 3, 2019
09d2bad
Add pclzip/pclzip to composer
Dillon-Brown May 14, 2019
9a58be8
Remove pclzip references
Dillon-Brown May 14, 2019
2d60c82
Remove pclZip from include
Dillon-Brown May 14, 2019
a9cc143
Update composer.lock
Dillon-Brown May 14, 2019
6116fcb
Remove zip_utils.php
Dillon-Brown May 14, 2019
fd0e8d6
Reformat php_zip_utils.php
Dillon-Brown May 14, 2019
d9b6745
Update composer
Dillon-Brown May 15, 2019
d420b79
Merge remote-tracking branch 'upstream/develop' into tiny_mce
Dillon-Brown May 15, 2019
ee513c4
Update composer
Dillon-Brown May 15, 2019
3672f1e
Update tinymce references
Dillon-Brown May 15, 2019
6284ef7
Add tedivm/jshrink to composer
Dillon-Brown May 17, 2019
fae83e4
Remove Minifier.php
Dillon-Brown May 17, 2019
18784cb
Fixed #7027 - Use a maintained library to minify JS
Dillon-Brown May 17, 2019
b65ef7e
Merge remote-tracking branch 'upstream/develop' into fix-mpdf-composer
Dillon-Brown May 17, 2019
4017c9d
Update composer
Dillon-Brown May 17, 2019
71912ca
PHP 5.6 compat
Dillon-Brown May 17, 2019
769b35a
Merge pull request #6699 from Dillon-Brown/tiny_mce
code-ph0y May 20, 2019
9dd07d3
Merge branch 'develop' into fix-mpdf-composer
Dillon-Brown May 20, 2019
956176e
Merge pull request #7118 from lazka/fix-mpdf-composer
Dillon-Brown May 20, 2019
3e1acaa
Merge branch 'develop' into issue-7027
code-ph0y May 23, 2019
7973c8c
Merge pull request #7295 from Dillon-Brown/issue-7027
cameronblaikie May 23, 2019
a4962b9
Merge remote-tracking branch 'upstream/develop' into feature/plcZip
Dillon-Brown May 29, 2019
3991262
Update composer.lock
Dillon-Brown May 29, 2019
af1ad31
Merge remote-tracking branch 'upstream/develop' into feature/plcZip
Dillon-Brown May 29, 2019
3e703b4
Update composer.lock
Dillon-Brown May 29, 2019
0b7909a
Merge pull request #7287 from Dillon-Brown/feature/plcZip
Dillon-Brown Jun 7, 2019
c51fde5
Merge branch 'develop' into ical_show_completed
sanchezfauste Aug 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update composer
  • Loading branch information
@Dillon-Brown
Dillon-Brown committed May 15, 2019
commit ee513c4338fd7256f2c7c751560ad04a10918326
3 changes: 2 additions & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,8 @@
"symfony/yaml": "^3.4",
"tuupola/slim-jwt-auth": "^2.0",
"wikimedia/composer-merge-plugin": "^1.4",
"fullcalendar/fullcalendar": "^3.9"
"fullcalendar/fullcalendar": "^3.9",
"tinymce/tinymce": "^4.9"
},
"require-dev": {
"browserstack/browserstack-local": "^1.1",
Expand Down
87 changes: 67 additions & 20 deletions composer.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.