Commit graph

10739 commits

Author SHA1 Message Date
Blade Barringer
7bfa18fd05 chore(i18n): update locales 2015-09-06 13:33:29 -05:00
Blade Barringer
4177202cee Merge pull request #5855 from HabitRPG/sabrecat/party-page
Party Page Revamp
2015-09-06 13:28:14 -05:00
Blade Barringer
9896851001 Merge pull request #5890 from HabitRPG/change_custom_day_start
Change custom day start to ask for confirmation and prevent immediate cron
2015-09-06 13:28:04 -05:00
Blade Barringer
346440d32c Disable cds button if cds == user's preference 2015-09-06 10:14:44 -05:00
Blade Barringer
ee50fec2c1 Tweak wording of custom day start warning 2015-09-06 10:11:28 -05:00
Blade Barringer
074e683ba7 Change formatting of cds modal 2015-09-06 09:57:44 -05:00
Blade Barringer
0508f77ed4 Change wording of cds modal message 2015-09-06 09:45:12 -05:00
Blade Barringer
a44cd748af Use the user's preferred date format 2015-09-06 09:42:48 -05:00
Blade Barringer
f1224bc6be Use select instead of an input for cds 2015-09-06 09:36:29 -05:00
Blade Barringer
085a785e4d Convert input to select box 2015-09-06 09:22:40 -05:00
Blade Barringer
3a8eda6c1a Remove extraneous info about last cron 2015-09-05 15:35:07 -05:00
Blade Barringer
9ce6144fa4 Adjustments to custom day start 2015-09-05 15:32:49 -05:00
Blade Barringer
d45602c340 Adjust spacing 2015-09-05 09:45:08 -05:00
Blade Barringer
310bb3dfd9 Format settings page 2015-09-05 09:39:30 -05:00
Blade Barringer
9bcaea6fa2 Merge branch 'develop' into carolstone-chron-run-early-issue-4488 2015-09-05 09:32:24 -05:00
Blade Barringer
6fc8e0b5a5 Merge branch 'develop' into sabrecat/party-page 2015-09-05 09:20:06 -05:00
Blade Barringer
c141ee6d1c Fix test 2015-09-05 08:14:55 -05:00
Blade Barringer
f65ca3cf48 Fix bug where non-party members could not send invitations 2015-09-05 08:02:00 -05:00
Alys
e0b57fa2c5 remove Show Classes Tour button from Settings page, and associated code 2015-09-05 17:29:27 +10:00
Blade Barringer
807e6eb7cf Merge branch 'develop' into sabrecat/party-page 2015-09-04 19:00:48 -05:00
Blade Barringer
c41c4e2d41 Remove recursive call 2015-09-04 18:58:34 -05:00
Blade Barringer
1b7e9c9290 Add tests for group.invite 2015-09-04 18:40:12 -05:00
Blade Barringer
1d032a43a6 Format if else 2015-09-04 18:39:45 -05:00
Blade Barringer
43439741b2 add recursive call for server_side tests 2015-09-04 17:32:26 -05:00
Blade Barringer
90cea7016d Merge branch 'gulp_build' into develop 2015-09-04 17:10:47 -05:00
Blade Barringer
f746f6375f Remove container class 2015-09-04 16:47:12 -05:00
Blade Barringer
1eac011d0e Remove padding rule 2015-09-04 16:46:16 -05:00
Blade Barringer
047a88cef5 Merge branch 'zedutchgandalf-develop' into gulp_build 2015-09-04 16:35:45 -05:00
Blade Barringer
53a03b4396 Hide older news link in older news page 2015-09-04 16:32:05 -05:00
Blade Barringer
3e03ff124d Remove trailing blank spaces 2015-09-04 16:24:27 -05:00
Blade Barringer
f7df464ebd Remove unneeded class 2015-09-04 16:24:10 -05:00
Blade Barringer
c8c9d6c892 Set different gulp tasks for production use 2015-09-04 15:53:07 -05:00
Blade Barringer
7aae3d6aa9 Move gulp-grunt to regular dependency 2015-09-04 15:44:18 -05:00
Blade Barringer
3434a13782 Move glob to normal dependencies 2015-09-04 15:40:57 -05:00
Blade Barringer
bc9c12f253 Move static new stuff task to gulp 2015-09-04 15:32:08 -05:00
Blade Barringer
cfae45a5f7 Move build task to gulp 2015-09-04 15:30:44 -05:00
Blade Barringer
d3360ec403 Hide all npm-debug logs from source control 2015-09-04 15:22:59 -05:00
Blade Barringer
0d78c01de3 Merge pull request #5877 from TheHollidayInn/guilds-user-becomes-lead-when-joins-empty-group
Groups now make joining user the leader when they are empty
2015-09-04 09:43:26 -05:00
Robin Arys
e6a0f405e3 Fix Bailey's news modal 2015-09-04 15:56:32 +02:00
Robin Arys
39df743693 Change headers to use the proper ones 2015-09-04 15:52:34 +02:00
Robin Arys
345ab4bdbe Move repeated classes up one level into a div 2015-09-04 15:34:03 +02:00
Robin Arys
c5d1f37499 Add small margin to images so text doesn't stick to them 2015-09-04 10:42:05 +02:00
Robin Arys
a497724d18 Fix Bailey's modal 2015-09-04 10:41:40 +02:00
Robin Arys
c7dc8d551b Remove small_news_header and big_news_header CSS classes 2015-09-04 10:41:22 +02:00
Robin Arys
60d176d578 Add ability to add an extra class to the container 2015-09-04 10:40:24 +02:00
Robin Arys
39c85b9938 Make CSS statement more precise to make sure I'm not changing stuff I don't want to change. 2015-09-04 00:42:55 +02:00
Robin Arys
74dc455183 fix spacing 2015-09-04 00:22:51 +02:00
Robin Arys
d03acee4bc Redesign static old news page per #5836 2015-09-04 00:22:41 +02:00
Sabe Jones
b5124e6cd8 fix(warnings): Show modal only once
Also removes a random extra newline.
2015-09-03 11:12:54 -04:00
Sabe Jones
d29c7ff1bb Merge pull request #5878 from HabitRPG/sabrecat/modal-warnings
Modal warning for low health
2015-09-02 16:14:52 -05:00