 Bjoern Gruening
|
6b8b0cde5b
|
make client
|
2016-07-22 22:47:13 +02:00 |
|
|
anuprulez
|
93c33b4188
|
A bit of clean of menu.js for the chat tab
|
2016-07-10 17:31:11 +02:00 |
|
|
Bjoern Gruening
|
1f1c35f708
|
merge
|
2016-06-19 21:49:15 +02:00 |
|
|
Bjoern Gruening
|
b18decddda
|
client updates
|
2016-06-18 12:03:13 +02:00 |
|
|
anuprulez
|
111a1c6222
|
Fixing the issue with persistent room names with spaces, adding fancy scroll bar, buttons instead of links for persistent rooms and UI changes for message area
|
2016-06-14 20:03:58 +02:00 |
|
|
anuprulez
|
80ee76cb39
|
Adding persistent rooms from config
|
2016-06-11 16:32:34 +02:00 |
|
|
Bjoern Gruening
|
5a3580c752
|
client updates
|
2016-06-08 14:31:44 +02:00 |
|
|
Bjoern Gruening
|
c79dadd931
|
client updates
|
2016-06-08 11:22:07 +02:00 |
|
|
anuprulez
|
2831ac80f7
|
adding feature of chat rooms tabs and notification color
|
2016-06-05 03:14:02 +02:00 |
|
|
anuprulez
|
0ef409dc12
|
adding close button and updating chat ui
|
2016-05-30 17:16:34 +02:00 |
|
|
anuprulez
|
7abca061f5
|
removed disconnet icon and moved the functionality to online status icon
|
2016-05-29 23:08:21 +02:00 |
|
|
anuprulez
|
ee647dbe80
|
revert to fetching resources from the URLs and adjusted the size of chat window
|
2016-05-29 18:20:41 +02:00 |
|
|
anuprulez
|
48466e1a84
|
adjusted previous changes with new ones for the communication server
|
2016-05-28 23:09:32 +02:00 |
|
|
Bjoern Gruening
|
b07cfa887d
|
make client updates
|
2016-05-28 20:26:43 +02:00 |
|
|
anuprulez
|
19d333d427
|
updated files for real time communication feature addition
|
2016-05-26 01:28:07 +02:00 |
|
|
anuprulez
|
e9642720b8
|
updating files for real time communication-server and client
|
2016-05-25 19:10:24 +02:00 |
|
|
guerler
|
a12c1cb45b
|
Cache histories individually
|
2016-05-25 11:37:47 -04:00 |
|
|
guerler
|
617cd2de82
|
Add event handlers to navigate through history
|
2016-05-25 11:37:47 -04:00 |
|
|
guerler
|
64cb97cfc9
|
Parse view instead of content dom on click
|
2016-05-25 11:37:47 -04:00 |
|
|
guerler
|
44bd042624
|
Add support for optional header items/icons
|
2016-05-25 11:37:46 -04:00 |
|
|
guerler
|
be97d7e6db
|
Replace frame dictionary with regular view
|
2016-05-25 11:37:45 -04:00 |
|
|
guerler
|
cea9a12238
|
Replace masthead dom to avoid duplication
|
2016-04-18 09:49:02 -04:00 |
|
|
Martin Cech
|
87dbfeeabd
|
Merge branch 'release_16.01' into release_16.04
Conflicts:
static/scripts/bundled/analysis.bundled.js
static/scripts/bundled/analysis.bundled.js.map
static/scripts/bundled/libs.bundled.js
static/scripts/bundled/libs.bundled.js.map
|
2016-04-13 11:55:16 -04:00 |
|
|
Martin Cech
|
1e3b3a1558
|
fix the value passed to Masthead as options were options.config before
|
2016-04-12 14:43:18 -04:00 |
|
|
Martin Cech
|
2ebe940510
|
load options from config, not from options
|
2016-04-12 12:50:18 -04:00 |
|
|
John Chilton
|
aee38feeb4
|
Merge remote-tracking branch 'galaxyproject/dev' into gie-generic
Conflicts:
static/maps/layout/menu.js.map
static/scripts/bundled/libs.bundled.js
static/scripts/bundled/libs.bundled.js.map
static/scripts/layout/menu.js
|
2016-04-04 13:00:21 -04:00 |
|
|
Martin Cech
|
93b7473be8
|
remove deprecated user-facing lib link;
remove 'published' from the menu items for shared elements
|
2016-03-23 15:20:06 -04:00 |
|
|
Dannon Baker
|
033241c99f
|
Merge 16.01, rebuild.
|
2016-03-23 12:39:06 -04:00 |
|
|
Nicola Soranzo
|
d10ee6f6c4
|
Merge branch 'release_16.01' into dev
Conflicts:
static/scripts/bundled/analysis.bundled.js.map
static/scripts/bundled/libs.bundled.js
static/scripts/bundled/libs.bundled.js.map
|
2016-03-22 20:54:32 +00:00 |
|
|
guerler
|
79d16f71f9
|
Fix scratchbook
|
2016-03-22 14:19:58 -04:00 |
|
|
carlfeberhard
|
fef166545c
|
Layout: Fix optional panel rendering and associated inline css
|
2016-03-22 11:52:13 -04:00 |
|
|
Dannon Baker
|
4bf8adbb64
|
Merge, rebuild.
|
2016-03-22 11:24:58 -04:00 |
|
|
carlfeberhard
|
133f77413e
|
Fix 'Resend verification' link in inactive user message box which would display as [Object object]
|
2016-03-22 11:24:14 -04:00 |
|
|
guerler
|
58346169df
|
Fix dom duplication
|
2016-03-22 10:54:38 -04:00 |
|
|
Eric Rasche
|
1c94fdd528
|
Merge in master
|
2016-03-17 13:48:58 +00:00 |
|
|
Eric Rasche
|
755465cf94
|
Merge in master
|
2016-03-17 13:47:10 +00:00 |
|
|
Eric Rasche
|
50770c962a
|
Repack client
|
2016-03-17 13:45:41 +00:00 |
|
|
guerler
|
4976945ab0
|
Fix icon sizes
|
2016-03-15 17:21:21 -04:00 |
|
|
Dannon Baker
|
370ea10f75
|
Use real routes for tours, and make them actually work. Now it's
possible to open the tour index in a new tab, etc., instead of just
using javascript craziness.
|
2016-03-04 16:23:58 -05:00 |
|
|
Eric Rasche
|
05171a7bc5
|
Correct URL, fix compiled artefact
|
2016-02-24 18:02:18 -06:00 |
|
|
Eric Rasche
|
ba6b06cecb
|
Merge in master
|
2016-02-24 16:49:46 -06:00 |
|
|
Eric Rasche
|
28172499d9
|
Update bundle
|
2016-02-24 16:47:43 -06:00 |
|
|
guerler
|
7b8f675172
|
Place logo into config, add masthead test cases
|
2016-02-18 17:40:28 -05:00 |
|
|
Dannon Baker
|
33ebeb801d
|
Use backbone routing for a tours URL, since there's no serverside endpoint.
|
2016-02-04 10:21:49 -05:00 |
|
|
Nate Coraor
|
246870c459
|
Merge branch 'release_16.01' into dev
|
2016-02-03 13:11:07 -05:00 |
|
|
Bjoern Gruening
|
45f523f922
|
fix show_welcome_with_login = True
|
2016-02-03 15:19:09 +01:00 |
|
|
guerler
|
e52626b279
|
Apply fix from 16.01
|
2016-01-14 09:09:57 -05:00 |
|
|
guerler
|
0ccb72160a
|
Refactor masthead render to improve readibility
|
2016-01-14 09:04:41 -05:00 |
|
|
guerler
|
4b5b970d78
|
Fix disabled css
|
2016-01-13 20:50:40 -05:00 |
|
|
guerler
|
37f8038d63
|
Undo user icon in masthead
|
2016-01-13 14:31:40 -05:00 |
|