rabuzarus
e1d22ef5d4
some code cleanup
2017-03-17 19:10:48 +01:00
rabuzarus
c785eb29c6
more work on standards compliance
2017-03-17 17:57:57 +01:00
Michael
87771cf617
Merge remote-tracking branch 'upstream/develop' into 1702-detect-server
...
Conflicts:
include/discover_poco.php
2017-03-17 15:53:19 +00:00
rabuzarus
3cef98caf6
Merge pull request #3226 from annando/1702-only-worker
...
The worker is now the only background processing system
2017-03-17 13:22:23 +01:00
rabuzarus
1dd839c2c2
Merge pull request #3240 from annando/bugfix-dba
...
Bugfix: When a query fails we mustn't use the result value.
2017-03-17 13:20:56 +01: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
Michael
24a57020b9
Better version transformation for nodeinfo and statistics.json
2017-03-16 21:34:53 +00:00
rabuzarus
8ae8465d48
add dop event & fix event edit
2017-03-16 20:15:25 +01:00
Michael
58bf1c50af
Bugfix: When a query fails we mustn't use the result value.
2017-03-16 09:23:12 +00:00
Michael
4812f4c0f9
Without only the worker queue we don't need the deliverq anymore.
2017-03-16 07:30:59 +00:00
Michael
a211c8cb77
Merge remote-tracking branch 'upstream/develop' into 1702-detect-server
2017-03-16 05:51:22 +00: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
Michael
8e12b159d9
Merge remote-tracking branch 'upstream/develop' into 1601-api-statuses-lookup
2017-03-15 14:37:30 +00:00
Michael
9f9497f2ca
Merge remote-tracking branch 'upstream/develop' into 1701-poco
2017-03-15 14:34:09 +00:00
Michael
88a69b93d5
Merge branch '1702-detect-server' of github.com:annando/friendica into 1702-detect-server
2017-03-15 13:56:17 +00:00
Michael
8decd15565
Merge remote-tracking branch 'upstream/develop' into 1702-detect-server
2017-03-15 13:55:43 +00: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
Michael
0d32f0be46
One forgotten standard
2017-03-14 15:18:56 +00:00
Michael
f73389dd12
Standard stuff
2017-03-14 15:17:21 +00: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
43ceb72196
Merge remote-tracking branch 'upstream/develop' into 1702-detect-server
2017-03-14 07:26:15 +00:00
Michael Vogel
199bba20d9
Merge pull request #3200 from Hypolite/issue/#3195
...
Improve pagination on frio
2017-03-14 06:05:42 +01:00
Michael
748caa0807
Removed debug output
2017-03-14 04:58:05 +00:00
Michael
a2b7b2a968
Daily updating the server status
2017-03-13 22:16:09 +00: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
Michael
eaf93dc041
I guess, @Hypolite will still find something to change ...
2017-03-13 17:23:02 +00:00
