Connor Turland
|
ac867d00ab
|
m
|
2014-09-18 02:39:00 -04:00 |
|
|
Connor Turland
|
683b459eeb
|
Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into new
|
2014-09-18 02:33:44 -04:00 |
|
|
Connor Turland
|
af5560b495
|
updates to metacode select within topic card
|
2014-09-18 02:33:38 -04:00 |
|
Shai Mor
|
0bf28410e6
|
switch metaset view changes
|
2014-09-17 10:59:36 -04:00 |
|
|
Connor Turland
|
f62ca67d9f
|
prevent self showing up on realtime problem
|
2014-09-15 22:04:44 -04:00 |
|
|
Connor Turland
|
b6893d8f92
|
fixed admin panels
|
2014-09-15 21:57:34 -04:00 |
|
|
Connor Turland
|
6fe8cf4b88
|
Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into new
|
2014-09-12 15:07:52 -04:00 |
|
|
Shai Mor
|
b722dc911b
|
help qr tutorials
|
2014-09-12 11:45:53 -04:00 |
|
|
Connor Turland
|
0941b43391
|
fixed spacing on abuot lightbox
|
2014-09-11 08:39:56 -04:00 |
|
|
Connor Turland
|
30d82ba870
|
Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into new
|
2014-09-11 08:35:29 -04:00 |
|
|
Connor Turland
|
90f2477566
|
fixed map update controller
|
2014-09-11 08:35:16 -04:00 |
|
|
Shai Mor
|
f49f45e856
|
about, invite, getInvolved
|
2014-09-10 18:12:21 -04:00 |
|
|
Shai Mor
|
23385a946e
|
Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into develop
|
2014-09-10 16:32:36 -04:00 |
|
|
Shai Mor
|
f91728cdb6
|
get involved lightbox styling
|
2014-09-10 16:32:18 -04:00 |
|
|
Connor Turland
|
4f8a8e2fde
|
for heroku
|
2014-09-10 15:18:20 -04:00 |
|
|
Connor Turland
|
3d35d44c3f
|
realtime improvement
|
2014-09-10 15:17:43 -04:00 |
|
|
Connor Turland
|
ac8c589a77
|
config for heroku
|
2014-09-10 15:07:34 -04:00 |
|
|
Connor Turland
|
28bfb8ac21
|
better architecture for entering and exiting maps from the home page
|
2014-09-10 15:06:39 -04:00 |
|
|
Connor Turland
|
3a7501cc7a
|
merge shai's changes
|
2014-09-09 18:20:17 -04:00 |
|
|
Connor Turland
|
d2760b8688
|
change in embedly
|
2014-09-09 18:17:39 -04:00 |
|
|
Shai Mor
|
d18806bb18
|
merge in connors css
|
2014-09-09 15:17:49 -04:00 |
|
|
Shai Mor
|
4f85055c74
|
styled create map forms
|
2014-09-09 15:13:53 -04:00 |
|
|
Connor Turland
|
901c028d52
|
configure for heroku
|
2014-09-03 19:07:45 -04:00 |
|
|
Connor Turland
|
eedd3736cf
|
realtime and filter box styling
|
2014-09-03 19:05:25 -04:00 |
|
|
Connor Turland
|
1ccaccdb32
|
small css syntax fix
|
2014-08-26 23:01:08 -04:00 |
|
|
Connor Turland
|
fdf0c28daf
|
sprites
|
2014-08-26 22:51:50 -04:00 |
|
|
Connor Turland
|
f6245df997
|
added 20 at a time loading for explore maps pages
|
2014-08-20 15:37:18 -04:00 |
|
|
Connor Turland
|
2d338bb785
|
fixed right click menu and also added change metacodes to it
|
2014-08-19 14:13:45 -04:00 |
|
|
Connor Turland
|
1557c7d4e9
|
config for heroku
|
2014-08-18 12:41:49 -04:00 |
|
|
Connor Turland
|
7df57cd013
|
feedback tab and explore maps pages styling
|
2014-08-18 12:40:51 -04:00 |
|
|
Connor Turland
|
ff03fb19a1
|
adding a few icons
|
2014-08-18 11:17:01 -04:00 |
|
|
Connor Turland
|
45828d048e
|
added some of the icons
|
2014-08-17 14:46:07 -04:00 |
|
|
Connor Turland
|
5cfbb82760
|
configured for local dev
|
2014-08-15 22:46:36 -04:00 |
|
|
Connor Turland
|
987f3c3ab5
|
added first pass ishans icons, removed old unnecessary icons
|
2014-08-15 18:27:40 -04:00 |
|
|
Connor Turland
|
6eca81487a
|
started styling of map cards and topic card, removed new maps section
|
2014-08-15 18:04:22 -04:00 |
|
|
Connor Turland
|
46380a17e0
|
got maps wrapper working
|
2014-08-12 19:20:46 -04:00 |
|
|
Connor Turland
|
6422b54dc0
|
clickable map cards
|
2014-08-12 18:14:04 -04:00 |
|
|
Connor Turland
|
35835fcc80
|
fixed home page difference between being logged in and logged out
|
2014-08-12 13:45:29 -04:00 |
|
|
Connor Turland
|
6bdc6ec397
|
fix for filtering when no edge or node is returned from the topic or synapse
|
2014-08-12 13:30:56 -04:00 |
|
|
Connor Turland
|
c989b321c1
|
switched filter box to be by who added something to the map, not who created the topic or synapse
|
2014-08-12 13:22:29 -04:00 |
|
|
Shai Mor
|
304c9f3b4b
|
Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into shai
|
2014-08-12 12:56:20 -04:00 |
|
|
Shai Mor
|
f8e6be70e1
|
fixed topic card css
|
2014-08-12 12:56:13 -04:00 |
|
|
Connor Turland
|
173179d682
|
fixed filters, updated ruby models further for returning json
|
2014-08-12 12:01:01 -04:00 |
|
|
Connor Turland
|
f0eb4da6a9
|
realtime for heroku
|
2014-08-12 11:10:32 -04:00 |
|
|
Connor Turland
|
e1fb72c2df
|
fixed user model and map models up
|
2014-08-12 11:09:53 -04:00 |
|
|
Connor Turland
|
9d6cf2c3c8
|
further improved explore maps switching
|
2014-08-11 22:47:38 -04:00 |
|
|
Connor Turland
|
5627b59d59
|
Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into new
|
2014-08-11 22:31:44 -04:00 |
|
|
Connor Turland
|
278b6213bb
|
improved explore maps pages
|
2014-08-11 22:31:28 -04:00 |
|
|
Shai Mor
|
65c8cb2ea7
|
embed attachments
|
2014-08-11 21:59:02 -04:00 |
|
|
Shai Mor
|
3be9dcfd74
|
Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into shai
|
2014-08-11 18:59:27 -04:00 |
|