Test master - #41

Open

LongAli wants to merge 70 commits into

DesignAtLarge:masterfrom

LongAli:test-master

Commits on Feb 16, 2021

Home page
Ali L
committed
04cec47
added activity screen
zzhilin
committed
92225c1
Update index.handlebars
Ali L
committed
2dbc384
finish activity
zzhilin
committed
979dd5b
activity
zzhilin
committed
293a827
Update
Ali L
committed
ffdf91d

Commits on Feb 17, 2021

no color
zzhilin
committed
c0b27b4
no color
zzhilin
committed
b73f46e
setting_about
Ali L
committed
a80cf61
Merge branch 'master' of https://github.com/LongAli/ixd-skeleton
Ali L
committed
1daa63c
Update README.md
LongAli
authored
7c56623
untracked node_modules
zzhilin
committed
25b9de1
dd
Ali L
committed
d39d44a
delete log
Ali L
committed
1e269c5
new
Ali L
committed
599f9a7

Commits on Feb 22, 2021

json file added
ndevanag
committed
e603c34

Commits on Feb 24, 2021

finished setting
zzhilin
committed
0d70020
finish merge
zzhilin
committed
5e089d1
finished timer
zzhilin
committed
f8482ee
facebook login but picture not working
ndevanag
committed
26d9d39
conflict
ndevanag
committed
c1a1fc0
filter
Ali L
committed
1897585
new
Ali L
committed
f71144c
json added
ndevanag
committed
dea56e6
pictures fixed
ndevanag
committed
df44db9
actLog json added
ndevanag
committed
2e5420d

Commits on Feb 25, 2021

for merging
zzhilin
committed
ac05a4d
stuff
zzhilin
committed
edb728c
filter
Ali L
committed
2f0b57e
filter
Ali L
committed
16e7ced
fixed setting
zzhilin
committed
fe45da4
stuff
zzhilin
committed
786f477
updated
Ali L
committed
29d0cc1
finished login, completion, fixed settings
zzhilin
committed
c017a9b
xxx
zzhilin
committed
3581e0b
fixed nav
zzhilin
committed
b55ef7a
add complete button
zzhilin
committed
7f8b535
filtered
Ali L
committed
738e123
filtered
Ali L
committed
ea85aa9
changed settings and timer
zzhilin
committed
4f9b46a
delete click
ndevanag
committed
decf1ac
delete click
ndevanag
committed
68398b0
complete debug
ndevanag
committed
b7c1b3c
some thing
zzhilin
committed
e057ef9
accepting changes
zzhilin
committed
c979e9f
test share
zzhilin
committed
54aa5c1
delete package lock
zzhilin
committed
991b2c6

Commits on Feb 26, 2021

test button
zzhilin
committed
d1c08a0
test2
zzhilin
committed
c1f8169
test3
zzhilin
committed
499c481
test4
zzhilin
committed
f78acf9
test
zzhilin
committed
cd8b44d
test n
zzhilin
committed
df931e2
changing actlog
ndevanag
committed
52c0020
Merge branch 'master' of https://github.com/LongAli/lacuna-matana
ndevanag
committed
d6ab3d4
test
zzhilin
committed
d5a02d1
actjson fixed
ndevanag
committed
dd65ac4
non
zzhilin
committed
cecbb0f
nnn
zzhilin
committed
2f99602
actdescription
ndevanag
committed
d582f47
Merge branch 'master' of https://github.com/LongAli/lacuna-matana
ndevanag
committed
7a929df
notif for buttons
zzhilin
committed
ecc8b1b
merge
zzhilin
committed
7473d0e
button popup messages
zzhilin
committed
ea72d49
fix login
zzhilin
committed
85dcbdd
needs fix multiple objects
zzhilin
committed
d026147
wip
Ali L
committed
0b5ee2a
Merge branch 'master' of https://github.com/LongAli/ixd-skeleton
Ali L
committed
de275d8
filterwip
Ali L
committed
3fe8c1e
hello
Ali L
committed
4d4fcc7