-
Notifications
You must be signed in to change notification settings - Fork 10.6k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[NEW] Rocket.Chat UI Redesign #7643
Merged
Merged
Changes from 199 commits
Commits
Show all changes
228 commits
Select commit
Hold shift + click to select a range
8e5fd7f
add new variables to db
a06c861
render colors
ggazzo bbd9d85
fix observer
ggazzo 98a5e80
.
f591d30
Fix sending 'property' field setting to client on update
sampaiodiego 3f3b209
final dynamicCss injector
72f3f46
change sidebar background color
9951e53
account-box
4d752f3
sidebar style
49cbcb4
forms
807eb3a
sidebar rooms-list
d3a51ad
Merge branch 'color-variables' of https://github.com/RocketChat/Rocke…
ggazzo 95d1e09
wrap old css
ggazzo fabacf1
sidebar style
28f7b16
unread group
ggazzo 5cce44c
Merge branch 'color-variables' of https://github.com/RocketChat/Rocke…
ggazzo 17dfe01
fix the problem about same room on unread and another list
ggazzo 7eb97aa
user avatar
6b73cd8
rc-tooltip
ggazzo 62fe72e
svg
968b659
tooltip
619d123
fix name/username height
bbc660c
swipe to open menu
ggazzo 229b5a5
close menu on click body
ggazzo 36dabc0
popover
80ee07e
popover
c86b879
fix room icons
87ba549
fix popover margin
503d010
fix sidebar
ggazzo 84de5da
fix popover margin
c279300
font-weigth adjustment
6e6f829
sidebar
ggazzo 9153920
merge
ggazzo a63f37c
merge develop
karlprieb efe5617
sidebar adjustments and new flexnav
karlprieb 2a81e32
develop merge
karlprieb 23fd756
fix toolbar search
karlprieb 96a8b2b
just to sync
karlprieb 00524d3
just to sync
karlprieb a106dea
sidebarItem
karlprieb c42936c
sort list by lastmessage
ggazzo 2580b03
Merge branch 'color-variables' of github.com:RocketChat/Rocket.Chat i…
ggazzo fca3fc1
fix sidebarItem
karlprieb ee78348
fix sidebar--flex opening
karlprieb 52b43d6
subscriptions lastActivity
ggazzo c9033b9
Merge branch 'color-variables' of github.com:RocketChat/Rocket.Chat i…
ggazzo 6922be2
sort by activity dict
ggazzo 63d2b27
fix chatroomitem
karlprieb b0a506f
Merge branch 'color-variables' of github.com:RocketChat/Rocket.Chat i…
karlprieb 8094cd9
create new channel page
karlprieb 968c7ad
create channel
karlprieb c0d669a
create channel
karlprieb fa8cdb6
fix admin search
karlprieb 1f187e4
create channel validation
ggazzo e6858c2
input error
karlprieb 3e6f3d3
Merge branch 'color-variables' of github.com:RocketChat/Rocket.Chat i…
karlprieb 2da75ad
create channel calling the method, making the redirect and some impro…
ggazzo d5030d2
selectdropdown
ggazzo 10fa852
rc-tags
karlprieb a293882
fix svg icons
karlprieb 180a446
adjust font-weight
karlprieb 7cdf0ba
fix memberslist
karlprieb 512b350
Remove bundle-visualizer
karlprieb 1f7150a
Merge branch 'develop' into color-variables
karlprieb 73385f6
autocomplete
ggazzo a0204c4
Merge branch 'color-variables' of github.com:RocketChat/Rocket.Chat i…
ggazzo 9036dfe
remove some consts from autocomplete
karlprieb cc64898
change sidebar footer padding
karlprieb 0bcd3c7
Add translated strings to "create new channel"
karlprieb 6195689
Fix toolbar search and sidebar footer
karlprieb 60d1b41
Fix paddings and username size
karlprieb 2b7a7d4
filter roomTypes by condition
ggazzo a03a0a9
Fix account box and add items do livechat, my account and logout menu…
karlprieb 1ad7c93
Fix login/register page height
karlprieb 5b808f0
remove console.log
karlprieb f5c63b4
Merge branch 'develop' of github.com:RocketChat/Rocket.Chat into colo…
ggazzo d8d59ef
new account profile
ggazzo 09e7d09
Merge branch 'develop' of github.com:RocketChat/Rocket.Chat into colo…
ggazzo 75a186c
Add CircleCI
sampaiodiego 402c3de
Remove lints from CI
sampaiodiego 0ffc117
Add phantom hack
sampaiodiego 8db769f
Add remove Docker
sampaiodiego 89b2675
Fix Docker build and add $HOME .meteor to cache
sampaiodiego 86ea519
Fix yml
sampaiodiego cd9c7af
Remove $HOME .meteor from cache
sampaiodiego 7eeacd7
Fix CircleCI Dockerfile
sampaiodiego f418d48
Fix Dockerfile
sampaiodiego e841298
Filter CircleCI to build only color-variables branch
sampaiodiego 39bfbbf
message box
ggazzo d98c14d
Merge branch 'color-variables' of github.com:RocketChat/Rocket.Chat i…
ggazzo ac676d5
Merge branch 'develop' into color-variables
karlprieb 6e79b6d
grid
karlprieb 70c8e97
Merge branch 'fix-emojis' into color-variables
karlprieb fe7d775
Merge branch 'remove-sanstorm-login-method' of github.com:RocketChat/…
ggazzo 4fc85eb
Merge branch 'remove-sanstorm-login-method' into color-variables
karlprieb 21ca3b6
smile icon
karlprieb 8c2cf18
message box popover
karlprieb 38c0d8b
profile details
ggazzo 35bf105
Merge branch 'color-variables' of github.com:RocketChat/Rocket.Chat i…
ggazzo 1fce50f
firt implementation of md on textarea
ggazzo 0070062
fix width main content, messagebox autogrow transition
ggazzo e53a977
Merge branch 'develop' into color-variables
karlprieb 76c0253
Merge branch 'color-variables' of github.com:RocketChat/Rocket.Chat i…
karlprieb eeea651
fix editing color messagebox
ggazzo 03d0c4c
Merge remote-tracking branch 'origin/color-variables' into color-vari…
ggazzo c7371a2
custom fields on profile configs
ggazzo adc6e69
fix channel list new users
ggazzo a3c5472
md commands undo
ggazzo 24950af
messageBox actions
karlprieb 4bf5a46
messageBox actions startup
karlprieb fddaedc
messageBox actions
ggazzo 519501a
message actions filtered by conditions
ggazzo 1378bdd
fix bold
karlprieb b7a3b18
fix spaces between groups (messagebox)
ggazzo 5fd408d
Merge branch 'color-variables' of github.com:RocketChat/Rocket.Chat i…
ggazzo 619c920
markdown helper icons
karlprieb cef0ce3
markdown helper icons align
karlprieb 890ccb6
fix reply and quote message
ggazzo 22d38ed
rename selectedText
ggazzo e0631f7
Remove markdown on toolbar click
sampaiodiego 8b0a46a
fileupload message box action
karlprieb 8386f57
Merge branch 'color-variables' of github.com:RocketChat/Rocket.Chat i…
karlprieb 32ce2a8
Remove markdown even if nothing selected
sampaiodiego 9bec704
fix cmd + k loses element focus and throws Uncaught TypeError: Cannot…
ggazzo eba29af
Merge remote-tracking branch 'origin/color-variables' into color-vari…
ggazzo e6eb546
close popover on file upload
karlprieb 1e00401
fix stylelint
karlprieb e080e0d
Notify new build
sampaiodiego b3cc053
Fix notify
sampaiodiego 29bb7fc
fix emojipicker
ggazzo 713b4e6
Fix notify
sampaiodiego d395d7a
Merge remote-tracking branch 'origin/color-variables' into color-vari…
ggazzo e3708a0
Merge branch 'develop' into color-variables
karlprieb bfd7544
move messageBoxActions startup to ui-message package
karlprieb 07b491b
fix username overlay
karlprieb d0645fd
remove admin menu icons
karlprieb 1b385ad
action audio and video
ggazzo a71e2ec
Merge remote-tracking branch 'origin/color-variables' into color-vari…
ggazzo 02cb915
fix livechat layout
karlprieb c86df34
fix codacy
karlprieb bb3d361
fix flextab on mobile
karlprieb e926f57
align markdown helpers
karlprieb f388096
fix private room icon
karlprieb ffaa607
fix eslint
karlprieb d3905bf
fix tab on sidenav
ggazzo 08dcc73
Merge remote-tracking branch 'origin/color-variables' into color-vari…
ggazzo 5610bbb
fix avatar upload icons and add burger menu back
karlprieb bc0d898
fix Channel preview mode hint is broken
ggazzo 5cf694d
Merge remote-tracking branch 'origin/color-variables' into color-vari…
ggazzo 180459a
remove 22 char channel name limit
karlprieb b1fbdd1
add send icon
karlprieb ec71dcc
add editing message background
karlprieb c3ec2ec
send button
ggazzo 86b384a
Merge remote-tracking branch 'origin/color-variables' into color-vari…
ggazzo fe602fb
fix safari
karlprieb 137884e
try to fix tests
MartinSchoeler 35477ed
fix dark overlay not being removed
MartinSchoeler 51cb924
text ellipsis, alert offline
ggazzo 7200238
Merge remote-tracking branch 'origin/color-variables' into color-vari…
ggazzo 01c02e0
css variables
karlprieb 7af89f7
Fix Burger Menu Not Showing
MartinSchoeler 4859f79
add @media to last commit
MartinSchoeler 75141e2
fix empty messagebox action menu
MartinSchoeler bbc4240
fix identation
MartinSchoeler 27c0b61
message box readonly and blocked
ggazzo 0392572
remove less files
karlprieb 74c3523
user status color
karlprieb 24ab3c5
fix offline users on search
ggazzo 2af44c8
Merge branch 'color-variables' of github.com:RocketChat/Rocket.Chat i…
ggazzo 5ffcd90
focus on messagebox
ggazzo dce3f2d
fix status on channel
ggazzo b6cfa7c
fix anonymous user preferences
MartinSchoeler f3aa6e0
variables
karlprieb 9dd4b69
fix Accounts_AllowUserAvatarChange setting
MartinSchoeler c8dc6ac
update sidebar-item variables
karlprieb f955d28
fix merge
ggazzo 98d23ad
Merge branch 'color-variables' of github.com:RocketChat/Rocket.Chat i…
karlprieb bfe3fb3
update modal variables
karlprieb 2184b54
update avatar variables
karlprieb d645ad8
update badge variables
karlprieb da79322
update flexnav variables
karlprieb 3fb24f2
update popover variables
karlprieb 1e45ecb
update tooltip variables
karlprieb 04d9978
fix accountbox colors
karlprieb 62825ee
fix input colors
karlprieb b7a527b
fix button variables
karlprieb b805059
fix popup-list variables
karlprieb 00d55d4
fix select-avatar variables
karlprieb eeb1edb
fix tags variables
karlprieb 9f19484
fix variables and remove dynamic-css inject
karlprieb 8e1e069
fix error Unexpected trailing comma comma-dangle
engelgabriel 36bba3b
variable customization
ggazzo 32e3760
Merge remote-tracking branch 'origin/color-variables' into color-vari…
ggazzo 71e5310
Merge remote-tracking branch 'origin/color-variables' into color-vari…
ggazzo c96aab2
Merge branch 'color-variables' of github.com:RocketChat/Rocket.Chat i…
karlprieb 6c48d0d
Merge branch 'develop' into color-variables
karlprieb 2aa991f
Merge remote-tracking branch 'origin/color-variables' into color-vari…
ggazzo 0ba4e4b
Merge branch 'color-variables' of github.com:RocketChat/Rocket.Chat i…
karlprieb 26ae0b1
Merge branch 'develop' into color-variables
karlprieb a0bc613
fix unexpected token
MartinSchoeler 15b35ec
Fix some review requests
karlprieb 6bbdff2
Fix arrow not turning
MartinSchoeler a13e7a5
Merge remote-tracking branch 'origin/color-variables' into color-vari…
MartinSchoeler 01c9fd5
use new naming
MartinSchoeler 3b82e67
fix Waiting for server connection alert
MartinSchoeler a47886b
fix tests
MartinSchoeler a327f39
fix katex link
karlprieb ca37bc8
fix room icon alignment
karlprieb 1b88be3
added Karl and Gazzo to contributors list
karlprieb b5f6de2
auto focus, activity order
ggazzo 3ef36d0
Merge remote-tracking branch 'origin/color-variables' into color-vari…
ggazzo b2428f5
remove unused code
karlprieb ae1ab81
font-weight
karlprieb 6443059
change livechat icons
karlprieb 4d241e4
fix eslint errors
karlprieb 6f0d1a7
Fix Livechat icon height
MartinSchoeler 468f080
Merge branch 'develop' into color-variables
MartinSchoeler f5393b5
fix removed package
MartinSchoeler 77c6c23
change icons
karlprieb a38c663
fix tests
MartinSchoeler b743193
fix icons
karlprieb 7a31237
Merge branch 'color-variables' of github.com:RocketChat/Rocket.Chat i…
karlprieb 0a9d965
fix tests again
MartinSchoeler d2a7b4e
add menu icon to account-box
karlprieb cde6f59
Merge branch 'color-variables' of github.com:RocketChat/Rocket.Chat i…
karlprieb 4af2012
remove arrow size variable
karlprieb ff2d308
fix tests
MartinSchoeler 22ce7e9
Merge remote-tracking branch 'origin/color-variables' into color-vari…
MartinSchoeler File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
FROM node:4 | ||
|
||
ADD . /app | ||
|
||
ENV RC_VERSION=0.57.0-designpreview \ | ||
DEPLOY_METHOD=docker \ | ||
NODE_ENV=production \ | ||
PORT=3000 \ | ||
ROOT_URL=http://localhost:3000 | ||
|
||
RUN set -x \ | ||
&& cd /app/bundle/programs/server \ | ||
&& npm install \ | ||
&& npm cache clear | ||
|
||
WORKDIR /app/bundle | ||
|
||
EXPOSE 3000 | ||
|
||
CMD ["node", "main.js"] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,77 @@ | ||
# Javascript Node CircleCI 2.0 configuration file | ||
# | ||
# Check https://circleci.com/docs/2.0/language-javascript/ for more details | ||
# | ||
version: 2 | ||
jobs: | ||
build: | ||
docker: | ||
# specify the version you desire here | ||
- image: circleci/node:7.10 | ||
|
||
# Specify service dependencies here if necessary | ||
# CircleCI maintains a library of pre-built images | ||
# documented at https://circleci.com/docs/2.0/circleci-images/ | ||
# - image: circleci/mongo:3.4.4 | ||
|
||
working_directory: ~/repo | ||
|
||
steps: | ||
- checkout | ||
|
||
- run: | ||
name: Install Meteor | ||
command: if [ ! -e "$HOME/.meteor/meteor" ]; then curl https://install.meteor.com | sed s/--progress-bar/-sL/g | /bin/sh; fi | ||
filters: | ||
branches: | ||
only: color-variables | ||
|
||
# Download and cache dependencies | ||
- restore_cache: | ||
key: dependency-cache-{{ checksum "package.json" }} | ||
filters: | ||
branches: | ||
only: color-variables | ||
|
||
- run: | ||
name: Build Rocket.Chat | ||
command: | | ||
meteor npm install | ||
set +e | ||
meteor add rocketchat:lib | ||
set -e | ||
meteor build --server-only --directory /tmp/build | ||
filters: | ||
branches: | ||
only: color-variables | ||
|
||
- save_cache: | ||
key: dependency-cache-{{ checksum "package.json" }} | ||
paths: | ||
- ./node_modules | ||
- ./.meteor | ||
- $HOME/.meteor | ||
filters: | ||
branches: | ||
only: color-variables | ||
|
||
- setup_remote_docker | ||
|
||
- run: | ||
name: Build Docker image | ||
command: | | ||
docker login -u $DOCKER_LOGIN -p $DOCKER_PASSWORD | ||
cp .circleci/Dockerfile /tmp/build | ||
cd /tmp/build | ||
docker build -t rocketchat/rocket.chat:designpreview . | ||
docker push rocketchat/rocket.chat:designpreview | ||
filters: | ||
branches: | ||
only: color-variables | ||
- run: | ||
name: Notify on demo | ||
command: | | ||
curl -X POST -H 'Content-Type: application/json' --data "{\"text\":\"@here Nova [build](${CIRCLE_BUILD_URL}) pronta :marioparty:\"}" $WEBHOOK_URL | ||
filters: | ||
branches: | ||
only: color-variables |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
please remove commented code