c1b429c8bf
Adjust spacing; remove comment
2015-06-17 19:12:49 -05:00
071f2796db
Adjusting challenges view translation
...
- Make "Back to all challenges" button translatable
- Allow some flexibility for the line "#_of_gems gem_icon Prize" - this
is made following the practices with linkstart/linkend implementation
- prize "string" is left as is because used as a placeholder
- code comment "prize" had to be moved 1 line up - before the p (as no
room for it is left inside the p) which however seems OK to me, because
the comments above and below has been made the same way before
2015-06-16 02:37:18 +05:00
ecb2544cdc
Merge pull request #5396 from hairlessbear/remove_freeRebirth
...
Removed 'freeRebirth' from user model and everywhere else in codebase
2015-06-15 08:00:18 -05:00
6ed306a7e0
Merge pull request #5403 from vIiRuS/iOS-IAP
...
Enable in app purchase for iOS
2015-06-15 07:42:57 -05:00
39adff0e2c
improve error reporting for iOS IAP
2015-06-15 13:09:22 +02:00
bb2f97e802
Added android tests for iap
2015-06-14 18:35:19 -05:00
5b6afde475
Remove console.logs
2015-06-14 18:08:00 -05:00
cd45fc06c6
Collapse return and res.json statements
2015-06-14 18:07:23 -05:00
92e2393114
Merge branch 'hairlessbear-pending_quest_display' into develop
2015-06-14 16:20:20 -05:00
109acb0d97
Correct ng-style syntax
2015-06-14 16:15:31 -05:00
4b3d82613e
Allow leader to be shown in member list; do not allow leader to kick out self from group
2015-06-14 12:54:21 -05:00
795710ce63
Rename boss folder to quests
2015-06-14 11:05:53 -05:00
35f2a36215
Split out pieces of boss jade files
2015-06-14 10:48:46 -05:00
178e7b1c8c
Move participants to partial
2015-06-14 10:14:05 -05:00
44a556f4fe
Refactor to use tabset
2015-06-14 09:01:28 -05:00
6997783037
Check that iOS IAP is of correct type
2015-06-14 15:59:43 +02:00
a6e0d5f2de
Merge branch 'develop' into hairlessbear-pending_quest_display
2015-06-14 08:44:25 -05:00
7ccf246119
Enable authentication for iOS IAP route
2015-06-14 15:28:30 +02:00
b4f4db9c1d
Create jade variabel for ultimate gear check
2015-06-14 01:56:32 -05:00
c44ca785aa
Merge branch 'develop' into SabreCat-develop
2015-06-14 01:50:16 -05:00
d89ee5fff2
Adjust margin
2015-06-14 01:36:38 -05:00
831f5b89bd
Merge branch 'develop' into nthomsn-develop
2015-06-14 01:27:35 -05:00
41b1abba3a
Checkout help button changes
2015-06-13 23:16:12 -05:00
0eb8caec23
Various task ui improvements
...
* Use bootstrap form-control class for text and notes
* Can't edit start date or days of the week in challenge dailies from website
* Refactor dailies
2015-06-13 22:29:06 -05:00
2134465a75
Impliment check for leader object's existence in challenge search
2015-06-13 20:50:32 -05:00
703a2511da
Merge branch 'TheHollidayInn-challenges-owner-filter' into develop
2015-06-13 19:42:54 -05:00
6513527d8b
Refactor challenges filter
2015-06-13 19:41:41 -05:00
ddb28c0305
Merge branch 'develop' into TheHollidayInn-challenges-owner-filter
2015-06-13 18:23:51 -05:00
9d4713bdf3
Merge pull request #5392 from GitHubSphinx/Sphinx-entry1
...
Still addressing #5202 - making Click for help button translatable
2015-06-13 18:01:57 -05:00
90173e6943
Remove unused html files
2015-06-13 15:18:04 -05:00
b052f803e4
Initialize user.filterQuery as undefined
2015-06-13 14:09:08 -05:00
31e7b052a1
Removed 'freeRebirth' modal and its associated strings
2015-06-13 14:18:03 -04:00
4bf1b94c1d
Removed 'freeRebirth' from user model and all uses in codebase
2015-06-13 14:18:03 -04:00
3e32d4244f
Adjust formatting of task ordering filter
2015-06-13 12:39:20 -05:00
8faf96f5b9
Refactored filters
2015-06-13 12:39:11 -05:00
5d56bd02ef
Merge branch 'develop' into blade-feature/search
2015-06-13 00:10:44 -05:00
e2ba8fb859
fix(achievement): Ultimate Gear logic
...
Fixes #5387 .
2015-06-12 15:35:34 -05:00
2f1111522c
Adjust PR #5389
...
* Convert $watch to ng-change and re-wrote test
* Removed unnecessary styles
* Use .form-control instead of class='form-control'
2015-06-12 09:05:06 -05:00
fc5cb5d228
Still addressing #5202
...
The last thing left as it seems is Click for help toolbar
2015-06-12 17:42:40 +05:00
54681e36b5
Merge branch 'develop' into blade-Finish_weeklies_pr
2015-06-11 19:47:46 -05:00
5d84ead3f8
add image for bulk email
2015-06-11 22:17:34 +02:00
b413e38682
Put tasks filter field to the right
2015-06-11 22:16:40 +02:00
4da4777ddd
chore(news): Every X Bailey
2015-06-11 14:22:39 -05:00
72a3419327
Change the styling of filter box to bootstrap
2015-06-11 20:41:08 +02:00
2c52829256
Implement filter tasks by text & notes
...
In order to be able to filter tasks by it's text or notes - we need an
extra filter to be implemented, because angular does not support OR
condition for it's default filter directive.
2015-06-11 20:39:29 +02:00
867308975f
Merge https://github.com/HabitRPG/habitrpg into develop
2015-06-11 08:40:36 -07:00
2625b57f2d
Make sure search filter has same margin as tags
2015-06-11 15:32:01 +02:00
0b74736cf2
Remove unused dependency
2015-06-11 09:18:20 +02:00
df7d36923c
Enable filtering for tasks and custom rewards
...
Add search input box next to the tags. When user changes the value of
the input box then it's propagated to the user service as filterQuery
string. filterQuery string is then used in the tasks template to filter
tasks by text.
2015-06-11 09:10:31 +02:00
8dde41d18a
Wrie and refactor guild tests
2015-06-10 23:39:46 -05:00
Blade Barringer