 Dannon Baker
|
11ee6ea638
|
Fix 'logged in as' localization usage.
|
2017-03-17 11:44:01 -04:00 |
|
|
Dannon Baker
|
78074243d7
|
Forgot localization for 'Login'
|
2017-03-17 11:32:37 -04:00 |
|
|
Dannon Baker
|
d4462cb321
|
Localization support for menu.
|
2017-03-16 09:40:06 -04:00 |
|
|
guerler
|
20916c16a9
|
Remove back button to simplify routing, avoid failing returns
|
2017-03-10 10:36:31 -05:00 |
|
|
Dannon Baker
|
42c090cb20
|
Update users->user in the menu as well
|
2017-03-02 10:00:39 -05:00 |
|
|
anuprulez
|
132e284d37
|
Bug fix for masthead webhook if Galaxy.page is undefined for workflow, data libraries etc pages
|
2016-12-21 12:46:14 +01:00 |
|
|
Martin Cech
|
bf8cffa2b3
|
repack client
|
2016-11-30 12:10:23 -05:00 |
|
|
Martin Cech
|
710c2639f9
|
Merge branch 'dev' into adjust-menu-tooltips
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-11-30 12:08:46 -05:00 |
|
|
Martin Cech
|
72960de216
|
adjust menu tooltips to be oneliners
|
2016-11-29 15:51:45 -05:00 |
|
|
guerler
|
416b94f195
|
Avoid using navigate, reload page until routing has been established
|
2016-11-23 14:24:38 -05:00 |
|
|
guerler
|
16a60538d9
|
Fix history back, and forward
|
2016-11-23 13:55:03 -05:00 |
|
|
guerler
|
20d45ee62c
|
Temporary routing, not best practice
|
2016-11-23 13:47:08 -05:00 |
|
|
guerler
|
b38c6afefe
|
Merge branch 'dev' into remove_mako_user_pref
|
2016-11-23 12:06:50 -05:00 |
|
|
Dannon Baker
|
6aab802e5a
|
Tour routing tweaks, allows us to drop the model out of menu
|
2016-11-23 11:02:42 -05:00 |
|
|
guerler
|
d4760ed210
|
Enable new user preference ui by default
|
2016-11-22 20:27:00 -05:00 |
|
|
guerler
|
f960be7b43
|
Route user preferences analogous to tours
|
2016-11-22 20:22:14 -05:00 |
|
|
guerler
|
564a7236ca
|
Remove api keys from user dropdown
|
2016-11-22 17:28:44 -05:00 |
|
|
guerler
|
daa1900929
|
Fix link to user preferences when library view is shown
|
2016-11-22 17:27:19 -05:00 |
|
|
guerler
|
eed7f2ce08
|
Rename to Preferences
|
2016-11-10 00:18:48 -05:00 |
|
|
guerler
|
44cd6ef738
|
Show new preference form instead of old one if clicked on and active
|
2016-11-08 14:41:03 -05:00 |
|
|
guerler
|
b37ac03cec
|
Fix parameter factory
|
2016-11-04 00:01:01 -04:00 |
|
|
guerler
|
25a8edd66c
|
Revise communication preference check
|
2016-11-03 23:13:25 -04:00 |
|
|
anuprulez
|
f04ea9f8db
|
Changing the config variable name for toggling new user preferences
|
2016-11-02 19:36:57 +01:00 |
|
|
anuprulez
|
fd6bf95327
|
Adding config for enabling the new user preferences UI
|
2016-11-01 22:01:26 +01:00 |
|
|
anuprulez
|
fb75c23f0d
|
Adding more client side validations for Change password feature and code comments and a bit of code cleanup
|
2016-10-31 18:07:10 +01:00 |
|
|
anuprulez
|
14612f8a92
|
Updating conditions for communication settings for new user preferences
|
2016-10-30 18:30:36 +01:00 |
|
|
anuprulez
|
c40be4f4c6
|
Merge with dev
|
2016-10-30 17:59:25 +01:00 |
|
|
Dannon Baker
|
62773a72c7
|
Reapply isolated menu.js webhook changes
|
2016-10-27 12:35:36 +02:00 |
|
|
Dannon Baker
|
6e4f3d9d2d
|
Revert menu.js, tool-form.js to pre-webhooks-PR
|
2016-10-27 10:56:58 +02:00 |
|
|
Dannon Baker
|
a6d52cdbdc
|
Merge remote-tracking branch 'bgruening/feature/plugin-system' into dev
|
2016-10-23 19:00:43 +02:00 |
|
|
Evgeny Anatskiy
|
cc36793cd0
|
- remove separate functions for adding masthead/history-menu plugins
- choose a random tool/workflow plugin only among active ones
|
2016-10-12 10:49:41 +02:00 |
|
|
Evgeny Anatskiy
|
ef304a2223
|
- merge
|
2016-10-09 22:22:54 +02:00 |
|
|
Evgeny Anatskiy
|
69a9344c52
|
- show Webhook on a workflow page
- fix merge errors
|
2016-10-09 22:18:15 +02:00 |
|
|
Evgeny Anatskiy
|
2bf0549a37
|
fix bugs after previous commit
|
2016-10-05 16:59:16 +02:00 |
|
|
Evgeny Anatskiy
|
31674ef5b7
|
Merge branch 'feature/plugin-system' of github.com:bgruening/galaxy into feature/plugin-system
# Conflicts:
# client/galaxy/scripts/layout/menu.js
# client/galaxy/scripts/mvc/tool/tool-form.js
# static/maps/layout/menu.js.map
# static/maps/mvc/tool/tool-form.js.map
# 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
# static/scripts/layout/menu.js
# static/scripts/mvc/tool/tool-form.js
|
2016-10-05 16:16:27 +02:00 |
|
|
Evgeny Anatskiy
|
b98e49f2bc
|
bug fixes and improvements
|
2016-10-05 15:33:03 +02:00 |
|
|
anuprulez
|
60d4570c54
|
Merging with dev
|
2016-09-24 19:33:09 +02:00 |
|
|
anatskiy
|
9ff882944e
|
- unify webhooks entry point
- simlify webhooks code (on load)
- improve code readability
- clean up
|
2016-08-29 23:47:42 +02:00 |
|
|
anatskiy
|
bec41c889d
|
renamings and fixes
|
2016-08-20 19:32:11 +02:00 |
|
|
anatskiy
|
d2b58c8099
|
topbar webhooks testing
|
2016-08-20 19:08:36 +02:00 |
|
|
Scott Szakonyi
|
050a3f26bb
|
Addressing issue 2747
|
2016-08-17 12:27:06 -04:00 |
|
|
Dannon Baker
|
0e9c044256
|
Merge branch 'release_16.07' into dev
|
2016-08-08 11:26:57 -04:00 |
|
|
guerler
|
83d4ebd034
|
Fix unused href parameter when adding scratchbook frames
|
2016-08-05 12:05:03 -04:00 |
|
|
anuprulez
|
a63f63440e
|
Adding login information section for manage user information feature
|
2016-07-31 15:00:01 +02:00 |
|
|
anuprulez
|
77f5655de1
|
Adding routes and api calls for user preferences
|
2016-07-30 20:01:19 +02:00 |
|
|
anuprulez
|
b8e2833b5b
|
Adding code for replacing mako for user preferences with simple features
|
2016-07-30 00:41:27 +02:00 |
|
|
carlfeberhard
|
62de9bf76a
|
Merge remote-tracking branch 'upstream/dev' into history-contents.limiting
|
2016-07-28 11:58:12 -04:00 |
|
|
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 |
|