Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10000 commits
Select commit Hold shift + click to select a range
e4385d2
Merge pull request #1249 from NewSpring/pre-alpha-sync
briankalwat Sep 27, 2021
90ca1d3
Merge pull request #1250 from NewSpring/alpha
briankalwat Sep 27, 2021
7b3bdd5
updated card list to use linkurl property first when linking an item …
briankalwat Oct 6, 2021
c00b5c4
Merge pull request #1251 from NewSpring/missions-giving
briankalwat Oct 6, 2021
076d3e8
updated datasets by channel layout
briankalwat Oct 6, 2021
e2d43a5
Merge pull request #1253 from NewSpring/missions-giving
briankalwat Oct 6, 2021
92ce00d
Merge pull request #1252 from NewSpring/alpha
briankalwat Oct 6, 2021
f0463cb
Merge pull request #1254 from NewSpring/beta
briankalwat Oct 6, 2021
f1de163
+ Fixed issue where a Workflow with a Workflow Entry Form could produ…
MikeDPeterson Sep 23, 2021
849987d
Merge pull request #1255 from NewSpring/workflows-cherry-pick
briankalwat Oct 7, 2021
46c3e81
Merge pull request #1256 from NewSpring/alpha
briankalwat Oct 7, 2021
6fcbe69
Merge pull request #1257 from NewSpring/beta
briankalwat Oct 7, 2021
324285d
fixed web.config conflicts
briankalwat Oct 20, 2021
c1e501c
Merge pull request #1258 from NewSpring/pre-alpha-sync
briankalwat Oct 20, 2021
c209f28
Merge pull request #1259 from NewSpring/alpha
briankalwat Oct 20, 2021
0e6ab70
- (Lava) Fixed an issue with date filters not correctly parsing DST d…
david-j-leigh Oct 22, 2021
1e30d03
Merge pull request #1260 from NewSpring/date-fix
briankalwat Oct 26, 2021
3669c9d
Merge pull request #1261 from NewSpring/alpha
briankalwat Oct 26, 2021
1a5ee05
fixed conflict in LavaFilters.cs
briankalwat Nov 9, 2021
304b4f0
updated appveyor deploy scripts to backup/restore web agility files f…
briankalwat Nov 9, 2021
c187de4
Merge pull request #1262 from NewSpring/pre-alpha-sync
briankalwat Nov 9, 2021
af4701b
Merge pull request #1263 from NewSpring/alpha
briankalwat Nov 9, 2021
1075432
theme updates for new homepage and site styling
briankalwat Nov 22, 2021
b3987eb
Merge branch 'alpha' of https://github.com/NewSpring/Rock into pre-al…
briankalwat Nov 22, 2021
65d3605
Merge pull request #1265 from NewSpring/pre-alpha-sync
briankalwat Nov 22, 2021
d93bf4c
Merge pull request #1266 from NewSpring/alpha
briankalwat Nov 22, 2021
eca8c41
Merge branch 'alpha' of https://github.com/NewSpring/Rock into homepa…
briankalwat Nov 22, 2021
c29b537
theme changes for new homepage updates
briankalwat Nov 30, 2021
cf092ce
updated newspring theme layouts to remove page constrained attribute …
briankalwat Nov 30, 2021
363c2aa
more theme changes to fix issues with sermons/series layouts
briankalwat Nov 30, 2021
deef17f
Merge pull request #1267 from NewSpring/homepage-updates
briankalwat Nov 30, 2021
c90c817
more theme changes to fix issues with giving layouts
briankalwat Nov 30, 2021
bd03235
more theme changes to fix issues with giving layouts
briankalwat Nov 30, 2021
f7e8a1e
update to staff layout
briankalwat Nov 30, 2021
9097927
Merge pull request #1269 from NewSpring/homepage-updates
briankalwat Nov 30, 2021
5682251
Merge pull request #1268 from NewSpring/alpha
briankalwat Nov 30, 2021
5883c2d
Merge pull request #1264 from NewSpring/beta
briankalwat Nov 30, 2021
1a7f237
added null condition check for dynamic grid rows
briankalwat Nov 30, 2021
a42d355
updated hero to not show background image and video at the same time
briankalwat Nov 30, 2021
e66c64b
updates to accordion to make it more robust at narrow breakpoints
briankalwat Nov 30, 2021
60d0b5d
updated locations info include to account for gray background behind …
briankalwat Nov 30, 2021
d7f8cda
Merge pull request #1270 from NewSpring/homepage-updates
briankalwat Nov 30, 2021
17f84ff
Merge pull request #1271 from NewSpring/alpha
briankalwat Nov 30, 2021
5da85b0
Merge branch 'master' into beta
briankalwat Nov 30, 2021
bffa77b
Merge pull request #1272 from NewSpring/beta
briankalwat Nov 30, 2021
f504dde
updated before deploy and post deploy ps scripts to correctly referen…
briankalwat Dec 1, 2021
2d7badf
Merge pull request #1273 from NewSpring/deploy-script-updates
briankalwat Dec 1, 2021
6cce454
script updates for dynamic grids to account for all block combos
briankalwat Dec 6, 2021
55a820f
removed unused class from being added to js-col elements
briankalwat Dec 6, 2021
2adaf85
Merge pull request #1274 from NewSpring/dynamic-grids
briankalwat Dec 6, 2021
7451b32
Merge pull request #1275 from NewSpring/alpha
briankalwat Dec 6, 2021
b533772
- Fixed several issues on Notes where Add/Edit/Reply might not work c…
Dec 7, 2021
7a94c60
Merge pull request #1277 from NewSpring/cherry-pick
briankalwat Dec 8, 2021
18f2da5
Merge pull request #1278 from NewSpring/alpha
briankalwat Dec 8, 2021
9e4a241
Merge pull request #1276 from NewSpring/beta
briankalwat Dec 8, 2021
47c5629
feed updates to get all data from persisted datasets
briankalwat Dec 15, 2021
41d9acc
Merge pull request #1281 from NewSpring/feed-updates
briankalwat Dec 15, 2021
993c444
Resolved conflicts
ns-brandonwilson Jan 3, 2022
b22f3c3
updated locations staff lava to hide duplicates
briankalwat Jan 3, 2022
0a64416
Merge pull request #1282 from NewSpring/staff-duplicates
briankalwat Jan 3, 2022
a520340
Merge pull request #1283 from NewSpring/pre-alpha-sync
ns-brandonwilson Jan 3, 2022
5851b11
Merge pull request #1284 from NewSpring/alpha
briankalwat Jan 3, 2022
e4b5fdf
finalizing layout changes
briankalwat Jan 5, 2022
329835f
Merge pull request #1285 from NewSpring/layout-updates
briankalwat Jan 5, 2022
a921034
Merge pull request #1286 from NewSpring/alpha
briankalwat Jan 5, 2022
284725d
Merge pull request #1287 from NewSpring/beta
ns-brandonwilson Jan 6, 2022
4c6beb8
accordion icon fix
briankalwat Jan 6, 2022
84b8433
Merge pull request #1288 from NewSpring/layout-updates
briankalwat Jan 6, 2022
1f5960d
Merge pull request #1289 from NewSpring/alpha
briankalwat Jan 6, 2022
6f0965d
Merge pull request #1290 from NewSpring/beta
briankalwat Jan 6, 2022
ec9e8fa
Updated Read Your Bible link in NewSpring.cc footer
ns-brandonwilson Jan 12, 2022
4ba506d
Merge pull request #1291 from NewSpring/footer-update
briankalwat Jan 13, 2022
8308c08
Updated card-list lava layout to use LinkUrl
briankalwat Jan 20, 2022
09104f0
Merge pull request #1292 from NewSpring/card-list-linkurl
briankalwat Jan 20, 2022
b44b19b
resolved conflicts
briankalwat Feb 7, 2022
1afdddb
Merge pull request #1293 from NewSpring/pre-alpha-sync
briankalwat Feb 7, 2022
43867ea
Merge pull request #1294 from NewSpring/alpha
briankalwat Feb 7, 2022
3be3b9b
rewrote dynamic columns to check all blocks instead of just the ones …
briankalwat Feb 8, 2022
151f5a3
Merge pull request #1296 from NewSpring/dynamic-columns
briankalwat Feb 8, 2022
0ca0e8d
Merge pull request #1297 from NewSpring/alpha
briankalwat Feb 8, 2022
251aeea
Merge pull request #1295 from NewSpring/beta
briankalwat Feb 10, 2022
857f483
Merge branch 'alpha' of https://github.com/NewSpring/Rock into pre-al…
briankalwat Feb 20, 2022
46321d6
Merge pull request #1298 from NewSpring/pre-alpha-sync
briankalwat Feb 20, 2022
f49f19e
Merge pull request #1299 from NewSpring/alpha
briankalwat Feb 21, 2022
4ee0f71
Merge pull request #1300 from NewSpring/beta
briankalwat Feb 28, 2022
c60a013
fixed conflict with alpha
briankalwat Apr 11, 2022
12d6658
Merge pull request #1301 from NewSpring/pre-alpha-sync
briankalwat Apr 11, 2022
62611f2
Merge pull request #1302 from NewSpring/alpha
briankalwat Apr 11, 2022
a42c428
- Fixed Conflicts
briankalwat Apr 19, 2022
83a7568
Merge pull request #1303 from NewSpring/pre-alpha-sync
briankalwat Apr 19, 2022
9784c35
Merge pull request #1304 from NewSpring/alpha
briankalwat Apr 19, 2022
b3835f6
- removed commit reqs, changes for locations pages.
briankalwat Apr 25, 2022
960bff1
- added support for inline videos within card components
briankalwat Apr 25, 2022
30ce58f
- added support for inline videos within card components
briankalwat Apr 25, 2022
886ea6c
Merge pull request #1306 from NewSpring/cards
briankalwat Apr 25, 2022
03e46de
Merge pull request #1307 from NewSpring/alpha
briankalwat Apr 25, 2022
7eb8638
- lava templates for events pages/locations changes
briankalwat May 24, 2022
5dac8aa
- fixed conflicts in Rock.sln
briankalwat May 24, 2022
63d4c27
- pre alpha 14.0.10 and 14.0.11
briankalwat May 24, 2022
eb8db1e
Merge pull request #1308 from NewSpring/pre-alpha-sync
briankalwat May 24, 2022
dfed7c4
Merge pull request #1309 from NewSpring/alpha
briankalwat May 24, 2022
d7dc37b
+ (Check-in) Fixed check-in to always disable autocomplete. (Fixes #5…
garrettjohnson May 20, 2022
543dfbe
Merge pull request #1310 from NewSpring/autocomplete-fix
briankalwat May 31, 2022
932041f
Merge pull request #1311 from NewSpring/alpha
briankalwat May 31, 2022
c7007ee
Merge pull request #1305 from NewSpring/beta
briankalwat May 31, 2022
93abce7
- putting a pin in events for a moment
briankalwat Jun 7, 2022
aa77e06
- (Lava) Fixed the SQL block to correctly return null values for null…
david-j-leigh May 18, 2022
fa3dbaa
Merge pull request #1312 from NewSpring/hotfix-dates
briankalwat Jun 7, 2022
e03f5b7
Merge pull request #1313 from NewSpring/alpha
briankalwat Jun 7, 2022
ea8deaa
Merge branch 'master' into beta
briankalwat Jun 7, 2022
6a2507c
Merge pull request #1314 from NewSpring/beta
briankalwat Jun 7, 2022
cb7fbb3
Merge branch 'alpha' of https://github.com/NewSpring/Rock into events…
briankalwat Jun 9, 2022
8026bad
Merge branch 'alpha' of https://github.com/NewSpring/Rock into pre-al…
briankalwat Jun 9, 2022
b1ea34f
Merge pull request #1315 from NewSpring/pre-alpha-sync
briankalwat Jun 9, 2022
7fddc0c
Merge pull request #1316 from NewSpring/alpha
briankalwat Jun 9, 2022
00bb8f1
Merge branch 'master' into beta
briankalwat Jun 9, 2022
8e9b62a
Merge branch 'alpha' of https://github.com/NewSpring/Rock into events…
briankalwat Jun 13, 2022
ddf34c6
- changes for news and events
briankalwat Jun 16, 2022
0b1a7ac
- finishing up with locations news and events
briankalwat Jun 23, 2022
15db3b2
- final initial updates to events
briankalwat Jul 12, 2022
acaa020
Merge pull request #1318 from NewSpring/events
briankalwat Jul 12, 2022
b16bed9
Merge branch 'alpha' of https://github.com/NewSpring/Rock into sync-p…
briankalwat Jul 18, 2022
5ecb1b3
Merge pull request #1319 from NewSpring/sync-pre-alpha
briankalwat Jul 18, 2022
f68d6cc
Merge pull request #1320 from NewSpring/alpha
briankalwat Jul 18, 2022
4caf15a
Merge branch 'alpha' of https://github.com/NewSpring/Rock into pre-al…
briankalwat Aug 29, 2022
76edf0c
Merge pull request #1321 from NewSpring/pre-alpha-sync
briankalwat Aug 29, 2022
5243ea0
Merge pull request #1322 from NewSpring/alpha
briankalwat Aug 29, 2022
f710d14
Merge branch 'alpha' of https://github.com/NewSpring/Rock into pre-al…
briankalwat Sep 21, 2022
ac45e15
Merge pull request #1323 from NewSpring/pre-alpha-sync
briankalwat Sep 21, 2022
d77a34a
Merge pull request #1324 from NewSpring/alpha
briankalwat Sep 21, 2022
4cb6344
Merge pull request #1317 from NewSpring/beta
briankalwat Oct 3, 2022
733a9f0
- Fixed issue where the download payments job might not download MyWe…
MikeDPeterson Oct 13, 2022
087f2ce
Merge pull request #1325 from NewSpring/download-payments
briankalwat Oct 18, 2022
2376a7d
Merge pull request #1326 from NewSpring/alpha
briankalwat Oct 18, 2022
d5a5865
Merge pull request #1327 from NewSpring/beta
briankalwat Oct 18, 2022
857e313
- fixed conflicts
briankalwat Nov 29, 2022
992f95e
- Fixed broken login using ActiveDirectory authentication.
ethan-sparkdevnetwork Dec 6, 2022
951aba3
Merge pull request #1329 from NewSpring/pre-alpha-sync
briankalwat Dec 11, 2022
e1eea5e
Merge pull request #1330 from NewSpring/alpha
briankalwat Dec 11, 2022
f10ff0c
Merge pull request #1331 from NewSpring/beta
briankalwat Dec 11, 2022
6ac1c6c
- Improved validation when calculating the ValueAs properties of Attr…
cabal95 Nov 29, 2022
5f0b0cf
Merge pull request #1332 from NewSpring/giving-automation
briankalwat Jan 2, 2023
8a40f66
Merge pull request #1333 from NewSpring/alpha
briankalwat Jan 2, 2023
58532f3
Merge branch 'master' into beta
briankalwat Jan 2, 2023
d46fc94
Merge pull request #1334 from NewSpring/beta
briankalwat Jan 2, 2023
3d28f7d
- fixed conflicts
briankalwat Apr 11, 2023
947b224
- added theme directory from prod
briankalwat Apr 11, 2023
186717c
Merge pull request #1345 from NewSpring/beta
briankalwat Apr 13, 2023
32e170e
- Rerodered RockCleanup tasks to execute PersonAge and AgeBracket upd…
Kwame-Agyei Apr 6, 2023
624c558
- (Crm) Fixed issue with incorrect age classification after updating …
Kwame-Agyei Apr 12, 2023
3c5215f
Merge pull request #1353 from NewSpring/cherry-picks
briankalwat Apr 18, 2023
f4e050d
Merge pull request #1354 from NewSpring/alpha
briankalwat Apr 18, 2023
11036b8
Merge branch 'master' into beta
briankalwat Apr 18, 2023
350e550
Merge pull request #1355 from NewSpring/beta
briankalwat Apr 18, 2023
00cdde8
- Fixed issue where schedule change not updating group attendance occ…
joshuahenninger Apr 13, 2023
8f6bc0e
- cherry pick fixing typo for posting attendance, fixed broken icon r…
briankalwat Apr 24, 2023
d3a9dca
Merge pull request #1356 from NewSpring/post-attendance-cp
briankalwat Apr 24, 2023
1ed379c
Merge pull request #1357 from NewSpring/alpha
briankalwat Apr 24, 2023
fe6614d
Merge pull request #1358 from NewSpring/beta
briankalwat Apr 24, 2023
a8484da
- Added additional logging when the Update Persisted DataViews job ru…
jasonhendee Apr 25, 2023
1b23504
Merge pull request #1359 from NewSpring/logging-cherry-pick
briankalwat Apr 27, 2023
ab238d2
Merge pull request #1360 from NewSpring/alpha
briankalwat Apr 27, 2023
f965e2e
Merge pull request #1361 from NewSpring/beta
briankalwat Apr 27, 2023
b946588
- changes for about and beliefs pages
briankalwat Apr 27, 2023
3a5c093
- (Reporting) Update Data View expression builder to use persisted va…
jasonhendee Apr 27, 2023
4b0ea10
- Updated DataView Statistics update implementation to update in batc…
Kwame-Agyei Apr 21, 2023
4cde7e7
- Update ProcessWorkflows job to only fetch the workflows that are ac…
nairdo Apr 28, 2023
0c5dd7d
Merge pull request #1363 from NewSpring/performance
briankalwat May 1, 2023
a3fb279
Merge pull request #1364 from NewSpring/alpha
briankalwat May 1, 2023
3e68f3f
Merge branch 'master' into beta
briankalwat May 1, 2023
b469195
Merge pull request #1365 from NewSpring/beta
briankalwat May 1, 2023
05e0f54
- updated giving-history lava template to support contribution statem…
briankalwat May 1, 2023
fd51309
Merge pull request #1366 from NewSpring/giving-history
briankalwat May 2, 2023
2f26b7f
Merge pull request #1362 from NewSpring/about-beliefs
briankalwat May 2, 2023
b059ea5
- fixed conflicts
briankalwat May 14, 2023
b90f444
- Fixed rare race condition with inline shortcodes.
cabal95 May 5, 2023
da10923
- Modified the Rock Cleanup job to improve the efficiency of the pers…
david-j-leigh May 4, 2023
da1a2cd
- Cache AssetFieldType URI value (TextValue) for 60 seconds to avoid …
nairdo May 13, 2023
568fe2c
- (Reporting) Updated Group Sync job to use same Rock context for upd…
croske May 12, 2023
7c6d42c
Merge pull request #1368 from NewSpring/pre-alpha-sync
briankalwat May 14, 2023
7e69ab1
Merge pull request #1367 from NewSpring/alpha
briankalwat May 14, 2023
877304a
Merge pull request #1369 from NewSpring/beta
briankalwat May 22, 2023
b009c91
- fixed conflicts
briankalwat Jun 6, 2023
96d7eae
Merge pull request #1370 from NewSpring/pre-alpha-sync
briankalwat Jun 6, 2023
e0d02a5
Merge pull request #1371 from NewSpring/alpha
briankalwat Jun 6, 2023
40f1820
- fixed lava formatting issue with secondary nav shortcode
briankalwat Jun 8, 2023
80085f5
- removed source files for new theme, updated compiled styles
briankalwat Jun 8, 2023
0cc4532
Merge pull request #1372 from NewSpring/pre-alpha-sync
briankalwat Jun 8, 2023
6a0a000
Merge pull request #1373 from NewSpring/alpha
briankalwat Jun 8, 2023
8a022c2
Merge pull request #1374 from NewSpring/beta
briankalwat Jun 12, 2023
32ff3b2
- updated locations news lava template to check campuses via array in…
briankalwat Jun 12, 2023
acd6fc4
- added need to know news lava template
briankalwat Jun 12, 2023
68a4c76
Merge pull request #1375 from NewSpring/news-col-fix
briankalwat Jun 12, 2023
0350427
Merge pull request #1376 from NewSpring/alpha
briankalwat Jun 12, 2023
528aa33
Merge pull request #1377 from NewSpring/beta
briankalwat Jun 12, 2023
df1c89e
- updated weekly metrics dashboard lava to rename variables to not st…
briankalwat Jun 21, 2023
be47328
- updated campuses dataset source file, weekly metrics dashboard lava…
briankalwat Jun 27, 2023
d7e661c
- added topical content lava layout
briankalwat Jun 27, 2023
c5bf2c5
- updated content digest layout to account for fluid changes to Modulo?
briankalwat Jun 27, 2023
2b4fb7e
- removed unused lava from page-header ui template that was causing i…
briankalwat Jun 27, 2023
1af444a
- replaced sermon detail shortcode with lava from database, updated w…
briankalwat Jun 27, 2023
27cc838
- replaced more templates with code from db, fixed fluid issue w/side…
briankalwat Jun 27, 2023
4b4e368
- updated get permalink for fluid
briankalwat Jun 27, 2023
0a750fc
- fixed issue with campus events cards, replaced events cards templat…
briankalwat Jun 27, 2023
cdcc7fb
- updated getPermalink lava template
briankalwat Jun 27, 2023
444246f
- more fixes for fluid
briankalwat Jun 27, 2023
d2119f8
- fluid changes for events, editorial lava templates
briankalwat Jun 28, 2023
8446044
- updates/additions to lava templates for persisted dataset build scr…
briankalwat Jun 28, 2023
18e1fbb
- added more dataset lava templates
briankalwat Jun 28, 2023
6172d54
- updated dynamic select lava to be fluid compatible
briankalwat Jun 28, 2023
d804427
- updated card lava layout with code from database, updated get image…
briankalwat Jun 28, 2023
48e8767
- fixed malformed conditional in wistia embed lava
briankalwat Jun 28, 2023
147bd8a
- fixed variable issue w/topical content lava template
briankalwat Jun 28, 2023
8946bde
- fixed staff layout and date comparison conditional in editorial layout
briankalwat Jun 28, 2023
cca19a0
Merge pull request #1378 from NewSpring/fluid
briankalwat Jul 5, 2023
f19f21e
Merge pull request #1379 from NewSpring/alpha
briankalwat Jul 5, 2023
62aaf56
Merge pull request #1380 from NewSpring/beta
briankalwat Jul 6, 2023
67cd77f
- more fluid lava changes
briankalwat Jul 6, 2023
caef784
Merge branch 'alpha' of https://github.com/NewSpring/Rock into pre-al…
ns-brandonwilson Jul 17, 2023
1b86802
Resolved merge conflicts
ns-brandonwilson Jul 18, 2023
06eb2bf
Merge pull request #1381 from NewSpring/pre-alpha-sync
ns-brandonwilson Jul 18, 2023
31298cb
Added BackgroundImageSquare attribute to Content Channel Items by Cha…
ns-brandonwilson Jul 20, 2023
434e75e
Merge pull request #1383 from NewSpring/content-channel-dataset-build…
ns-brandonwilson Jul 20, 2023
e41ef4e
- updated new theme styles for locations pages changes
briankalwat Aug 2, 2023
2afd334
- updated secondary nav w/more spacing
briankalwat Aug 2, 2023
959c4e4
Merge branch 'alpha' of https://github.com/NewSpring/Rock into pre-al…
ns-brandonwilson Aug 3, 2023
90728b3
Merge pull request #1385 from NewSpring/pre-alpha-sync
ns-brandonwilson Aug 3, 2023
498d758
Merge branch 'alpha' of https://github.com/NewSpring/Rock into fluid
briankalwat Aug 7, 2023
deec67d
Merge pull request #1387 from NewSpring/locations-item
briankalwat Aug 7, 2023
714a61d
- updated staff lava layout to 404 if a group is not identified
briankalwat Aug 7, 2023
c9580db
- updated locations swiper to redirect fuse locations cards to main l…
briankalwat Aug 7, 2023
9fe8771
Merge branch 'alpha' of https://github.com/NewSpring/Rock into pre-al…
briankalwat Aug 8, 2023
de074cd
Merge pull request #1388 from NewSpring/pre-alpha-sync
briankalwat Aug 8, 2023
f956541
Merge branch 'alpha' of https://github.com/NewSpring/Rock into fluid
briankalwat Aug 9, 2023
f6bdd7e
- (Check-in) Fixed issue where the Live Metrics block can cause Rock …
jasonhendee Aug 9, 2023
a8e164a
Merge pull request #1391 from NewSpring/pre-alpha-sync
briankalwat Aug 9, 2023
a350f68
Merge branch 'alpha' of https://github.com/NewSpring/Rock into fluid
briankalwat Aug 14, 2023
60553ae
- more theme updates for fluid
briankalwat Aug 22, 2023
73b117d
Merge pull request #1393 from NewSpring/fluid
briankalwat Aug 22, 2023
5c5bb97
- more lava updates for fluid
briankalwat Oct 3, 2023
24c1302
Merge pull request #1396 from NewSpring/fluid
briankalwat Oct 3, 2023
1e59868
- added followings script to theme
briankalwat Oct 17, 2023
f54c46e
- added trending content dataset build script lava template
briankalwat Oct 17, 2023
799349b
- updates for articles
briankalwat Oct 23, 2023
3418fc4
- fixed conflicts
briankalwat Oct 23, 2023
a508265
- fixed conflicts
briankalwat Oct 23, 2023
1df7da4
Merge pull request #1399 from NewSpring/pre-alpha-sync
briankalwat Oct 23, 2023
163cb6f
Merge branch 'alpha' of https://github.com/NewSpring/Rock into articles
briankalwat Oct 23, 2023
ad87b7d
- updated ad unit lava from prod
briankalwat Oct 24, 2023
8a7da4d
- updated footer lava from prod
briankalwat Oct 24, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
21 changes: 0 additions & 21 deletions .githooks/commit-msg

This file was deleted.

49 changes: 11 additions & 38 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
## DESCRIPTION

## Notice
### What does this PR do, or why is it needed?

**In case you are submitting a non bug-fix-PR, we highly recommend you to engage in a PR discussion first.**

Expand All @@ -13,46 +14,18 @@ With the PR discussion we can assess your proposed changes before you start work
3. Have one of our core developers make the changes for you. This may be the case if the change involves intricate tasks like an EF migration or something similar.


## Proposed Changes
## TODO

<!--
Describe the big picture of your changes here to communicate to the maintainers why we should accept this pull request. If it fixes a bug or resolves a feature request, be sure to link to that issue.
- [ ] I am affirming this is my _best_ work ([Ecclesiastes 9:10](https://www.bible.com/bible/97/ECC.9.10.MSG))
- [ ] PR has a relevant title that will be understandable in a public changelog (ie...non developers)
- [ ] Testing info includes any items that need to be added to a local Rock instance in order to test and/or the database against which it can be tested.
- [ ] Upload GIF(s) of relevant changes
- [ ] Set a relevant reviewer

Please include screenshots if your pull request either alters existing UI or provides new UI. Arrows and labels are helpful.
-->

Fixes: #
- [ ] Review code through the lens of being concise, simple, and well-documented
- [ ] Manual QA to ensure the changes look/behave as expected

## Types of changes

What types of changes does your code introduce to Rock?
_Put an `x` in the boxes that apply_

- [ ] Bugfix (non-breaking change which fixes an issue)
- [ ] New feature (non-breaking change which adds functionality, which has been approved by the core team)
- [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected)

## Checklist

_Put an `x` in the boxes that apply. You can also fill these out after creating the PR. If you're unsure about any of them, don't hesitate to ask. We're here to help! This is simply a reminder of what we are going to look for before merging your code._

- [ ] This is a single-commit PR. (If not, please squash your commit and re-submit it.)
- [ ] I verified my PR does not include whitespace/formatting changes -- because if it does it will be closed without merging.
- [ ] I have read the [Contributing to Rock](https://github.com/SparkDevNetwork/Rock/blob/master/.github/CONTRIBUTING.md) doc
- [ ] By contributing code, I agree to license my contribution under the [Rock Community License Agreement](https://www.rockrms.com/license)
- [ ] Unit tests pass locally with my changes
- [ ] I have added any required [unit tests](https://github.com/SparkDevNetwork/Rock/blob/develop/Rock.Tests.UnitTests/README.md) or [integration tests](https://github.com/SparkDevNetwork/Rock/blob/develop/Rock.Tests.Integration/README.md) that prove my fix is effective or that my feature works
- [ ] I have included updated language for the [Rock Documentation](https://www.rockrms.com/Learn/Documentation) (if appropriate)

## Further comments
<!--
If this is a relatively large or complex change, kick off the discussion by explaining why you chose the solution you did and what alternatives you considered, etc...
-->

## Documentation
<!--
If your change effects the UI or needs to be documented in one of the existing docs http://www.rockrms.com/Learn/Documentation, please provide the brief write-up here.
-->

## Migrations
If your pull request requires a migration, please *exclude the migration from the Rock.Migration project*, but submit it with your pull request. Please add a note to your pull request that provides a heads up that a migration file is present.
> The purpose of PR Review is to _improve the quality of the software._
106 changes: 53 additions & 53 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,53 +1,53 @@
#file types
_ReSharper.*
*.resharper
*.DS_Store
*.tlog
*.vsp
*.psess
*.v11.suo
*.user
*.suo
#*.Framework.XML
#specific files
web.[Cc]onnectionStrings.config
app.[Cc]onnectionStrings.config
desktop.ini
Rock.XML
Quartz.xml
StyleCop.Cache
#build artifacts
**/[Bb]in/[Dd]ebug
**/[Bb]in/[Rr]elease
**/[Oo]bj/[Dd]ebug
**/[Oo]bj/[Rr]elease
**/[Oo]bj/*.nuget.*
**/[Oo]bj/project.assets.json
#specific folders
RockWeb/Cache/*
RockWeb/Content/ASM_Thumbnails
RockWeb/App_Data/PackageStaging
RockWeb/App_Data/MobileAppBundles
RockWeb/Obsidian/
RockWeb/Scripts/Rock/UI/structuredcontenteditor/
/scaffolding.config
*.sln.GhostDoc.xml
.vs/
.vshistory/
.localhistory/
.vshistory/
TestResults/
Packages/*
# javascript deps
node_modules
.cache
*.map
/packages/
/Installers/CheckScannerInstall/UpgradeLog.htm
/Installers/CheckScannerInstall/UpgradeLog2.htm
/Installers/CheckScannerInstall_2017/CheckScannerInstall
#file types
_ReSharper.*
*.resharper
*.DS_Store
*.tlog
*.vsp
*.psess
*.v11.suo
*.user
*.suo
#*.Framework.XML

#specific files
web.[Cc]onnectionStrings.config
app.[Cc]onnectionStrings.config
desktop.ini
Rock.XML
Quartz.xml
StyleCop.Cache

#build artifacts
**/[Bb]in/[Dd]ebug
**/[Bb]in/[Rr]elease
**/[Oo]bj/[Dd]ebug
**/[Oo]bj/[Rr]elease
**/[Oo]bj/*.nuget.*
**/[Oo]bj/project.assets.json

#specific folders
RockWeb/Cache/*
RockWeb/Content/ASM_Thumbnails
RockWeb/App_Data/PackageStaging
RockWeb/App_Data/MobileAppBundles
RockWeb/Obsidian/
RockWeb/Scripts/Rock/UI/structuredcontenteditor/
/scaffolding.config
*.sln.GhostDoc.xml
.vs/
.vshistory/
.localhistory/
.vshistory/
TestResults/

Packages/*

# javascript deps
node_modules
.cache
*.map
/packages/
/Installers/CheckScannerInstall/UpgradeLog.htm
/Installers/CheckScannerInstall/UpgradeLog2.htm
/Installers/CheckScannerInstall_2017/CheckScannerInstall
16 changes: 16 additions & 0 deletions .mergify.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
pull_request_rules:
- name: automatic merge when CI passes, 1 review, and 1 label
conditions:
- label=merge
- label!=blocked
actions:
merge:
method: merge
strict: smart


- name: delete head branch after merge
conditions:
- merged
actions:
delete_head_branch: {}
92 changes: 92 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
# Contributing to Rock

This is NewSpring's open-source fork for Rock RMS. This project is currently being used in production at [https://rock.newspring.cc](https://rock.newspring.cc).

If you're interested in how it works, check out [RockRMS.com](http://rockrms.com). This document details how you can contribute.

**Table of Contents**

[How does NewSpring Web work?](#how-we-work)

[How can I contribute?](#how-you-can-contribute)
* [Find known issues](#find-known-issues)
* [Report a new issue](#report-a-new-issue)
* [Recommend a new feature](#recommend-a-new-feature)
* [Pull requests](#pull-requests)

[What styles should I use?](#style-guide)
* [Git](#git)
* [Code](#code)

[How can I get in touch?](#get-in-touch)

[What license does this use?](#license)

## How we work

Our team works 100% off of Github, and it should always remain updated with what is currently in active development.

### Pull Requests

We work extensively from pull requests and are constantly monitoring new PR's.

When considering pull requests, we may require more than one person to sign off, so these might take up to a week.

## How you can contribute

One way you can contribute is by tackling known issues. Another way is submitting a new bug or feature request.

### Find Known Issues

We use [GitHub Issues](../../issues) for our public bugs. We keep a close eye on this and try to make it clear when we have an internal fix in progress. Before filing a new task, try to make sure your problem doesn't already exist.

### Report a New Issue

The best way to get a bug fixed is to provide an example case of where the problem is occurring. Images or videos of the failure occurring is beneficial where applicable.

If you think you have a solution to a bug and would like to fix it, please let us know. We can hopefully provide recommendations, as well as let you know if the bug is in fact intended behavior.

### Recommend a new feature

We track feature requests using [GitHub Issues](../../issues). If you would like to begin a discussion about a new or improved feature, open a new issue.

### Pull requests

When working to fix bugs or add features, we recommend opening a pull request early so we can comment on it or request any changes early on.

We also recommend that you work off of open issues, and let us know on them what you will be working on for the same reason.

**Please submit your pull request on the `master` branch**.

## Style Guide

### Git

#### Issues
- Before opening an issue, search existing issues and closed issues for any current or past discussion about your topic.

#### Commits and commit messages
- Try to limit each commit to one bugfix or one logical change.
- Commits messages should be short and clear.
- Feel free to reference issues and pull requests in commit messages.

#### Pull Requests
- Refer to the [above instructions](#pull-requests) on what to do before opening a pull request.

### Code

#### General

* **Most important: Look around.** Match the style you see used in the rest of the project.
* Follow the [Rock coding standards](https://github.com/SparkDevNetwork/Rock/wiki/Coding-standards).
* Use 4 spaces for indentation (no tabs)
* Submit "Attractive" code. This means your variables are human readable, methods are named for what they do, etc.

## Get in Touch

* Hit us up on [Twitter](https://twitter.com/newspringweb)
* Reach out to the [team](https://github.com/orgs/NewSpring/people).

## License

By contributing to Rock, you agree that your contributions will be licensed under its [MIT license](./LICENSE.md).
14 changes: 14 additions & 0 deletions FreeSpace.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
@echo off

del /s /q c:\windows\softwaredistribution\download\*

del /s /q %temp%\*

dism.exe /online /Cleanup-Image /StartComponentCleanup
dism.exe /online /Cleanup-Image /StartComponentCleanup /ResetBase

echo When you press enter, a defrag will start on the C drive. Hit Ctrl + C now to cancel.

pause

defrag c:
Loading