Merge lp://qastaging/~dpm/telegram-app/no-sed into lp://qastaging/telegram-app/trunk
Proposed by
David Planella
| Status: | Superseded |
|---|---|
| Proposed branch: | lp://qastaging/~dpm/telegram-app/no-sed |
| Merge into: | lp://qastaging/telegram-app/trunk |
| Diff against target: |
7097 lines (+6617/-0) (has conflicts) 76 files modified
.bzrignore (+11/-0) CMakeLists.txt (+150/-0) LICENSE (+674/-0) README.md (+167/-0) README.translations (+35/-0) apparmor-push.json (+6/-0) apparmor-telegram.json (+9/-0) bootstrap.sh (+45/-0) build.sh (+23/-0) clean.sh (+8/-0) click.sh (+49/-0) components/CMakeLists.txt (+7/-0) components/ContactImport.qml (+111/-0) components/PictureImport.qml (+110/-0) components/SentPhraseBubble.qml (+41/-0) components/TelegramBubble.qml (+16/-0) components/TelegramButton.qml (+47/-0) components/TelegramColors.js (+21/-0) components/TelegramContactsListItem.qml (+92/-0) components/TelegramDelegate.qml (+163/-0) components/TelegramDialogsListItem.qml (+216/-0) components/TelegramHeader.qml (+79/-0) components/TelegramLabel.qml (+10/-0) components/TelegramPage.qml (+101/-0) components/TelegramSection.qml (+29/-0) components/TgButton.qml (+10/-0) components/TgLabel.qml (+11/-0) components/TgTextField.qml (+10/-0) components/country_data.js (+6/-0) components/iso_3166_2_countries.csv (+269/-0) components/listitems/DlgItem.qml (+15/-0) components/listitems/DlgItemDesign.qml (+226/-0) components/listitems/IconVisual.qml (+52/-0) components/listitems/ImageWithFallback.qml (+46/-0) components/listitems/LabelVisual.qml (+38/-0) components/listitems/ProgressionVisual.qml (+52/-0) countries.py (+52/-0) debug.md (+110/-0) images/conversation_incoming@27.sci (+5/-0) images/conversation_outgoing@27.sci (+5/-0) images/telegram.svg (+198/-0) js/avatar.js (+21/-0) js/ba-linkify.js (+211/-0) js/time.js (+44/-0) manifest.json.in (+20/-0) po/CMakeLists.txt (+29/-0) po/telegram.pot (+329/-0) push.json (+4/-0) push.py.in (+40/-0) run.sh (+40/-0) scripts/applog.sh (+17/-0) scripts/delete-db.sh (+8/-0) scripts/inspect-db.sh (+10/-0) scripts/show-config.sh (+5/-0) scripts/unity8log.sh (+3/-0) telegram.desktop.in.in (+8/-0) telegram.in (+3/-0) telegram.pub (+9/-0) telegram.qml (+364/-0) tests/autopilot/run (+11/-0) tests/autopilot/uitest/__init__.py (+71/-0) tests/autopilot/uitest/test_main.py (+24/-0) tests/unit/tst_hellocomponent.qml (+49/-0) tools/enter-lxc.sh (+10/-0) tools/extract_suppressions.sh (+57/-0) ui/AddContactPage.qml (+239/-0) ui/CMakeLists.txt (+7/-0) ui/ContactsPage.qml (+314/-0) ui/DialogPage.qml (+336/-0) ui/DialogsPage.qml (+149/-0) ui/IntroPage.qml (+138/-0) ui/IntroPageListModel.qml (+32/-0) ui/SettingsPage.qml (+161/-0) ui/SignInPage.qml (+206/-0) ui/SignUpPage.qml (+124/-0) ui/VerificationCodePage.qml (+199/-0) Conflict adding file .bzrignore. Moved existing file to .bzrignore.moved. Conflict adding file CMakeLists.txt. Moved existing file to CMakeLists.txt.moved. Conflict adding file LICENSE. Moved existing file to LICENSE.moved. Conflict adding file build.sh. Moved existing file to build.sh.moved. Conflict adding file run.sh. Moved existing file to run.sh.moved. Conflict adding file tests. Moved existing file to tests.moved. |
| To merge this branch: | bzr merge lp://qastaging/~dpm/telegram-app/no-sed |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| libqtelegram team | Pending | ||
|
Review via email:
|
|||
This proposal has been superseded by a proposal from 2014-09-30.
Commit message
Remove sed in bootstrapping script.
Description of the change
See this MP for more context: https:/
In summary, this is the continuation of this change: remove sed so not to modify the sources for the build.
To post a comment you must log in.
Unmerged revisions
- 81. By David Planella
-
Merged from trunk
- 80. By David Planella
-
Remove sed step and rely on CMake instead
- 79. By David Planella
-
Fix string argument typo
- 78. By Michał Karnicki
-
Fix the verification code countdown timer.
- 77. By Michał Karnicki
-
Make larger resolution pictures visible, too.
- 76. By Michał Karnicki
-
Add intltool in click chroot.
Include translated desktop file in the click package.
Avoid potential division by 0. - 75. By David Planella
-
Merged i18n branch
- 74. By Michał Karnicki
-
Reset UI state on fatal error.
- 73. By Penk Chen
-
Decrease selector height to reveal button on SignInPage
- 72. By Penk Chen
-
Use itemHeight instead of selector height for input field
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
