Skip to content
This repository has been archived by the owner on Apr 22, 2022. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ramboxapp/community-edition
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 0.7.1
Choose a base ref
...
head repository: ramboxapp/community-edition
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Loading
Showing with 2,675 additions and 7,198 deletions.
  1. +1 −1 .github/FUNDING.yml
  2. +0 −2 .gitignore
  3. +2 −0 .npmrc
  4. +3 −2 .travis.yml
  5. +0 −6 Backers.md
  6. +15 −28 CONTRIBUTING.md
  7. +15 −115 README.md
  8. +7 −3 app.js
  9. +2 −6 app.json
  10. +60 −89 app/Application.js
  11. +1 −1 app/store/ServicesList.js
  12. +0 −289 app/ux/Auth0.js
  13. +125 −172 app/ux/WebView.js
  14. +12 −3 app/view/add/Add.js
  15. +1 −0 app/view/add/AddController.js
  16. +19 −130 app/view/main/Main.js
  17. +16 −65 app/view/main/MainController.js
  18. +44 −50 app/view/preferences/Preferences.js
  19. +1 −1 app/view/preferences/PreferencesController.js
  20. +2 −5 appveyor.yml
  21. +180 −14 electron/main.js
  22. +15 −34 electron/menu.js
  23. +2 −2 electron/tray.js
  24. +9 −3 electron/updater.js
  25. +0 −5 env-sample.js
  26. +6 −6 masterpassword.html
  27. +0 −6,135 package-lock.json
  28. +63 −30 package.json
  29. +5 −0 packages/local/rambox-default-theme/sass/etc/all.scss
  30. BIN resources/icons/airdroid.png
  31. BIN resources/icons/androidmessages.png
  32. BIN resources/icons/aol.png
  33. BIN resources/icons/awsworkmail.png
  34. BIN resources/icons/bearychat.png
  35. BIN resources/icons/bip.png
  36. BIN resources/icons/calendar.png
  37. BIN resources/icons/chatwork.png
  38. BIN resources/icons/cliq.png
  39. BIN resources/icons/converse.png
  40. BIN resources/icons/crisp.png
  41. BIN resources/icons/devrant.png
  42. BIN resources/icons/dingtalk.png
  43. BIN resources/icons/discord.png
  44. BIN resources/icons/drift.png
  45. BIN resources/icons/duo.png
  46. BIN resources/icons/element.png
  47. BIN resources/icons/facebook.png
  48. BIN resources/icons/fastmail.png
  49. BIN resources/icons/fleep.png
  50. BIN resources/icons/flock.png
  51. BIN resources/icons/flowdock.png
  52. BIN resources/icons/freenode.png
  53. BIN resources/icons/gadugadu.png
  54. BIN resources/icons/gitter.png
  55. BIN resources/icons/glip.png
  56. BIN resources/icons/glowingbear.png
  57. BIN resources/icons/gmail.png
  58. BIN resources/icons/googledrive.png
  59. BIN resources/icons/googlevoice.png
  60. BIN resources/icons/grape.png
  61. BIN resources/icons/groupme.png
  62. BIN resources/icons/guilded.png
  63. BIN resources/icons/hangouts.png
  64. BIN resources/icons/hangoutschat.png
  65. BIN resources/icons/hibox.png
  66. BIN resources/icons/honeypot.png
  67. BIN resources/icons/hootsuite.png
  68. BIN resources/icons/horde.png
  69. BIN resources/icons/hushmail.png
  70. BIN resources/icons/icloudmail.png
  71. BIN resources/icons/icq.png
  72. BIN resources/icons/inbox.png
  73. BIN resources/icons/instagramdirect.png
  74. BIN resources/icons/intercom.png
  75. BIN resources/icons/irccloud.png
  76. BIN resources/icons/jandi.png
  77. BIN resources/icons/kaiwa.png
  78. BIN resources/icons/kezmo.png
  79. BIN resources/icons/kiwi.png
  80. BIN resources/icons/kune.png
  81. BIN resources/icons/linkedin.png
  82. BIN resources/icons/lounge.png
  83. BIN resources/icons/mailru.png
  84. BIN resources/icons/mastodon.png
  85. BIN resources/icons/mattermost.png
  86. BIN resources/icons/messenger.png
  87. BIN resources/icons/messengerpages.png
  88. BIN resources/icons/mightytext.png
  89. BIN resources/icons/missive.png
  90. BIN resources/icons/movim.png
  91. BIN resources/icons/mysms.png
  92. BIN resources/icons/noysi.png
  93. BIN resources/icons/okru.png
  94. BIN resources/icons/openmailbox.png
  95. BIN resources/icons/outlook.png
  96. BIN resources/icons/outlook365.png
  97. BIN resources/icons/protonmail.png
  98. BIN resources/icons/protonmailch.png
  99. BIN resources/icons/pushbullet.png
  100. BIN resources/icons/rainloop.png
  101. BIN resources/icons/reddit.png
  102. BIN resources/icons/riot.png
  103. BIN resources/icons/rocketchat.png
  104. BIN resources/icons/roundcube.png
  105. BIN resources/icons/ryver.png
  106. BIN resources/icons/sandstorm.png
  107. BIN resources/icons/simplenote.png
  108. BIN resources/icons/skype.png
  109. BIN resources/icons/slack.png
  110. BIN resources/icons/smooch.png
  111. BIN resources/icons/socialcast.png
  112. BIN resources/{auth0.png → icons/sococo.png}
  113. BIN resources/icons/spark.png
  114. BIN resources/icons/spike.png
  115. BIN resources/icons/squirrelmail.png
  116. BIN resources/icons/steam.png
  117. BIN resources/icons/swello.png
  118. BIN resources/icons/sync.png
  119. BIN resources/icons/tawkto.png
  120. BIN resources/icons/teams.png
  121. BIN resources/icons/teamworkchat.png
  122. BIN resources/icons/telegram.png
  123. BIN resources/icons/threema.png
  124. BIN resources/icons/tutanota.png
  125. BIN resources/icons/tweetdeck.png
  126. BIN resources/icons/typetalk.png
  127. BIN resources/icons/vk.png
  128. BIN resources/icons/voxer.png
  129. BIN resources/icons/wechat.png
  130. BIN resources/icons/whatsapp.png
  131. BIN resources/icons/whatsappbusiness.png
  132. BIN resources/icons/wire.png
  133. BIN resources/icons/workplace.png
  134. BIN resources/icons/xender.png
  135. BIN resources/icons/xing.png
  136. BIN resources/icons/yahoo.png
  137. BIN resources/icons/yandex.png
  138. BIN resources/icons/zimbra.png
  139. BIN resources/icons/zinc.png
  140. BIN resources/icons/zohocliq.png
  141. BIN resources/icons/zohoemail.png
  142. BIN resources/icons/zulip.png
  143. BIN resources/icons/zyptonite.png
  144. +14 −0 resources/installer/entitlements.mac.plist
  145. +18 −0 resources/installer/notarize.js
  146. +53 −1 resources/js/rambox-service-api.js
  147. BIN resources/screenshots/wiki-backup-login.png
  148. BIN resources/screenshots/wiki-backup-logued.png
  149. BIN resources/screenshots/wiki-backup-options.png
  150. BIN resources/screenshots/wiki-backup-popup.png
  151. +1,712 −0 resources/services.json
  152. +272 −0 screenselector.html
