sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-08-03 08:21:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
11541 commits 3 branches 0 tags 1.6 GiB
Commit graph

11541 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sabe Jones
cc2a6d4db1 fix(sharing): Push ng-binding into Jade 2015-11-11 13:09:00 -05:00
Sabe Jones
63f00d3643 fix(sharing): Better Tweet syntax 
Angular bindings would fail to parse in Tweets if the expression evaluated to something with a space in it. Adding quotes stretches the Tweet by two characters, but addresses the issue. Commit also takes out a spurious console message from the Notifications service.
 2015-11-10 17:07:34 -05:00
Sabe Jones
a393cdc94b fix(sharing): Correct Jade interpolation 2015-11-10 16:33:33 -05:00
Sabe Jones
ada7ca71ad fix(sharing): Use env BASE_URL 2015-11-10 16:27:40 -05:00
Sabe Jones
23df5b608d feat(sharing): Remaining cheevo modals 2015-11-10 13:43:37 -05:00
Sabe Jones
875f2ac552 feat(sharing): More achievements 2015-11-10 00:08:17 -05:00
Sabe Jones
eed4207c6d Merge branch 'develop' into sabrecat/more-modals 
Conflicts:
	common/dist/sprites/spritesmith-largeSprites-0.png
	common/locales/en/front.json
 2015-11-09 16:24:17 -05:00
Blade Barringer
6b7a757459 Run tests in sequence 2015-11-09 12:47:56 -06:00
Blade Barringer
598d25dc48 Update browserify package 2015-11-07 20:56:56 -06:00
Blade Barringer
a6c7e3b885 Update protractor dependency 2015-11-07 20:31:28 -06:00
Blade Barringer
f137e0d41d Add gulp to travis 2015-11-07 20:16:32 -06:00
Blade Barringer
b6a1414e1c Update npm to v2 2015-11-07 20:09:36 -06:00
Blade Barringer
05ae419d7e Update karma dependencies and remove unused packages. 2015-11-07 19:56:09 -06:00
Blade Barringer
88f8a2a375 Swap out gulp-clean for rimraf 2015-11-07 19:09:51 -06:00
Sabe Jones
164309e050 feat(sharing): Streak Achievement 2015-11-06 16:54:23 -05:00
Sabe Jones
b6702c293e Merge pull request #6172 from AminArria/Move-Overview-To-Website 
Move overview to website
 2015-11-06 11:04:44 -06:00
Amin Arria
4aba7afdce Merge pull request #1 from HabitRPG/sabrecat/Move-Overview-To-Website 
fix(overview): Wording and layout tweaks
 2015-11-05 17:44:15 -04:30
Sabe Jones
56fbc33d1c Merge branch 'develop' into Move-Overview-To-Website 
Conflicts:
	website/src/routes/pages.js
 2015-11-05 14:31:00 -05:00
Matteo Pagliazzi
9cf3c72002 Merge pull request #6188 from crookedneighbor/fix_user 
Correct code to not iterate over mongoose object
 2015-11-05 20:20:25 +01:00
Sabe Jones
18c2279be4 fix(overview): Wording and layout tweaks 2015-11-05 14:18:51 -05:00
Blade Barringer
4cbda6818c Correct code to not iterate over mongoose object 2015-11-05 13:08:37 -06:00
Sabe Jones
bb55a74f48 chore(news): iOS update Bailey 
Also fixes the color of the iOS app icon and codes it more intelligently.
 2015-11-05 11:48:51 -05:00
Blade Barringer
1e4570ff88 Move all delete user tests to new structure 2015-11-05 08:17:06 -06:00
Alys
a49fecb063 minor fix to migration script 2015-11-05 18:15:25 +10:00
Alys
67a291f03d migration script for setting flags.tutorial.ios 2015-11-05 18:13:55 +10:00
Blade Barringer
78cfbd2c6a Revert btn-buy style change 2015-11-04 22:02:50 -06:00
Blade Barringer
3726f48ff2 chore(i18n): update locales 2015-11-04 21:57:16 -06:00
Sabe Jones
3a1862ecef fix(static): Non-widgety App Store links 2015-11-04 22:42:10 -05:00
Blade Barringer
cde66d6167 Merge pull request #6183 from crookedneighbor/clientIdentifier 
Client identifier
 2015-11-04 20:03:31 -06:00
Blade Barringer
5a36d8e3f5 Switch to single quotes to conform to code style. 2015-11-04 18:03:50 -06:00
Blade Barringer
905e7b17ea Refactor user model 2015-11-04 18:00:40 -06:00
Blade Barringer
797287a75c Add and adjust tests for new register behavior. 2015-11-04 17:40:49 -06:00
Blade Barringer
8618716ca4 Update requester to take in additional set parameters. 2015-11-04 17:40:10 -06:00
Sabe Jones
de5d2df94c fix(i18n): Add missing string 2015-11-04 16:04:51 -05:00
Sabe Jones
c61e49f5a7 Merge pull request #6182 from HabitRPG/sabrecat/apps-page 
Apps page
 2015-11-04 14:46:49 -06:00
Sabe Jones
df7e0236c2 fix(static): Improved /apps layout 2015-11-04 15:30:42 -05:00
Sabe Jones
8c4ecb8f6c feat(static): Apps page 2015-11-04 13:35:31 -05:00
Phillip Thelen
7f189bebba disable tutorial/tour depending on client 2015-11-04 16:54:47 +01:00
Phillip Thelen
921ee881a5 Only create sample habits+dailies when registered through website 2015-11-04 16:41:13 +01:00
Phillip Thelen
e13c008076 send "habitica-web" as x-client header 2015-11-04 16:26:50 +01:00
Blade Barringer
a7f0a2a8ca Merge pull request #6171 from crookedneighbor/flag_messages_in_api 
Flag messages in api
 2015-11-04 08:58:34 -06:00
Blade Barringer
269fd2a94f Add test for admin flagging a message 2015-11-04 08:00:35 -06:00
Blade Barringer
799190a898 Merge branch 'develop' into flag_messages_in_api 2015-11-04 07:56:34 -06:00
Amin Arria
6d93356967 Changed overview link 2015-11-03 22:56:47 -04:30
Blade Barringer
6ed3ba36ae Refactor task helper for unit and integration tests. 2015-11-03 21:21:16 -06:00
Amin Arria
8611c00201 Added links 2015-11-03 22:38:55 -04:30
Amin Arria
5278a08c93 Added horizontal line 2015-11-03 22:32:23 -04:30
Amin Arria
7342735b1b Fix error missing web in webStep 2015-11-03 22:18:41 -04:30
Amin Arria
f79110d6d2 Changed to be more like the FAQ 2015-11-03 22:03:24 -04:30
Sabe Jones
caa4170f12 fix(sharing): Wording tweaks 2015-11-03 17:19:57 -05:00