Alys
1202c624f1
Revert "Added hide and error message when a user tries to create a challenge for..."
2015-03-27 20:11:12 +10:00
Alys
f16ef869a3
Merge pull request #4836 from TheHollidayInn/fix-max-value-0-challenges
...
Added hide and error message when a user tries to create a challenge for...
2015-03-27 19:21:51 +10:00
Alys
10a3c0094b
Merge pull request #4925 from gisikw/improve_tests
...
Improve tests
2015-03-27 18:35:51 +10:00
Alys
a3a1a92388
Merge pull request #4849 from TheHollidayInn/add-link-to-challenge-creator
...
Added link to challenge creator on challenges.
2015-03-27 18:13:33 +10:00
Kevin Gisi
c7e55ef53d
Merge branch 'travis_mongodb2_6' into improve_tests
2015-03-26 17:58:09 -04:00
Kevin Gisi
b894ae8af0
Remove comments about broken user registering in API tests
2015-03-26 17:57:58 -04:00
Kevin Gisi
97323eaf23
Marked some tests as pending, after rebase
2015-03-26 17:57:58 -04:00
Kevin Gisi
17c7e199bd
Fix some of the formatting changes - was accidentally testing against a newer version of coffeescript
2015-03-26 17:57:58 -04:00
Kevin Gisi
63fea58d08
Repair most Mocha API specs
2015-03-26 17:57:57 -04:00
Kevin Gisi
bcd3d9a0b7
Add Mocha specs for common back into the test suite
2015-03-26 17:57:57 -04:00
Kevin Gisi
d4a92f58c9
Set Travis to update Mongo
2015-03-26 17:37:25 -04:00
Matteo Pagliazzi
695b00b6bb
chore(i18n): update locales
2015-03-26 17:14:28 -04:00
Matteo Pagliazzi
bfebf5d917
Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop
2015-03-26 17:13:43 -04:00
Tyler Renelle
f3e48093fb
feat(analytics): track tour step
2015-03-26 17:11:46 -04:00
Tyler Renelle
e46789c303
feat(analytics): track cron count
2015-03-26 17:11:33 -04:00
Kevin Gisi
2f19907293
Remove comments about broken user registering in API tests
2015-03-26 16:30:15 -04:00
Kevin Gisi
0676da184e
Marked some tests as pending, after rebase
2015-03-26 16:24:40 -04:00
Kevin Gisi
e2d956d338
Fix some of the formatting changes - was accidentally testing against a newer version of coffeescript
2015-03-26 16:18:02 -04:00
Kevin Gisi
13f3c4aa2b
Repair most Mocha API specs
2015-03-26 16:18:02 -04:00
Kevin Gisi
22c78b8ffa
Add Mocha specs for common back into the test suite
2015-03-26 16:18:01 -04:00
Kevin Gisi
78642ac0b8
Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop
2015-03-26 16:17:35 -04:00
Matteo Pagliazzi
47846606eb
chore(i18n): update locales
2015-03-26 19:44:28 +01:00
Matteo Pagliazzi
c591154665
Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop
2015-03-26 19:37:22 +01:00
Tyler Renelle
34f7fe801d
feat(analytics): track tour step
2015-03-26 11:50:55 -06:00
Tyler Renelle
e7ca2ab9f3
feat(analytics): track cron count
2015-03-26 11:15:23 -06:00
Alys
e9baafcbc8
Revert "Added Conditional Semantics to group member query to always include the user."
2015-03-26 19:54:51 +10:00
Alys
ecaa1d31ac
Merge pull request #4908 from TheHollidayInn/join-button-fix
...
Added Conditional Semantics to group member query to always include the user.
2015-03-26 18:53:01 +10:00
Alys
cb88862f6f
Merge pull request #4911 from TheHollidayInn/drops-add-item-icons
...
Added icons to Notification for the item that is dropped.
2015-03-26 18:06:55 +10:00
Alys
e9062c31a2
Merge pull request #4913 from galarant/apply-level-cap-to-stats-display
...
front end reflects level cap for stats bonus
2015-03-26 17:49:45 +10:00
Alys
20726e3c0f
Merge pull request #4873 from gisikw/repair_broken_test_suite
...
Repair Broken Test Suite - Full Passing Tests
2015-03-26 14:49:28 +10:00
Sabe Jones
325c8cabd9
Merge pull request #4917 from SabreCat/eggy-eggy
...
March Subscriber Item and Egg Quest Updates
2015-03-25 22:54:06 -05:00
Sabe Jones
75ab7427fc
chore(grunt): Eggy eggy sprites
2015-03-25 22:12:55 -05:00
Sabe Jones
4f89f68797
fix(mounts): Eggy eggy basket
2015-03-25 22:10:51 -05:00
Sabe Jones
63d6a43702
fix(pets): Eggy eggy progress bar
2015-03-25 22:03:46 -05:00
Sabe Jones
77cc05a668
fix(pets): Eggy eggy feed
2015-03-25 22:01:42 -05:00
Sabe Jones
54778a5d0c
fix(debug): Eggy eggy break
2015-03-25 21:42:06 -05:00
Sabe Jones
44a56ae0b2
fix(March): Eggy eggy quest
2015-03-25 21:19:34 -05:00
Sabe Jones
354872decb
feat(March): Eggy eggy cont'd
2015-03-25 20:46:27 -05:00
Sabe Jones
b24dbe9b86
feat(March): Eggy eggy mystery
2015-03-25 19:53:07 -05:00
Matteo Pagliazzi
de972eebc0
change email priority
2015-03-25 21:24:09 +01:00
Matteo Pagliazzi
488cd8852b
move invites to quest to batch mode
2015-03-25 18:11:21 +01:00
Matteo Pagliazzi
ab0c5106a1
move quest-started email to batch mode
2015-03-25 17:52:15 +01:00
Matteo Pagliazzi
f470bcd1e1
add support for personal merge vars and move RECIPIENT_NAME to use them
2015-03-25 17:39:28 +01:00
Matteo Pagliazzi
6e4818cf62
chore(i18n): update locales
2015-03-25 16:53:56 +01:00
kholliday
1a6b828e05
Moved dropClass to correct scope.
2015-03-25 07:49:49 -05:00
Alys
0fc158be2e
Merge pull request #4893 from TheHollidayInn/checklist-removed-backspace-delete
...
Removed delete function when user hits backspace/delete
2015-03-25 18:00:31 +10:00
Alys
e7c0c370ee
Merge pull request #4909 from TheHollidayInn/notify-user-empty-task
...
Added tooltip for when a task is empty
2015-03-25 17:59:20 +10:00
Kevin Gisi
7bed1efb21
Revised Grunt translations task to use build:test
...
* Added build:test task to generate translation JS for tests.
* Removed test/spec/translations.js from the repository, added to .gitignore.
* Updated test/run_tests.sh to run build:test, and accept an optional argument
to run a particular test suite.
2015-03-24 21:39:03 -04:00
Kevin Gisi
1e59336d09
Repair remaining Karma specs - all passing.
...
* Stubbed out User module to repair rootCtrlSpec
* Loaded RootCtrl in inventoryCtrlSpec, as it was missing shared functions.
Updated mock user to include a mounts hash.
2015-03-24 21:39:03 -04:00
Kevin Gisi
2194caec15
Repaired groupServicesSpec, uncommented specs.
...
As it turns out, the page reload behavior was not caused by $resource, but
exists somewhere within the User module. Stubbed out the User module as as done
in notificationServicesSpec
2015-03-24 21:39:03 -04:00
