[polari] (136 commits) Non-fast-forward update to branch wip/fmuellner/combined-gsoc
- From: Florian Müllner <fmuellner src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [polari] (136 commits) Non-fast-forward update to branch wip/fmuellner/combined-gsoc
- Date: Tue, 26 Jul 2016 23:16:19 +0000 (UTC)
The branch 'wip/fmuellner/combined-gsoc' 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:
c74b704... logManager: Add convenience wrapper for tracker queries
6cf67cf... joinDialog: Replace TpLogger with tracker
14b0c23... logManager: Support running queries in chunks
5e06315... logManager: Add LogWalker for traversing a channel's logs
e9ca01d... chatView: Replace TpLogger with tracker
140dbc8... chatView: Postpone fetching backlog until mapped
1015a5f... roomStack: Delay mapping RoomView until shown
a6bab13... search-bar
2dff08b... sample tracker queries
e80dd8f... added stack and hooked togglebutton with switching
8b0762d... working UI for search left bar
3f74263... working search on searchbar
066f715... logmanager: add uri constant
666cbfe... added cancellable
1c7dfa1... logic1 : reusing widgets while searching
98992ac... Primitive highlighting of keywords
0ec00b1... Improved highlighting.
105cc69... experimental: substring index
417fba5... another way to ellipsize at both end
917a34c... resultRow: Implement gtkbox
a633589... closer to mockup
92b2919... very rough result list. closer to mocks
b8713e1... fork to result-list ui
705c72c... GtkGrid
8e038b7... Don't bold the channel name
23be091... Unsuccssful attempt to set max width
8d9de31... initial right side
bcbbff2... ResultView: Show relevant messages
a06dd6c... resultView: Load logs on scroll
d15fb0d... dirty fork
abb6c76... Implement ResultView
d8ff4fa... load pending logs
eca963d... update
0e51d5f... nicee!
06907bb... highlighting + scrolling
f8d52db... add loading indicator
8d58d29... added mode
67e2a08... limit search results
6147c40... peformance improvements
2f90d3e... mainWindow: Clean code
d548071... add css
c864900... Fix Sideframe width
e5afcd5... mainWindow: Adjust mode switch conditions
18304fc... ui: Set up bindings in the .ui file
d02611f... mainWindow: Drop unused :search-active property
123ad48... app: Add shortcut to toggle search button
df51dd3... Added UserTracker class with local tracking only.
9d0b10d... work so far
f12d6f3... work so far, part 2
7a80952... work so far, part 3
b0adf79... work so far 5, added css class
e5ba15a... work so far, part 6, added notifications (in the command li
2b2d260... fixed rebase halfway. popover rebased untop of the user tra
9773548... removed the _user property from the UserPopover
1705998... cleaned the code a bit
98ddafe... first try at fixing the conflicts
622b80a... popover update themselves, the notify button is not yet upd
1125a5b... notifyButton is updated in relation with the global status
5b0fc07... Added the 'offline in another room' status and it is update
c370793... Split out the function that ensures the fact that there is
7ccbde4... UserDetails labels now have the same font size and icons ar
c7ba49a... Removed the old css class that used to set the height of th
6fbe778... removed the old nick-popover-status css class
3a1f98e... Added notification label and icon to the UserDetails class.
67295e4... the notify label is now shown when needed, the message butt
776c98d... Notifications are now based on basenicks and usertracker em
2509c23... the user nickname label in the popover and the real name la
53296e4... added avatar symbolic icon to the search entry in UserList
fd74cbc... Popovers are now created on demand, not when the tag is cre
ca65eca... Added the getNotifyActionName in the UserTracker class.
0ad75f0... replaced old notification logic with GActions
b2431b6... moved the UserPopover widgets into .user-popover.ui
75710d3... Some cleaning up and minor fix to the notification part (th
79f4020... cleaned the code a bit and fixed popover translatable label
3ffe213... Notifications now use format translatable strings and forma
9af63a5... userTracker: Base watchNick() on baseNick
b5cf12c... userTracker: Split out some code
5bc0f29... userTracker: Split out another helper
bca68cf... userTracker: Clean up _trackMember()
0dd9cc8... userTracker: Minor cleanup
edc9a19... userTracker: Give _clearUsersFromRoom() the _trackMember()
c1c8d1c... userTracker: Clean up _untrackMember as well
8b2b0d6... more cleanups
da76d8a... userTracker: Cut-down on signals handlers
ac18871... userTracker: Don't reset handlerCounter when ensuring handl
2865306... userTracker: Simplify some more
5e7b2f0... userTracker: Don't run handlers twice on disconnect
a09eef5... userTracker: Remove unnecessary method split
9984354... userTracker: Be a bit more concise
33e810b... userTracker: Add some comments
1a72bb6... Comment on the popover code as well
43865a5... ui: Only use IDs for widgets we access
e075a21... chatView: Clean up a bit
e0b6290... chatView: Rename a handler
1e87a1e... chatView: Use some bits into the UserPopover template
8b7da10... fixed minor things, patches now work
dfe9f6a... fix typo and rename the map
5d0551d... send the nickname along with the contacts-changed signal
a3e8f76... room signals are now stored in a local variable, not a clas
2aa9dea... rename the map used to track contacts globally
57be0f4... emittingRoom is now renamed to room
b6b489d... clean _onChannelChanged() a bit
5bb3f32... move getNickRoomStatus()
b900c33... renamed (un)watchUser() to (un)watchRoomStatus()
3499698... fix watch() method and add checks for the signal id before
6684878... fixed some stuff with the signals, but there is still work
748d16d... getNotifyActionName() now returns the full name, and track/
594f44a... status handlers consistency
601f3db... notify button fix
4b98dfb... fix user popover 'available in another room' status bug and
Commits added to the branch:
07934c4... Updated Lithuanian translation (*)
a95b022... Add Language headers to po files (*)
4e3533a... Updated German translation (*)
c9706cd... roomList: Add "Connect" menu item (*)
4db881d... logManager: Add convenience wrapper for tracker queries
09195ae... joinDialog: Replace TpLogger with tracker
10b3483... logManager: Support running queries in chunks
ec46f43... logManager: Add LogWalker for traversing a channel's logs
2f90dda... chatView: Replace TpLogger with tracker
e83deee... chatView: Postpone fetching backlog until mapped
0e12093... roomStack: Delay mapping RoomView until shown
35df2fe... search-bar
c93d637... sample tracker queries
8ad0c99... added stack and hooked togglebutton with switching
02727ad... working UI for search left bar
fa0ccf3... working search on searchbar
8a227b0... logmanager: add uri constant
e59e197... added cancellable
8a6c309... logic1 : reusing widgets while searching
c176978... Primitive highlighting of keywords
da29769... Improved highlighting.
08bb829... experimental: substring index
019bfd9... another way to ellipsize at both end
465cd4c... resultRow: Implement gtkbox
87c9764... closer to mockup
f562969... very rough result list. closer to mocks
e1a9b7c... fork to result-list ui
f5ce33a... GtkGrid
2092512... Don't bold the channel name
0da5d21... Unsuccssful attempt to set max width
ec9a67c... initial right side
87b0140... ResultView: Show relevant messages
a2c1068... resultView: Load logs on scroll
55e5573... dirty fork
e1fdc1a... Implement ResultView
9173402... load pending logs
bc8f727... update
83e3060... nicee!
d9411f3... highlighting + scrolling
9881e7b... add loading indicator
ddab1ed... added mode
1ce661f... limit search results
289cd92... peformance improvements
bb73976... mainWindow: Clean code
8f00712... add css
1ba7877... Fix Sideframe width
bc76b88... mainWindow: Adjust mode switch conditions
b14b52f... ui: Set up bindings in the .ui file
70df20e... mainWindow: Drop unused :search-active property
1918917... app: Add shortcut to toggle search button
2d437f2... resultList: Implement Lazy Loading
0504405... Added UserTracker class with local tracking only.
a7998b5... work so far
2b24fac... work so far, part 2
8973702... work so far, part 3
76315ee... work so far 5, added css class
3d9593a... work so far, part 6, added notifications (in the command li
a314d20... fixed rebase halfway. popover rebased untop of the user tra
c4c5ce4... removed the _user property from the UserPopover
19679ad... cleaned the code a bit
e62299c... first try at fixing the conflicts
2ec7cfe... popover update themselves, the notify button is not yet upd
42ff47c... notifyButton is updated in relation with the global status
fced110... Added the 'offline in another room' status and it is update
1212fcf... Split out the function that ensures the fact that there is
fad5e1c... UserDetails labels now have the same font size and icons ar
e8e06c9... Removed the old css class that used to set the height of th
2db74c7... removed the old nick-popover-status css class
aa4b5ae... Added notification label and icon to the UserDetails class.
8f20147... the notify label is now shown when needed, the message butt
b37ca4a... Notifications are now based on basenicks and usertracker em
5436219... the user nickname label in the popover and the real name la
524a9bb... added avatar symbolic icon to the search entry in UserList
511e580... Popovers are now created on demand, not when the tag is cre
043c4dd... Added the getNotifyActionName in the UserTracker class.
3384364... replaced old notification logic with GActions
83050e6... moved the UserPopover widgets into .user-popover.ui
4842e73... Some cleaning up and minor fix to the notification part (th
fd07d24... cleaned the code a bit and fixed popover translatable label
448d860... Notifications now use format translatable strings and forma
d33546a... userTracker: Base watchNick() on baseNick
e05b946... userTracker: Split out some code
8f3d6dd... userTracker: Split out another helper
b1db856... userTracker: Clean up _trackMember()
278a67b... userTracker: Minor cleanup
f4d0fb3... userTracker: Give _clearUsersFromRoom() the _trackMember()
0a66df9... userTracker: Clean up _untrackMember as well
5a583fc... more cleanups
e94f522... userTracker: Cut-down on signals handlers
32bad7f... userTracker: Don't reset handlerCounter when ensuring handl
590c0bf... userTracker: Simplify some more
6ad12b8... userTracker: Don't run handlers twice on disconnect
9a78cda... userTracker: Remove unnecessary method split
095cf24... userTracker: Be a bit more concise
187d528... userTracker: Add some comments
0826b87... Comment on the popover code as well
ac795ab... ui: Only use IDs for widgets we access
0d1f195... chatView: Clean up a bit
80532fa... chatView: Rename a handler
4efc1f7... chatView: Use some bits into the UserPopover template
5684b1c... fixed minor things, patches now work
3a59ed2... fix typo and rename the map
1c9f545... send the nickname along with the contacts-changed signal
44adcc3... room signals are now stored in a local variable, not a clas
26be042... rename the map used to track contacts globally
a16b58c... emittingRoom is now renamed to room
744299b... clean _onChannelChanged() a bit
b6f61f5... move getNickRoomStatus()
9887e78... renamed (un)watchUser() to (un)watchRoomStatus()
13bed29... fix watch() method and add checks for the signal id before
c82abb3... fixed some stuff with the signals, but there is still work
0026430... getNotifyActionName() now returns the full name, and track/
1957673... status handlers consistency
850909b... notify button fix
1467bd9... fix user popover 'available in another room' status bug and
0bb8cd3... moved bindings to the template file
9e993a1... add functions to clarify the acess to the roomData property
5fd2313... use the notify action name as an id for the notification
af84793... fix labels in user details. font size is bigger and there i
351bcc2... add the bind in order for the 'last active' time to update
1ecf1c4... update the max-width-chars property of the fullname label i
6cf0c3f... fullnameLabel is now hidden where there is no name to displ
d0b14a9... popover has fixed height and the fullname label is not hidd
70dbdd6... userTracker: Fix exceptions when leaving room
ed2a89e... userTracker: Don't clear out all room data on disconnect
f965a2f... userTracker: Fix untracking members on disconnect
1e29bc0... userTracker: Don't split out disconnectSignals() method
f9ad854... userTracker: Same for deleteRoomData ...
1d5a645... userTracker: Minor cleanup
76e5176... a little rewrite as suggested
0681c66... userTracker: Remove connectRoomSignals()
2874005... userTracker: Remove some roomData helpers
9b860ab... userTracker: Remove unneeded call to ensureRoomMapping()
aedc68e... userTracker: Don't prefix roomData properties
4e2076a... renamed _emitNotification() to _notifyNickAvailable() and s
9cd6eee... renamed _getNotifyActionName() to _getNotifyActionNameInter
(*) 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]