opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity
25,581 Commits 69 Branches 243 Tags
fd6bf953278f67cfebda46ffd3e04ad8b6026ecc
Commit Graph
102 Commits
Author SHA1 Message Date
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
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
carlfeberhard 5ff73677bb (merge conflicts) 2016-05-31 11:16:20 -04: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
carlfeberhard f8e89ff3fc (merge conflicts) 2016-05-12 13:39:38 -04:00
guerler cea9a12238 Replace masthead dom to avoid duplication 2016-04-18 09:49:02 -04:00
carlfeberhard 4c7f367680 (merge conflicts with dev) 2016-04-15 15:23:08 -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