[epiphany] (86 commits) Non-fast-forward update to branch wip/sync-rebase
- From: Michael Catanzaro <mcatanzaro src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [epiphany] (86 commits) Non-fast-forward update to branch wip/sync-rebase
- Date: Fri, 7 Oct 2016 22:49:44 +0000 (UTC)
The branch 'wip/sync-rebase' was changed in a way that was not a fast-forward update.
NOTE: This may cause problems for people pulling from the branch. For more information,
please see:
https://wiki.gnome.org/Git/Help/NonFastForward
Commits removed from the branch:
81f4d01... ephy-sync: Add basic sync service and sync window
d2bb540... ephy-sync: Add ephy-sync-utils module
651e183... ephy-sync: Add ephy-sync-secret module
1755b24... sync-utils: Add ephy_sync_utils_decode_hex()
465899b... ephy-sync: Add GSettings key for the user email
ce31e41... ephy-sync: Replace the sync window with a new tab in the Pr
235f276... ephy-sync: Add save/store, get/load, delete/forget tokens f
837688e... ephy-sync: Implement the sign in logic
5fa3059... sync-crypto: Add function to compute Hawk headers
a901953... ephy-sync: Implement the Fetch Sync Keys act
49cb515... ephy-sync: Implement the new sign in method
79069d8... sync-service: Destroy session asynchronously
a7674ad... ephy-sync: Rename some functions
a8f091e... ephy-sync: Implement the Sign Certificate act
9306c13... sync-service: Add functions to retrieve the storage endpoin
295fd6c... sync-service: Add X-Client-State header to Token Server req
d667448... ephy-sync: Do some things in a different way
c48c840... sync-crypto: Replace Nettle functions with GLib functions
ac62830... ephy-sync: Fix json-glib required version
307eb06... ephy-sync: Fix ephy_shell_get_global_sync_service()
ec1271e... sync-service: Test user email against regex
2d8f4c1... sync-service: Generate assertion internally
eb8e3eb... sync-service: Get the storage token asynchronously
9919d6e... sync-service: Discard JsonNode *root
3634c1a... sync-service: Sign certificates asynchronously
0580e9c... ephy-bookmark: Implement JsonSerializable interface
5207988... sync-crypto: AES encryption/decryption functions
98c7401... sync-service: Use a certificate duration lower than the dur
28c1907... sync-service: Rename storage token to storage credentials
82979e1... sync-service: Better function names
b915122... sync-service: Implement asynchronous Storage Server request
9e2327e... sync-service: Add FIXME note for future reference
6a4f0e8... ephy-sync: Fix includes
dc2d6dc... sync-crypto: Free SoupUri
698dc92... ephy-sync: Create our own bookmarks BSO collection at login
185c013... ephy-sync: Minor fixes
ba980ef... sync-service: Ensure that no simultaneous storage credentia
841e6ca... ephy-sync: Prepare the ground for sync
0226d37... sync-service: Process storage requests in the same order th
5a4c810... sync-service: Fix email regex
b275cc6... sync-crypto: Consider the url query too when creating HAWK
9d5a609... ephy-sync: Implement the sync logic
43d3fd6... prefs-dialog: Minor changes
c922e58... ephy-sync: Replace gchar with char
b18de49... sync-service: Remove the source ID at sign out and finalize
44584d3... sync-service: Notify the user to sign in with the new passw
5624618... sync-service: Don't keep the service locked if an error occ
ef45d66... ephy-sync: Rename ephy-fx-password-notification to ephy-pas
c376d3e... ephy-sync: Avoid including markup in translatable comments
c6590ef... ephy-sync: Fix ephy-password-notification
c54c8e5... bookmark-properties-grid: g_strcmp0() can handle NULL for u
534ac1a... bookmarks-properties-grid: Split some code into a file-stat
375b3e2... ephy-bookmark: Add comment regarding the modified timestamp
747c0aa... ephy-bookmark: Replace G_DEFINE_TYPE_EXTENDED with G_DEFINE
88457ee... ephy-bookmark: Align function parameters
474472f... ephy-sync: No space after cast
9918b4b... ephy-notification-manager: Rename to ephy-notification-cont
4906be5... ephy-bookmark: Better names for setters/getters
6f5fdeb... ephy-shell: Create the sync service in startup rather than
cfc8617... sync-crypto: Move every free function under the correpondin
6e6ca71... sync-crypto: Avoid failure if longs are not 8 bytes
0a528ad... sync-crypto: Replace g_return macros with g_assert in stati
56284e4... sync-crypto: Only use Nettle specific random generator
7e81e55... sync-secret: Free errors and improve translators comment
8c181c3... ephy-sync: Fix minor issues in ephy-sync-service
e742cdd... prefs-dialog: Unref content manager at finalize
b2c4b33... prefs-dialog.ui: Use one vertical box instead of two
0e06507... ephy-sync: Add/improve comments
37abf3a... ephy-sync: Add files with translatable strings to POTFILES.
58ae3e0... ephy-sync: Use #pragma once
6e49782... sync-service: Silently return if the user is not signed in
48bc667... Forgot this when cherry-picking
712ec4b... ephy-sync: Reset sync time at sign out
02dfc7d... sync-service: Use the new function name
Commits added to the branch:
46c487e... Add summary and description for notifications-permission ke (*)
a84d6ed... Update POTFILES.in (*)
51bdbc9... ephy-bookmark: Fix memory leak caused by setting the tags p (*)
c530f2c... overview: Fix for animation when removing item (*)
15ff472... Change overview design to match mockup (*)
293da37... profile-migrator: Fix off-by-one in print statement (*)
7f3473e... profile-migrator: Remove code supporting removed migrators (*)
2b16394... profile-migrator: Remove ancient migrators (*)
e00b041... about-handler: limit overview to 9 items (*)
d16d57c... Remove Claudio from doap file (*)
5bcaf54... Add warning that disable-javascript breaks message handlers (*)
1ba2382... Fix whitespace (*)
663dad8... ephy-sync: Add basic sync service and sync window
5b40fcc... ephy-sync: Add ephy-sync-utils module
8a15517... ephy-sync: Add ephy-sync-secret module
9f08342... sync-utils: Add ephy_sync_utils_decode_hex()
abcb10f... ephy-sync: Add GSettings key for the user email
effe593... ephy-sync: Replace the sync window with a new tab in the Pr
c2a6e22... ephy-sync: Add save/store, get/load, delete/forget tokens f
25e74fb... ephy-sync: Implement the sign in logic
7e4b21c... sync-crypto: Add function to compute Hawk headers
df02268... ephy-sync: Implement the Fetch Sync Keys act
9ec057c... ephy-sync: Implement the new sign in method
58fb975... sync-service: Destroy session asynchronously
2ef7f92... ephy-sync: Rename some functions
1734373... ephy-sync: Implement the Sign Certificate act
67bb43f... sync-service: Add functions to retrieve the storage endpoin
77d6df4... sync-service: Add X-Client-State header to Token Server req
94d50a2... ephy-sync: Do some things in a different way
f491063... sync-crypto: Replace Nettle functions with GLib functions
2e5b94b... ephy-sync: Fix json-glib required version
aa51acb... ephy-sync: Fix ephy_shell_get_global_sync_service()
6f2ed32... sync-service: Test user email against regex
c083c9c... sync-service: Generate assertion internally
d98d6f8... sync-service: Get the storage token asynchronously
563974d... sync-service: Discard JsonNode *root
a53f846... sync-service: Sign certificates asynchronously
d2ad6e2... ephy-bookmark: Implement JsonSerializable interface
ecddba5... sync-crypto: AES encryption/decryption functions
3002c94... sync-service: Use a certificate duration lower than the dur
c7132e0... sync-service: Rename storage token to storage credentials
32e863c... sync-service: Better function names
8843301... sync-service: Implement asynchronous Storage Server request
7951f79... sync-service: Add FIXME note for future reference
cc6809b... ephy-sync: Fix includes
4e289d0... sync-crypto: Free SoupUri
b8d82cb... ephy-sync: Create our own bookmarks BSO collection at login
99efece... ephy-sync: Minor fixes
7ac6bd3... sync-service: Ensure that no simultaneous storage credentia
be57788... ephy-sync: Prepare the ground for sync
312fc6e... sync-service: Process storage requests in the same order th
71dac0b... sync-service: Fix email regex
972f51c... sync-crypto: Consider the url query too when creating HAWK
6606f4f... ephy-sync: Implement the sync logic
ed50695... prefs-dialog: Minor changes
0c6c7f5... ephy-sync: Replace gchar with char
ef1f904... sync-service: Remove the source ID at sign out and finalize
e601bdc... sync-service: Notify the user to sign in with the new passw
25284a1... sync-service: Don't keep the service locked if an error occ
a7d6085... ephy-sync: Rename ephy-fx-password-notification to ephy-pas
39e1b44... ephy-sync: Avoid including markup in translatable comments
b084860... ephy-sync: Fix ephy-password-notification
06209ea... bookmark-properties-grid: g_strcmp0() can handle NULL for u
17a375d... bookmarks-properties-grid: Split some code into a file-stat
3a75b04... ephy-bookmark: Add comment regarding the modified timestamp
81236ba... ephy-bookmark: Replace G_DEFINE_TYPE_EXTENDED with G_DEFINE
640d3bc... ephy-bookmark: Align function parameters
7fa3242... ephy-sync: No space after cast
a8a56a2... ephy-notification-manager: Rename to ephy-notification-cont
bc5b151... ephy-bookmark: Better names for setters/getters
1be37d1... ephy-shell: Create the sync service in startup rather than
3cd146b... sync-crypto: Move every free function under the correpondin
cd566f1... sync-crypto: Avoid failure if longs are not 8 bytes
9075e68... sync-crypto: Replace g_return macros with g_assert in stati
51d6688... sync-crypto: Only use Nettle specific random generator
226cbff... sync-secret: Free errors and improve translators comment
bc891a1... ephy-sync: Fix minor issues in ephy-sync-service
1b31bba... prefs-dialog: Unref content manager at finalize
5480f10... prefs-dialog.ui: Use one vertical box instead of two
636b4eb... ephy-sync: Add/improve comments
1356f53... ephy-sync: Add files with translatable strings to POTFILES.
f040bb1... ephy-sync: Use #pragma once
c86f813... sync-service: Silently return if the user is not signed in
053fc66... Forgot this when cherry-picking
30c197d... ephy-sync: Reset sync time at sign out
95eb719... sync-service: Use the new function name
(*) This commit already existed in another branch; no separate mail sent
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]