master

Commits

3b111ed
convert parameters to hash of options..
mo khan
2016-07-20 02:28:45
d422a74
light up plank timer.
mo khan
2016-07-20 01:51:45
1c1cd21
start a timer for the plank sets.
mo khan
2016-07-19 03:43:22
03e9bc0
display duration instead of weight.
mo khan
2016-07-19 02:53:30
acc73cf
display duration instead of weight.
mo khan
2016-07-19 02:49:23
a09d708
add duration to json.
mo khan
2016-07-19 02:40:45
75f8484
add target_duration.
mo khan
2016-07-19 02:15:26
da13173
float right.
mo khan
2016-07-16 20:53:17
7efd654
no rest message for warm up sets.
mo khan
2016-07-16 19:43:49
f9ae366
add hidden fields.
mo khan
2016-07-16 19:40:36
e02bc1e
merge with master.
mo khan
2016-07-16 15:35:03
6c29fa6
Merge pull request #47 from stronglifters/found6
mo khan
2016-07-15 01:12:52
a27be62
Style search field
speasley
2016-07-14 03:11:26
a2c33ab
Adjust layout
speasley
2016-07-14 02:32:46
074b33d
fix broken js test.
mo khan
2016-07-13 04:24:01
d077295
add missing close key.
mo khan
2016-07-13 04:14:20
c54a9d6
add next workout link for mobile only.
mo khan
2016-07-13 04:13:21
513108c
use a button instead of a link
mo khan
2016-07-13 04:04:21
04bbe78
fix a few broken feature specs
mo khan
2016-07-13 03:56:49
5229700
fix broken test and remove unused translations.
mo khan
2016-07-13 03:54:05
9652dee
allow opening multiple workouts.
mo khan
2016-07-13 03:52:01
a32120f
do not import gyms after login.
mo khan
2016-07-13 03:49:02
e52d61a
add fieldset class
mo khan
2016-07-13 03:48:51
a3aca12
fix workout view.
mo khan
2016-07-13 03:45:19
eb16447
fix a bunch of pages.
mo khan
2016-07-13 03:31:23
3dbac0b
fix profile#show
mo khan
2016-07-13 03:15:12
c4ba521
remove flash
mo khan
2016-07-13 03:04:59
85a473c
fix flash.
mo khan
2016-07-13 03:04:23
539da86
fix profile#edit.
mo khan
2016-07-13 02:46:33
f48a5cc
fix home gym modal.
mo khan
2016-07-13 02:44:40
bac7abe
fix map.
mo khan
2016-07-13 02:39:17
d72bbe7
fix up gyms pages.
mo khan
2016-07-13 02:28:03
03fe81c
update gyms table.
mo khan
2016-07-13 01:51:32
6038e26
Fix some footer styling
speasley
2016-07-11 06:18:29
63fe094
Remove some small column refs for flex-grid
speasley
2016-07-11 06:01:03
1e5a2aa
Adjust some colouring
speasley
2016-07-11 05:47:55
c574bb0
Lose dropdown menu due to conflicts
speasley
2016-07-11 05:23:50
1d0911e
Resolve merge conflict
speasley
2016-07-11 05:18:11
8be362d
A bit of menu reorganization
speasley
2016-07-11 05:16:08
fd92518
Use username for dropdown heading
speasley
2016-07-11 05:06:01
9995b94
yield content.
mo khan
2016-07-11 03:40:53
e3226df
Use SL name
speasley
2016-07-11 03:38:33
d1c420c
Rearrange some menu items
speasley
2016-07-11 03:35:46
7f90c69
Fix merge conflict
speasley
2016-07-11 02:49:41
6fa7085
Restore loading indicator
speasley
2016-07-11 02:48:29
cafd048
yield content.
mo khan
2016-07-11 02:44:44
9e769e6
Remove right-menu
speasley
2016-07-10 23:36:59
653cf77
[WIP] F6 nav
speasley
2016-07-10 23:31:33
3cb734e
re-init foundation on turbolinks:load
mo khan
2016-07-10 23:04:45
5d99509
fix send-to-stronglifters modal.
mo khan
2016-07-10 23:00:59
eb21455
merge with master.
mo khan
2016-07-10 22:52:56
8ccd72d
use new accordion classes.
mo khan
2016-07-10 22:49:42
f830bc1
remove double foundation initialization.
mo khan
2016-07-10 22:49:25
0ae9da0
add planks.
mo khan
2016-07-10 22:19:46
5776555
use pretty_print instead of to_s.
mo khan
2016-07-10 03:17:28
81fa217
hound happy.
mo khan
2016-07-10 02:55:28
bceca70
delegate to quantity to display units.
mo khan
2016-07-10 02:50:55
e78fdb8
use custom quantity type.
mo khan
2016-07-10 02:26:41
dc349a9
declare attributes on recommendation model.
mo khan
2016-07-10 01:14:38
eb0ac1c
add duration to recommendations.
mo khan
2016-07-10 01:05:26
7235bb0
rename workout to routine.
mo khan
2016-07-09 23:10:46
8dc5f7d
add some assistance exercises.
mo khan
2016-07-09 23:09:27
b2dacf7
remove extra fieldset.
mo khan
2016-07-09 22:28:46
4c46f37
only show work sets.
mo khan
2016-07-09 22:11:42
b907784
change text for target_repetitions
mo khan
2016-07-09 21:42:17
512eb0b
add link to start a new workout.
mo khan
2016-07-09 21:40:26
2f399db
promote workouts link
mo khan
2016-07-09 21:37:00
d20566f
fix issue for android when clicking on gravatar.
mo khan
2016-07-09 21:33:56
fbe96ca
[WIP] Converting menu to Foundation 6 syntax
speasley
2016-07-07 04:32:40
2a8ee59
Clean up layout
speasley
2016-07-07 04:08:35
9d27a73
Some I18n
speasley
2016-07-07 04:04:40
fe13fb8
Update flash for flex-grid
speasley
2016-07-07 03:26:31
dfc3e71
Update layout for flex-grid
speasley
2016-07-07 03:21:41
519a12d
Enable global flex-grid
speasley
2016-07-07 03:16:26
a990db0
Fix modal. Link complains when it's inside label.
speasley
2016-07-07 02:50:30
d0a783d
Foundation 6 changes
speasley
2016-07-05 02:43:52
b238dfe
allow code climate submission.
mo khan
2016-07-05 02:41:28
32d0750
update turbolinks events.
mo khan
2016-07-05 02:29:35
1bf1d0a
Upgrade to Foundation 6
speasley
2016-07-05 02:03:48
b559637
use digests in production.
mo khan
2016-07-05 01:25:29
2c30dd0
Upgrade foundation-rails
speasley
2016-07-05 00:43:04
849a808
Stronglifters -> Strong Lifters
speasley
2016-07-05 00:37:34
6d9180f
Merge pull request #46 from mokhan/rails-5
mo khan
2016-07-04 22:32:54
dac44ed
simplify.
mo khan
2016-07-04 22:27:06
38c8e91
skip rake
mo khan
2016-07-04 22:13:59
aa6ef51
fix n+1 issues.
mo khan
2016-07-04 22:00:55
2eebbd3
hound happy.
mo khan
2016-07-04 20:52:06
2bb11c6
remove some duplication.
mo khan
2016-07-04 20:09:26
e9413fd
remove monkey patch for `at`
mo khan
2016-07-04 20:05:52
5f1f6d3
reorder genders back to the way they were.
mo khan
2016-07-04 17:41:45
f045d65
remove deprecation warnings from controller tests.
mo khan
2016-07-04 17:39:50
50b7aee
fix broken tests.
mo khan
2016-07-04 17:10:08
bca4cc4
upgrade to rails 5.
mo khan
2016-07-04 17:09:57
5b1c52c
Merge pull request #45 from mokhan/madcow
mo khan
2016-07-01 16:01:48
ff4a5a9
hound happy.
mo khan
2016-07-01 15:28:57
4becb16
fix cucumber tests.
mo khan
2016-07-01 15:27:29
3c8fcb6
fix broken spec.
mo khan
2016-07-01 15:10:03
ec381d9
fix broken spec.
mo khan
2016-07-01 15:02:25
844500c
hound happy.
mo khan
2016-07-01 14:57:47
2f1ef15
fix broken specs.
mo khan
2016-07-01 14:46:54