Hypolite Petovan
20406aacec
All-around CSS display fixes
2017-03-17 20:28:31 -04:00
Hypolite Petovan
2e17885eb3
Fix jot display
2017-03-17 20:28:09 -04:00
Hypolite Petovan
80510ef4ca
Fix group_side display
2017-03-17 20:28:00 -04:00
Hypolite Petovan
d1a1dfe879
Fix profile display
2017-03-17 20:27:43 -04:00
Hypolite Petovan
03700d4ae5
Fix contact display
2017-03-17 20:27:31 -04:00
Hypolite Petovan
92a755f688
Fix event display
2017-03-17 20:27:17 -04:00
Hypolite Petovan
29936060cf
Fix filebrowser display
2017-03-17 20:26:40 -04:00
Hypolite Petovan
8ac8d779f6
Fix bulk drop button
2017-03-16 22:19:45 -04:00
Hypolite Petovan
67c40bf030
Fix "Mark all as seen" button display
2017-03-16 22:19:27 -04:00
Hypolite Petovan
802897c0ab
Restored tabs display until a more complete CSS solution is worked out
2017-03-15 22:00:37 -04:00
Hypolite Petovan
214c76fec7
Reverted original display for item action links + jot bbcode buttons
...
- Cleaned useless CSS
2017-03-15 22:00:07 -04:00
Hypolite Petovan
077c4cadf1
Merge branch 'develop' into improvement/frio-action-links-to-buttons
2017-03-15 21:10:11 -04:00
Hypolite Petovan
ec745c04ce
Merge branch 'develop' of https://github.com/friendica/friendica into develop
2017-03-15 21:09:38 -04:00
rabuzarus
6fdc219143
Merge pull request #3227 from annando/1703-pdo
...
We now support PDO
2017-03-16 00:25:16 +01:00
rabuzarus
b4bad92657
Merge pull request #3239 from Hypolite/issue/#3194-2
...
Fix wrong deferred function name
2017-03-15 19:53:16 +01:00
Hypolite Petovan
35ba3cce70
Fix wrong deferred function name
2017-03-15 14:42:34 -04:00
Hypolite Petovan
82ce1a449b
Revert jot tabs to links due to Bootstrap not supporting button styling
2017-03-15 07:24:14 -04:00
rabuzarus
b8e8c96386
Merge pull request #3236 from annando/bugfix-feed
...
Bugfix for pull request 3216: Feed items were mixed
2017-03-15 12:18:49 +01:00
Hypolite Petovan
30049d862c
Fix comment double-posting
2017-03-15 07:07:06 -04:00
Michael
dc3fcf0487
Standard stuff
2017-03-15 06:00:22 +00:00
Hypolite Petovan
7cb44ae25a
Turn all the action <a> tags into buttons
...
- Add CSS changes to support both <a> and <button class="btn btn-link">
- Removed unnecessary "return false" in onclick attributes
- Simplified tabs in profile page to native Bootstrap behavior
2017-03-14 23:47:02 -04:00
Hypolite Petovan
fcea2e8504
Merge branch 'develop' into improvement/frio-action-links-to-buttons
2017-03-14 23:12:21 -04:00
Hypolite Petovan
2ff494d899
Merge branch 'develop' of https://github.com/friendica/friendica into develop
2017-03-14 23:11:53 -04:00
Michael
35ec1c8f26
Bugfix for pull request 3216 - feed items were mixed
2017-03-14 21:14:09 +00:00
Michael
187a81f159
Merge remote-tracking branch 'upstream/develop' into develop
2017-03-14 21:13:02 +00:00
Michael Vogel
e57bd5fe55
Merge pull request #3233 from rabuzarus/20170314_-_pagination
...
limit pagination page buttons to max 10
2017-03-14 20:05:29 +01:00
rabuzarus
0143369e54
limit pagination page buttons to max 10
2017-03-14 18:31:03 +01:00
Michael Vogel
a7e8e86800
Merge pull request #3221 from strk/remember-openid
...
Fix "remember me" cookie for OpenID logins
2017-03-14 16:30:15 +01:00
Hypolite Petovan
79f14749df
Merge branch 'develop' into improvement/frio-action-links-to-buttons
...
# Conflicts:
# view/theme/frio/templates/search_item.tpl
# view/theme/frio/templates/wall_thread.tpl
2017-03-14 10:45:17 -04:00
Hypolite Petovan
6d087aae23
Merge remote-tracking branch 'refs/remotes/friendica/develop' into develop
2017-03-14 10:30:04 -04:00
rabuzarus
3061a37b4f
Merge pull request #3232 from Hypolite/issue/#3194-2
...
frio: Revert guid truncation for scrollToItem() and improve dropItem()
2017-03-14 13:04:47 +01:00
Hypolite Petovan
f7855ecfe5
Merge remote-tracking branch 'friendica/develop' into develop
2017-03-14 07:58:37 -04:00
fabrixxm
fa3490ba5b
Merge pull request #3224 from annando/1702-no-old_pager
...
The old pager is now removed
2017-03-14 10:29:03 +01:00
Michael Vogel
199bba20d9
Merge pull request #3200 from Hypolite/issue/#3195
...
Improve pagination on frio
2017-03-14 06:05:42 +01:00
Sandro Santilli
0b46a5f935
Standards: add braces
...
(thanks @Hypolite)
2017-03-13 23:09:09 +01:00
Sandro Santilli
8517ba1fab
Remove extra space after open parentheses
2017-03-13 23:08:03 +01:00
Michael Vogel
98945eb6fa
Merge pull request #3213 from Hypolite/issue/#2792-2
...
Like behavior fix/improvements
2017-03-13 18:35:32 +01:00
Hypolite Petovan
327b00117d
Improve dropItem() functionality
...
- Drop the obsolete `#` char
- Add error case when deleting item
- Add item drop support to search items
- Add doc
2017-03-13 12:12:13 -04:00
Hypolite Petovan
f2a0c9fad1
Fix scrollToItem breaking dropItem functionality
...
- Add doc
- Refactor function by removing double jQuery wrapping
2017-03-13 12:10:03 -04:00
Hypolite Petovan
054f43a332
Merge remote-tracking branch 'friendica/develop' into develop
2017-03-13 11:53:34 -04:00
rabuzarus
e1eb9231f4
Merge pull request #3202 from Hypolite/issue/#3107
...
Delete frio obsolete Colors.php library
2017-03-13 14:17:37 +01:00
Sandro Santilli
cbaf196f50
Only remove the "remember me" cookie at submitting the auth form
...
Fixes loss of remember (Friendica) cookie on switching Managed accounts
2017-03-13 11:59:05 +01:00
Michael
f852f7aac0
Merge branch 'master' of github.com:annando/friendica
2017-03-13 10:21:35 +00:00
Michael
4d30f2b292
Merge remote-tracking branch 'upstream/master'
2017-03-13 10:21:08 +00:00
Tobias Diekershoff
dfc5dc2e9e
Merge pull request #3223 from annando/1702-no-language
...
The language string isn't displayed anymore
2017-03-13 08:26:43 +01:00
Tobias Diekershoff
e2c515baa9
Merge pull request #3225 from annando/1702-no_old_share
...
The old share option is removed
2017-03-13 07:52:38 +01:00
Michael
acadb8ecdb
Remove redundancies.
2017-03-13 06:09:00 +00:00
Michael
eb6a6228f7
more spaces
2017-03-13 05:57:37 +00:00
Michael
80e58964ce
Standard stuff
2017-03-13 00:09:32 +00:00
Michael
e10339a47f
Merge remote-tracking branch 'upstream/develop' into 1703-pdo
2017-03-12 21:05:10 +00:00
