Граф коммитов

  • 235beeb829 Merge branch 'master' of https://github.com/asaadmahmoodspin/platform Asaad Mahmood 2015-07-08 22:40:28 +05:00
  • c721a3deac Merge pull request #1 from rgarmsen2295/mm-1469 asaadmahmoodspin 2015-07-08 22:39:44 +05:00
  • 8256a168a6 Merge branch 'MM-1284' of https://github.com/nickago/platform into MM-1284 merge conflics nickago 2015-07-08 10:33:01 -07:00
  • 126c2e56e0 Semicolons and a bug fix nickago 2015-07-08 10:32:33 -07:00
  • 9873ffd05f Changed linkify to autolinker and wrote gap-bridging code nickago 2015-07-07 09:24:42 -07:00
  • b891482bce Add ALL the semicolons nickago 2015-07-08 10:16:29 -07:00
  • ce5639a629 Adding comments to change versions in sync Christopher Speller 2015-07-08 12:43:23 -04:00
  • d5785ee901 Finishing centralization of BrowserStore Christopher Speller 2015-07-08 12:38:14 -04:00
  • 689692b22d Merge pull request #130 from hmhealey/staticjs Corey Hulen 2015-07-08 07:54:49 -08:00
  • 30e90a2155 Corrected release numbering in README.md it33 2015-07-08 07:02:07 -07:00
  • 7f5ebb42b5 Modifying all storage to use session storage. Also adding an abstraction layer to add current user id as a prefix to most keys. Christopher Speller 2015-07-08 09:55:24 -04:00
  • 9da9f62f44 Use correctly minified and unminified js libraries for JQuery, Bootstrap, and Perfect Scrollbar hmhealey 2015-07-06 10:13:38 -04:00
  • 66e2ff0ae3 Copied Bootstrap, jQuery and React libraries and resources into repository hmhealey 2015-07-03 11:52:33 -04:00
  • cafae64a90 Moved minified javascript out of min directory hmhealey 2015-07-03 11:02:47 -04:00
  • 3012a7f532 Merge pull request #136 from mattermost/code-review Joram Wilander 2015-07-08 09:07:47 -04:00
  • 450821bcba Merge pull request #148 from hmhealey/mm1488 Christopher Speller 2015-07-08 09:01:17 -04:00
  • 85b895ecb7 Merge pull request #147 from rgarmsen2295/mm-934 Corey Hulen 2015-07-07 23:13:43 -08:00
  • f6e8b4f310 Merge pull request #143 from rgarmsen2295/mm-1416 Corey Hulen 2015-07-07 23:12:08 -08:00
  • 817d9110b3 Merge pull request #137 from nickago/MM-1417 Corey Hulen 2015-07-07 23:11:46 -08:00
  • 65dc307e68 Small tweaks and cleanup Reed Garmsen 2015-07-07 18:12:53 -07:00
  • ddeb3ec738 Added a server side check to see if members who are trying to be invited have already been invited by checking the email. Client handles it as if it was an email error. Reed Garmsen 2015-07-07 17:57:25 -07:00
  • 809cc9f6f3 Changed code to dismiss mention list to not trigger when you click on the list itself hmhealey 2015-07-07 17:44:32 -04:00
  • ff4b94f02b Small changes and code clean-up Reed Garmsen 2015-07-07 13:18:10 -07:00
  • 91511281c5 Changed loading logic for retrieving more channels to allow for loading animation to be inserted into the More... menu that allows you to join more channels while waiting for the list of channels to load Reed Garmsen 2015-07-07 13:10:11 -07:00
  • 66e97a56b0 Merge pull request #142 from asaadmahmoodspin/master Joram Wilander 2015-07-07 15:51:03 -04:00
  • daaf331eb5 Changed textarea resizeability from being a blanket statement to everything to only the ones with issues Reed Garmsen 2015-07-07 12:04:36 -07:00
  • 2be660f05d Merge pull request #139 from hmhealey/makefilegodeps Joram Wilander 2015-07-07 15:04:21 -04:00
  • 7102530def Prevent text areas from being resizeable Reed Garmsen 2015-07-07 11:56:55 -07:00
  • 37fbd62a7c MM-1221 - Fixing scrolling issue in the RHS Asaad Mahmood 2015-07-07 23:35:35 +05:00
  • 4586767092 Updating background Asaad Mahmood 2015-07-07 22:58:13 +05:00
  • 69e5898f4b Merge branch 'master' of https://github.com/mattermost/platform Asaad Mahmood 2015-07-07 22:57:57 +05:00
  • 4e856c29b2 Merge pull request #138 from hmhealey/mm756 Christopher Speller 2015-07-07 13:36:05 -04:00
  • 4acff76bdd Changed linkify to autolinker and wrote gap-bridging code nickago 2015-07-07 09:24:42 -07:00
  • 14f02b770b Merge branch 'master' of https://github.com/mattermost/platform Asaad Mahmood 2015-07-07 20:16:14 +05:00
  • 23e527978e Add a post type for user joined/left messages and don't flag a channel as unread when one of those is automatically posted hmhealey 2015-07-07 11:00:29 -04:00
  • 6b7462bceb add missing tabIndex for channel members modal ralder 2015-07-07 02:05:17 -07:00
  • 95b9f87288 Merge pull request #141 from hmhealey/profilepicture32bit Christopher Speller 2015-07-07 08:44:29 -04:00
  • 982c9eeceb Merge pull request #134 from nickago/MM-1313 Christopher Speller 2015-07-07 08:30:56 -04:00
  • f839b63496 Added new error message when trying to add a channel that was previously deleted as well as a corresponding unit test Reed Garmsen 2015-07-06 17:57:36 -07:00
  • 73cb6904a1 Fixing code error in css Asaad Mahmood 2015-07-07 04:21:20 +05:00
  • ab36656830 Fixing before after hover for date/new separator Asaad Mahmood 2015-07-07 04:19:39 +05:00
  • 98bdaa04f5 Files img files Asaad Mahmood 2015-07-07 04:16:04 +05:00
  • 047e7145bb Fixing background hovers Asaad Mahmood 2015-07-07 04:13:36 +05:00
  • 122a67c3b4 Explicitly cast to an int64 when selecting a random profile picture colour to prevent overflow on 32-bit installations of Go hmhealey 2015-07-06 18:08:52 -04:00
  • 2a0516f1fd Merge pull request #140 from mattermost/fix-build Corey Hulen 2015-07-06 14:03:15 -08:00
  • a84fc7b938 fixing build =Corey Hulen 2015-07-06 14:02:42 -08:00
  • b418f4cd62 Merge pull request #135 from asaadmahmoodspin/master Corey Hulen 2015-07-06 13:58:38 -08:00
  • 8f48d63959 Merge pull request #133 from nickago/MM-794 Corey Hulen 2015-07-06 13:57:57 -08:00
  • 5bdc7f3762 Merge pull request #132 from mattermost/mm-1250 Corey Hulen 2015-07-06 13:57:29 -08:00
  • 48538d82bc Change Makefile to look for godep in GOPATH instead of using a relative path hmhealey 2015-07-06 17:31:58 -04:00
  • 1f0b4a39b0 redirected channel name 404's to town square nickago 2015-07-06 13:14:51 -07:00
  • 83e4d3fb9c Changed socket event to a props based change nickago 2015-07-06 12:37:42 -07:00
  • 3dec509899 Merge pull request #131 from mattermost/mm-1391 Corey Hulen 2015-07-06 11:24:06 -08:00
  • e3ab0a4e3d team code review =Corey Hulen 2015-07-06 11:20:40 -08:00
  • f51cc73aaf MM-1461 - Updating Mattermost UI Asaad Mahmood 2015-07-06 23:18:23 +05:00
  • 10b625ba17 Merge pull request #128 from rgarmsen2295/mm-832 Christopher Speller 2015-07-06 12:07:56 -04:00
  • 8ac5f22337 Typing notification disappears when message is sent nickago 2015-07-06 08:43:45 -07:00
  • 0b71537ff0 Typing notifier resets on channel change nickago 2015-07-06 08:14:42 -07:00
  • e9bec9600d Fixed copy-paste error in code Reed Garmsen 2015-07-06 07:47:11 -07:00
  • 4ac07f4347 Fixed not being able to open channel notifications settings menu in IE10 Reed Garmsen 2015-07-02 19:04:48 -07:00
  • 7c95df2766 Force the extra info to update asych nickago 2015-07-03 13:04:06 -07:00
  • b819b492bf Merge pull request #127 from rgarmsen2295/mm-1047 Joram Wilander 2015-07-06 07:31:26 -04:00
  • 34fb817a4a Fixing unit tests =Corey Hulen 2015-07-06 00:50:42 -08:00
  • cbadc26386 adding debugging =Corey Hulen 2015-07-06 00:00:34 -08:00
  • 9be9cf8d9d adding debugging =Corey Hulen 2015-07-05 23:52:07 -08:00
  • fcbb3d5561 adding debugging =Corey Hulen 2015-07-05 23:51:07 -08:00
  • f2db93f111 adding debugging =Corey Hulen 2015-07-05 23:28:45 -08:00
  • e26954ef46 adding debugging =Corey Hulen 2015-07-05 23:19:05 -08:00
  • b95e053d41 fixing unit test =Corey Hulen 2015-07-05 10:22:52 -08:00
  • 4af59ee357 fixing unit test =Corey Hulen 2015-07-05 10:22:07 -08:00
  • b0a917bbc7 fixing unit test =Corey Hulen 2015-07-05 10:09:47 -08:00
  • b968ef04a0 fixing unit test =Corey Hulen 2015-07-05 10:04:01 -08:00
  • e01aea7825 fixing unit tests =Corey Hulen 2015-07-05 09:52:23 -08:00
  • 9261b1ec62 fixing timming test =Corey Hulen 2015-07-05 09:33:08 -08:00
  • 60f5350402 Fixing unit test =Corey Hulen 2015-07-05 09:27:00 -08:00
  • 5582a05909 Fixing unit test =Corey Hulen 2015-07-05 09:22:32 -08:00
  • ed178457cd fixing unit tests =Corey Hulen 2015-07-05 09:13:06 -08:00
  • ec2af296b2 fixing race condition in unit tests =Corey Hulen 2015-07-05 09:06:56 -08:00
  • 592d68cf41 Merge branch 'master' into mm-1391 =Corey Hulen 2015-07-05 09:02:23 -08:00
  • 72bfc1ee2a adding mysql 5.6.17 =Corey Hulen 2015-07-05 08:53:23 -08:00
  • 3a585bf471 adding mysql 5.6 =Corey Hulen 2015-07-05 08:46:04 -08:00
  • 1a84f8da20 adding sql 5.6 =Corey Hulen 2015-07-05 08:38:36 -08:00
  • 612286d969 adding sql 5.6 =Corey Hulen 2015-07-05 08:31:54 -08:00
  • df97f25c25 adding more unit tests =Corey Hulen 2015-07-05 08:28:22 -08:00
  • 4a3003c0dc Merge pull request #116 from nickago/MM-1341 Joram Wilander 2015-07-03 15:05:33 -04:00
  • 5b59e38a21 Fixed and added links to process and forums it33 2015-07-03 11:01:08 -07:00
  • 6b1ae67f2f Added comment for later reference Reed Garmsen 2015-07-02 18:02:00 -07:00
  • e51a0461a6 Implemented IE10 & 11 specific error suppression when a 200 status (aka OK) error is thrown Reed Garmsen 2015-07-02 17:54:00 -07:00
  • 933578ca07 Removed option that does not work Reed Garmsen 2015-07-02 08:50:15 -07:00
  • 6b48dbe231 Added two possible options for removing blue bar error, will choose one later Reed Garmsen 2015-07-01 12:30:46 -07:00
  • 5a597c9606 Added line that disables caching with a ajax client call that was causing errors to be thrown in IE10 Reed Garmsen 2015-06-30 20:40:27 -07:00
  • 3a8059e477 Merge pull request #126 from rgarmsen2295/mm-1210 Joram Wilander 2015-07-02 20:09:16 -04:00
  • 1a1b29ee6c Restructured logic to flow more naturally and be cleaner Reed Garmsen 2015-07-02 16:38:34 -07:00
  • cbfc85fde2 Added import statement to styles.scss Reed Garmsen 2015-07-02 12:20:39 -07:00
  • 483b37a64f Added logic for loading animation to appear when posts have yet to be loaded. Added markup necessary for loading animation css. Removed a file that was no longer needed for the design. Reed Garmsen 2015-07-01 16:51:26 -07:00
  • d5d9481c0f Added new files for adding new loading animation Reed Garmsen 2015-06-30 20:01:35 -07:00
  • 681d4d3b78 Merge pull request #125 from asaadmahmoodspin/master Christopher Speller 2015-07-02 17:21:15 -04:00
  • a3d521298a Fixing padding in sidebar dropdown Asaad Mahmood 2015-07-18 01:54:56 +05:00
  • 4f00ff1c24 Merge branch 'master' of https://github.com/mattermost/platform Asaad Mahmood 2015-07-18 01:52:48 +05:00
  • ea1ef222b7 MM-1319 - Copy link and background change Asaad Mahmood 2015-07-18 01:52:37 +05:00