Connor Turland
|
b6700f77f8
|
synapse fixes
|
2014-10-01 19:52:08 -04:00 |
|
Shai Mor
|
ff4a64665e
|
Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into develop
|
2014-10-01 18:09:15 -04:00 |
|
Shai Mor
|
4ba9a26c2b
|
style sidebar search mapper stats
|
2014-10-01 18:07:05 -04:00 |
|
Connor Turland
|
a1925b3573
|
heroku
|
2014-10-01 17:20:02 -04:00 |
|
Connor Turland
|
b577f4fd19
|
improved z-indexes
|
2014-10-01 17:15:35 -04:00 |
|
Connor Turland
|
999dae34ea
|
switched add link section on topic card to be without upload file for now
|
2014-10-01 16:44:11 -04:00 |
|
Connor Turland
|
8ef56735bf
|
switch metacode set styling complete
|
2014-10-01 16:23:59 -04:00 |
|
Connor Turland
|
a382e0c35d
|
account page image border radius, fixed filters not working on first click issue
|
2014-10-01 14:07:48 -04:00 |
|
Connor Turland
|
031f97ba42
|
search results styling
|
2014-10-01 13:18:24 -04:00 |
|
Shai Mor
|
db719abf0f
|
merge with develop
|
2014-10-01 09:57:40 -04:00 |
|
Shai Mor
|
57fb6a15c4
|
start on search results styling, pulled in external js libraries and css
|
2014-10-01 09:54:56 -04:00 |
|
Connor Turland
|
eccc433627
|
fixed realtime bug where couldn't populate filters because it was missing a new mapper model that just added something
|
2014-09-30 18:13:49 -04:00 |
|
Connor Turland
|
81f31ea10e
|
heroku
|
2014-09-30 16:59:19 -04:00 |
|
Connor Turland
|
86e78919b3
|
initial code for realtime, got new topic, new synapse, and topic drag working
|
2014-09-30 16:55:25 -04:00 |
|
Connor Turland
|
c1885615cd
|
remove tilda file
|
2014-09-29 22:26:50 -04:00 |
|
Connor Turland
|
2138aa89f3
|
closes #368. ability to add in metacode colors
|
2014-09-29 22:26:12 -04:00 |
|
Connor Turland
|
06f18215dd
|
bug fixes for mapping experience. able to store multiple references to synapses on each edge
|
2014-09-29 16:04:36 -04:00 |
|
Robert Best
|
2de7167c2c
|
A bunch of fixes for selection with box, and zoom to extents
|
2014-09-28 15:29:22 -04:00 |
|
Robert Best
|
66ee35e364
|
Fixed merge conflicts with wip-zoomextents code
|
2014-09-26 23:34:27 -04:00 |
|
Robert Best
|
0160f56238
|
partially finished fixes to zoomextents
|
2014-09-26 22:40:31 -04:00 |
|
Connor Turland
|
32908c7717
|
style changes for account pages
|
2014-09-26 22:31:06 -04:00 |
|
BasharJabbour
|
14eb7562b1
|
fixed edit user account page
|
2014-09-26 08:42:11 -04:00 |
|
Connor Turland
|
c46ab1a98b
|
added hover to edit photo
|
2014-09-25 13:41:37 -04:00 |
|
Connor Turland
|
71247a8f04
|
fixes for account pages
|
2014-09-25 13:26:09 -04:00 |
|
Connor Turland
|
3f901074ec
|
Merge branch 'forgetpass' of https://github.com/Connoropolous/metamaps_gen002 into accounts
|
2014-09-25 12:31:29 -04:00 |
|
BasharJabbour
|
6f62d59b66
|
Sign In, Sign Up, Edit User pages have been changed. Edit User page needs lots of work still.
|
2014-09-25 12:25:46 -04:00 |
|
Connor Turland
|
c817622984
|
for heroku
|
2014-09-24 17:15:39 -04:00 |
|
Connor Turland
|
265295a8a8
|
added color generator for each collaborator
|
2014-09-24 17:14:46 -04:00 |
|
Shai Mor
|
4ec9c4cb98
|
add zoom and pas events for multiple peers and label direction for compassCollab
|
2014-09-24 16:25:22 -04:00 |
|
Connor Turland
|
74b4659836
|
broke out functionality for positionPeerIcon from updatePeerCoords
|
2014-09-24 14:05:18 -04:00 |
|
Shai Mor
|
d5598819fd
|
add arrowCompass for collab: direction indication of other users on the map
|
2014-09-24 11:00:22 -04:00 |
|
Connor Turland
|
b163442163
|
collab compass nowrap
|
2014-09-24 08:45:46 -04:00 |
|
Connor Turland
|
58ff70717e
|
heroku
|
2014-09-23 10:37:08 -04:00 |
|
Connor Turland
|
dd6a21191a
|
heroku
|
2014-09-22 23:56:47 -04:00 |
|
Connor Turland
|
c2340301fd
|
Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into new
|
2014-09-22 23:42:37 -04:00 |
|
Connor Turland
|
aaf2e4c521
|
right click styling
|
2014-09-22 23:42:26 -04:00 |
|
Shai Mor
|
1396b02952
|
collabCompass img&p for content and styling
|
2014-09-22 11:44:09 -04:00 |
|
Shai Mor
|
d115861584
|
collabCompass img and p for content and styling
|
2014-09-22 11:36:53 -04:00 |
|
Bashar
|
5e76b44b80
|
centered reset password box
|
2014-09-21 20:47:09 -04:00 |
|
Connor Turland
|
ff6eef7807
|
synapse form styling and positioning
|
2014-09-21 01:02:21 -04:00 |
|
Connor Turland
|
90e974164d
|
added more resources into help lightbox
|
2014-09-20 15:11:58 -04:00 |
|
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 |
|
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 |
|
Robert Best
|
b15da256fa
|
Included title box size in zoom to extents and put a limits on the zooming
|
2014-08-16 12:46:06 -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 |
|
Connor Turland
|
bbc50d1305
|
got radial view working
|
2014-08-11 18:57:34 -04:00 |
|
Shai Mor
|
85bfce0237
|
part way through add links to topic cards
|
2014-08-11 18:55:53 -04:00 |
|
Connor Turland
|
f4cbd9b25d
|
added background
|
2014-08-11 12:12:46 -04:00 |
|
Connor Turland
|
995d49a5bd
|
reseting the filter box when you switch dynamically between maps
|
2014-08-11 12:04:06 -04:00 |
|
Connor Turland
|
22e07e4ca8
|
Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into new
|
2014-08-11 11:03:08 -04:00 |
|
Connor Turland
|
8bc1e0c9ee
|
added background file
|
2014-08-11 11:03:00 -04:00 |
|
Connor Turland
|
39140a06e6
|
moved famous files
|
2014-08-10 19:52:39 -04:00 |
|
Connor Turland
|
34500b3255
|
little fix for Util.splitLine
|
2014-08-10 19:44:53 -04:00 |
|
Connor Turland
|
465b95753c
|
reorganize for functional famous operation
|
2014-08-10 19:24:39 -04:00 |
|
Connor Turland
|
8fdae123d2
|
application.css issue
|
2014-08-10 19:17:32 -04:00 |
|
Connor Turland
|
afed3657c2
|
removed vendor plugins
|
2014-08-10 19:15:01 -04:00 |
|
Connor Turland
|
341f9b9bdd
|
home page styling
|
2014-08-10 19:13:25 -04:00 |
|
Shai
|
6182ba4e14
|
data validation
|
2014-08-10 16:52:49 -04:00 |
|
Connor Turland
|
a90eb90822
|
small fixes in backbone
|
2014-08-10 16:20:21 -04:00 |
|
Connor Turland
|
bc593fe614
|
Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into new
|
2014-08-10 13:07:27 -04:00 |
|
Connor Turland
|
06b35e550d
|
first draft of explore maps working
|
2014-08-10 13:06:58 -04:00 |
|
Robert Best
|
a9fc2f19f4
|
Added zoom to selected nodes feature
|
2014-08-07 08:21:13 -04:00 |
|
Connor Turland
|
d14d505c3a
|
pulling in Connors work on routers
Merge branch 'connor' of https://github.com/Connoropolous/metamaps_gen002 into new
|
2014-08-06 10:16:53 -04:00 |
|
Connor Turland
|
fe3536e20b
|
remove console log
|
2014-08-06 10:16:43 -04:00 |
|
Connor Turland
|
e9863c0192
|
merge with Robs changes
|
2014-08-06 10:14:17 -04:00 |
|
Connor Turland
|
e7a445423d
|
work in progress on explore maps pages
|
2014-08-06 10:09:01 -04:00 |
|
Robert Best
|
f75c2c1f8a
|
Added Recenter map, zoom in, zoom out, Zoom to extents and buttons for each. Also, renamed selection function to just SelectWithBox()
|
2014-08-06 04:22:06 -04:00 |
|
Tadasu85
|
9cab20dc2a
|
Merge robs changes
Merge remote-tracking branch 'origin/develop' into new
|
2014-08-04 12:21:09 -04:00 |
|
Tadasu85
|
e76d780335
|
Filter box coding changes, Full implementgit add .
|
2014-08-04 12:20:16 -04:00 |
|
Robert Best
|
c7b768d7f4
|
Finished selectWithBox using right click and made Ctrl and Shift work in the 'typical' way... Also, holdig alt now selects only nodes
|
2014-08-03 18:34:22 -04:00 |
|
Tadasu85
|
581ba8b78f
|
Merge remote-tracking branch 'origin/develop' into new
|
2014-08-02 13:51:54 -04:00 |
|
Tadasu85
|
2b267ea0c6
|
filterbox progress
|
2014-08-02 13:49:51 -04:00 |
|
Connor Turland
|
0a29bed856
|
fixed topics and synapses placing on map issue
|
2014-08-02 13:48:41 -04:00 |
|
Connor Turland
|
e08c702494
|
introduced the metamaps.router
|
2014-08-01 22:50:23 -04:00 |
|
Connor Turland
|
3476d0126c
|
got rgraph working again
|
2014-07-30 21:10:10 -04:00 |
|
Connor Turland
|
9dec959aee
|
more restructuring. reorganizing views files to make more sense, be grouped logically
|
2014-07-30 01:02:47 -04:00 |
|
Connor Turland
|
f817ce772c
|
changed approach to map creation. reorganized code to suit that.
|
2014-07-29 23:18:43 -04:00 |
|
Connor Turland
|
ae8c711d27
|
major code refactor
|
2014-07-29 13:34:10 -04:00 |
|
Connor Turland
|
b06f5cae35
|
huge refactor 75% done
|
2014-07-27 15:57:35 -04:00 |
|
Connor Turland
|
9027cd6d2e
|
closes #352 size of cheatsheet window, closes #351 remove topic and synapse create from cheatsheet on topic pages, closes #348 enter key creating undesirable line break
|
2014-06-15 14:39:42 -04:00 |
|
Connor Turland
|
bffda35686
|
updated cheatsheet to be tabbed
|
2014-06-14 18:21:54 -04:00 |
|
Connor Turland
|
2bb5c7a6bd
|
added homepage image
|
2014-06-11 22:38:48 -04:00 |
|
Connor Turland
|
e9b25be060
|
blurred input when closing search so that typing in it is no longer possible
|
2014-06-11 19:29:05 -04:00 |
|
Connor Turland
|
e67a520a24
|
added EsC key to cancel search
|
2014-06-11 19:18:59 -04:00 |
|
Connor Turland
|
60e9a85140
|
fixed issue where adding multiple versions of the same person to the realtime list
|
2014-06-11 18:42:39 -04:00 |
|
Connor Turland
|
0a3f83ade9
|
added realtime box
|
2014-06-11 16:47:46 -04:00 |
|
Connor Turland
|
ceb30ee5d6
|
error in selectEdgeOnClickHandler fixed
|
2014-06-11 11:05:04 -04:00 |
|
Connor Turland
|
5dd848abcf
|
fixed scrolling on home page
|
2014-06-11 10:38:08 -04:00 |
|
Connor Turland
|
140a526226
|
changed home page card styling
|
2014-06-11 10:25:33 -04:00 |
|
Connor Turland
|
820096e853
|
merged raymons changes
|
2014-06-11 08:42:12 -04:00 |
|
Connor Turland
|
6cec71fe2c
|
actually fixed metacode set styling issues
|
2014-06-10 20:30:06 -04:00 |
|
Connor Turland
|
3625a750fd
|
fixed metacode sets page styling issue
|
2014-06-10 20:22:35 -04:00 |
|
Raymon Johnstone
|
3d8332056a
|
Addition of scrollbar to search results.
|
2014-06-10 20:13:15 -04:00 |
|
Connor Turland
|
9cedf247f9
|
on topic pages, center on topic using alt+click
|
2014-06-10 19:25:24 -04:00 |
|
Connor Turland
|
c567f07a50
|
closes #338 ugly text labels. fixes error when trying to load topic page with a metacode set selected
|
2014-06-10 18:49:06 -04:00 |
|
Raymon Johnstone
|
6f2d19c570
|
Addition of scrollbar to search results
|
2014-06-10 17:41:34 -04:00 |
|
Connor Turland
|
bfa25bc604
|
sped up scroll bars
|
2014-06-10 13:34:39 -04:00 |
|
Connor Turland
|
b7703e2a0f
|
improved metacode set switcher styling
|
2014-06-10 13:13:21 -04:00 |
|
Connor Turland
|
35985aecaa
|
fixed styling of many of the user forms
|
2014-06-10 12:59:19 -04:00 |
|
Connor Turland
|
6454a592bd
|
custom best_in_place that completes change on hitting enter for textaareas
|
2014-06-09 17:56:42 -04:00 |
|
Connor Turland
|
8760cf0280
|
added new images and made realtime send more relevant messages including one when someone turns on realtime
|
2014-06-09 16:37:09 -04:00 |
|
Connor Turland
|
31817d31a5
|
closes #202, closes #301, closes #320, closes #337
|
2014-06-09 13:36:23 -04:00 |
|
Connor Turland
|
2820f57a9f
|
added metacode background bar set to match metacode color
|
2014-06-08 16:26:25 -04:00 |
|
Connor Turland
|
f30904d828
|
fixed lightbox hiding
|
2014-06-04 16:41:02 -04:00 |
|