2 changes: 1 addition & 1 deletion .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# These are supported funding model platforms

custom: ['https://rambox.pro#donate']
custom: ['https://rambox.app/donate.html']
2 changes: 0 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -34,7 +34,5 @@ npm-debug.log
# Vagrant
.vagrant/

env.js
rambox_cfg.json
languages.js
electron/dev-app-update.yml
2 changes: 2 additions & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
package-lock = false
save-exact = true
5 changes: 3 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
matrix:
include:
- os: osx
osx_image: xcode10.1
osx_image: xcode12.4
language: node_js
node_js: "10"
node_js: "14.16.1"
env:
- ELECTRON_CACHE=$HOME/.cache/electron
- ELECTRON_BUILDER_CACHE=$HOME/.cache/electron-builder
@@ -44,5 +44,6 @@ script:
else
cd $TRAVIS_BUILD_DIR/build/production/Rambox/
npm i
npm i cli-truncate
npm run build:osx
fi
6 changes: 0 additions & 6 deletions Backers.md

This file was deleted.

43 changes: 15 additions & 28 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@

We welcome pull requests! Follow these steps to contribute:

1. Find an [issue](https://github.com/saenzramiro/rambox/issues) that needs assistance.
1. Find an [issue](https://github.com/ramboxapp/community-edition/issues) that needs assistance.
1. Let us know you are working on it by posting a comment on the issue.
1. Follow the [Contribution Guidelines](#contribution-guidelines) to start working on the issue.

@@ -65,25 +65,25 @@ If your versions are lower than the prerequisite versions, you should update.

#### Forking rambox

1. Go to the top level rambox repository: <https://github.com/saenzramiro/rambox>
1. Go to the top level rambox repository: <https://github.com/ramboxapp/community-edition>
1. Click the "Fork" Button in the upper right hand corner of the interface ([More Details Here](https://help.github.com/articles/fork-a-repo/))
1. After the repository (repo) has been forked, you will be taken to your copy of the rambox repo at <https://github.com/yourUsername/rambox>
1. After the repository (repo) has been forked, you will be taken to your copy of the rambox repo at <https://github.com/yourUsername/community-edition>

#### Cloning Your Fork

1. Open a Terminal / Command Line / Bash Shell in your projects directory (_i.e.: `/yourprojectdirectory/`_)
1. Clone your fork of rambox
- `git clone https://github.com/yourUsername/rambox.git`
- `git clone https://github.com/yourUsername/community-edition.git`

**(make sure to replace `yourUsername` with your GitHub username)**

This will download the entire rambox repo to your projects directory.

#### Setup Your Upstream

1. Change directory to the new rambox directory (`cd rambox`)
1. Change directory to the new rambox directory (`cd community-edition`)
1. Add a remote to the official rambox repo:
- `git remote add upstream https://github.com/saenzramiro/rambox.git`
- `git remote add upstream https://github.com/ramboxapp/community-edition.git`

Congratulations, you now have a local copy of the rambox repo! :tada:

@@ -122,22 +122,6 @@ Once you have rambox cloned, before you start the application, you first need to
npm install
```

Then you need to add the private environment variables (API Keys):

```bash
# Copy `env-sample.js` with a name of env.js
# Populate it with Auth0 clientid and domain e.g. test.auth0.com
# You can get these details from one of your "apps" here https://manage.auth0.com/#/clients/

# macOS / Linux
cp env-sample.js env.js

# Windows
copy env-sample.js env.js
```

Then edit the `env.js` file and modify the API keys only for services that you will use.

```bash
# Compile the files...
sencha app watch
@@ -157,8 +141,11 @@ Always feel free to reach out to the chat room when you are not certain of any t

#### Adding or Editing Services

The services are stored inside the file `./app/store/ServicesList.js`. Add your service to the *BOTTOM* of the array.
The logo it's referencing is located in `./resources/icons/`.
The services are stored inside the file `./api/services.json` in the `gh-pages` branch:

https://github.com/ramboxapp/community-edition/blob/gh-pages/api/services.json

Add your service to the *BOTTOM* of the array.
To see these changes you'll need to stop your `npm start` and `sencha app watch`, and then rerun those.

### Creating a Pull Request
@@ -170,15 +157,15 @@ You will make changes to copies of thefiles which make up rambox in a personal f

#### Important: ALWAYS EDIT ON A BRANCH

Take away only one thing from this document: Never, **EVER** make edits to the `staging` branch.
Take away only one thing from this document: Never, **EVER** make edits to the `master` branch.
ALWAYS make a new branch BEFORE you edit files.
This is critical, because if your PR is not accepted, your copy of staging will be forever sullied and the only way to fix it is to delete your fork and re-fork.
This is critical, because your copy of `master` will be forever sullied and the only way to fix it is a difficult hard-reset and force-push process, or deleting your fork and re-forking.

### Common Steps

1. Once the edits have been committed, you will be prompted to create a pull request on your fork's GitHub Page.
1. By default, all pull requests should be against the rambox main repo, `staging` branch.
- **Make sure that your Base Fork is set to saenzramiro/rambox when raising a Pull Request.**
1. By default, all pull requests should be against the rambox main repo, `master` branch.
- **Make sure that your Base Fork is set to ramboxapp/community-edition when raising a Pull Request.**
1. Submit a pull request.
1. The title (also called the subject) of your PR should be descriptive of your changes and succinctly indicates what is being fixed.
- **Do not add the issue number in the PR title or commit message.**
Loading