Commit graph

4325 commits

Author SHA1 Message Date
Hypolite Petovan
8a0b057dc7 Merge branch 'develop' into improvement/frio-action-links-to-buttons 2017-03-20 14:43:37 -04:00
rabuzarus
0060e2449e Merge develop into 20170316_-_fix_event_edit
Conflicts:
	mod/events.php
2017-03-20 16:46:36 +01:00
Hypolite Petovan
46c5b3b419 Merge remote-tracking branch 'refs/remotes/origin/develop' into improvement/frio-action-links-to-buttons 2017-03-19 21:12:20 -04:00
Michael
8dd732a896 Issue 3242: Define a maintenance reason 2017-03-19 13:24:07 +00:00
Hypolite Petovan
8d6d008d28 Fix frio style.css indentation 2017-03-17 20:46:31 -04:00
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
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
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
rabuzarus
8ae8465d48 add dop event & fix event edit 2017-03-16 20:15:25 +01: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
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
Hypolite Petovan
30049d862c Fix comment double-posting 2017-03-15 07:07:06 -04: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
rabuzarus
0143369e54 limit pagination page buttons to max 10 2017-03-14 18:31:03 +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
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
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
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
rabuzarus
e1eb9231f4 Merge pull request #3202 from Hypolite/issue/#3107
Delete frio obsolete Colors.php library
2017-03-13 14:17:37 +01: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
Michael
77e8c44016 Merge remote-tracking branch 'upstream/develop' into 1702-only-worker
Conflicts:
	include/onepoll.php
	include/queue.php
2017-03-12 21:03:44 +00:00
Michael
259598e569 Merge remote-tracking branch 'upstream/develop' into 1702-no_old_share 2017-03-12 20:52:48 +00:00
Michael
044e9a6603 Merge remote-tracking branch 'upstream/develop' into 1702-no-old_pager
Conflicts:
	mod/profile.php
2017-03-12 20:52:14 +00:00
Michael
b6a4a2ec7f Merge remote-tracking branch 'upstream/develop' into 1702-no-language 2017-03-12 20:50:20 +00:00
Tobias Diekershoff
4cddb74f27 Merge branch 'master' into develop 2017-03-12 14:39:09 +01:00
Tobias Diekershoff
5097c74d21 DE translations 2017-03-05 12:40:31 +01:00
Hypolite Petovan
3ea830e221 Strip @hubzilla.server part from guid for autoscrolling purpuses 2017-03-03 21:45:36 -05:00
Tobias Diekershoff
1d667d7a45 tag change 2017-03-03 17:18:09 +01:00
Tobias Diekershoff
2fa9f76e67 better wording and placeholder for name 2017-03-03 10:28:29 +01:00
Hypolite Petovan
cb49bcdb04 Turn actions links into buttons (nav, search)
- Mirrored the changes from wall_thread to search_item
- Replaced a navbar link with a button with according CSS
2017-03-03 01:19:49 -05:00
Hypolite Petovan
71f00eaf5f Turn action links into buttons
- Turns <a role="button"> into <button type="button"> for responses and
dropdown menu in wall_thread.tpl
- Removes extraneous decorations
- Updates dropdown style to prevent hover shenanigans
- Add theme color to active "btn-default" buttons
- Add margin top to comment box that was stuck to the action buttons
2017-03-03 01:00:52 -05:00
Hypolite Petovan
024908a3ec Delete frio obsolete Colors.php library 2017-03-02 19:00:22 -05:00
Hypolite Petovan
ebdc9667f7 Improve readability
- Move CSS block above the temporary block
- Add template description
2017-03-02 11:30:41 -05:00
Hypolite Petovan
57ce6cf5da Improve pagination on frio theme
- Add pager class discrimination
- Change links order to first / prev / 1 / ... / 10 / next / last
- Enable dynamic pagination coloring
- Prevent click on disabled links
2017-03-01 23:41:54 -05:00
Hypolite Petovan
21cad46d19 Backward compatibility for theme other than frio
- Add .pager .disabled CSS rule
2017-03-01 23:40:34 -05:00
Hypolite Petovan
a3cd804ff1 Fix default paginate.tpl
Adding missing curly braces
2017-03-01 23:23:14 -05:00