Commit Graph

12418 Commits

Author SHA1 Message Date
Tobias Diekershoff 5ec7626b12 Merge pull request #2610 from rabuzarus/1406-frio-search-fix
frio: fix searchbox - comment tag wasn't closed
2016-06-14 13:44:14 +02:00
rabuzarus 7ec13d4534 frio: fix searchbox - comment tag wasn't closed 2016-06-14 10:41:14 +02:00
rabuzarus 3f67e694bf Merge pull request #2609 from annando/1606-categories
Categories were missing
2016-06-14 10:05:07 +02:00
Michael Vogel 7f5a2d5c23 Categories were missing 2016-06-14 09:50:17 +02:00
rabuzarus 3a240b73a5 Merge pull request #2607 from annando/1606-time-travel
Avoid time travel in posts (received before created)
2016-06-14 01:09:37 +02:00
Michael Vogel a05f0c39a6 Merge remote-tracking branch 'upstream/develop' into 1606-time-travel 2016-06-13 22:32:40 +02:00
rabuzarus 6e354eca14 Merge pull request #2606 from annando/1606-network-order
Bugfix: Items weren't sorted correctly
2016-06-13 22:26:10 +02:00
Michael Vogel 81395fe385 Avoid time travel in posts (received before created) 2016-06-13 22:21:33 +02:00
Michael Vogel 2815173a52 Bugfix: Items weren't sorted correctly 2016-06-13 22:20:09 +02:00
Michael Vogel 365101066a Merge pull request #2605 from rabuzarus/1306-aside-group-fix
frio: fix an css issue with sidebar-group checkbox alignment
2016-06-13 14:34:08 +02:00
rabuzarus 06792d6b37 frio: fix an css issue with sidebar-group checkbox alignment 2016-06-13 12:17:33 +02:00
Michael Vogel 933f5973af Merge pull request #2604 from rabuzarus/1306-themesettings-fix
frio: settings_display.tpl + rise frio to 0.2 Alpha
2016-06-13 11:54:58 +02:00
rabuzarus 9371a004d9 Merge pull request #2603 from fabrixxm/0613-confix-fix-2
Fix Config and PConfig ::get() on new keys
2016-06-13 11:01:14 +02:00
rabuzarus 82b6917c5f frio: settings_display.tpl + rise frio to 0.2 Alpha 2016-06-13 10:57:42 +02:00
Fabrixxm 6e28cdf2ee Fix Config and PConfig ::get() on new keys 2016-06-13 10:28:40 +02:00
rabuzarus 5e98f27fcd frio: events - work on event_form.tpl + datetime.php 2016-06-13 10:19:38 +02:00
rabuzarus 869a439466 Merge pull request #2595 from annando/1606-contact-priority
Priority for native networks when searching by contact url
2016-06-13 09:28:54 +02:00
rabuzarus 08d5975105 Merge pull request #2602 from annando/1606-item-query-cleanup
Some item query cleanup
2016-06-13 09:27:21 +02:00
Michael Vogel 125d80292b Some cleanup 2016-06-12 23:06:48 +02:00
Michael Vogel 9354d86f38 Merge pull request #2601 from rabuzarus/1206-short-info-fix
frio: bind short-info scrollspy on class fn (insteadof p-addr)
2016-06-12 21:59:46 +02:00
Michael Vogel cb6c2f3173 Merge pull request #2600 from rabuzarus/1106-frio-settings
frio: some template clean up
2016-06-12 21:59:07 +02:00
Michael Vogel c68f28bc77 Merge remote-tracking branch 'upstream/develop' into 1606-item-query-cleanup 2016-06-12 21:07:45 +02:00
Michael Vogel c05898c57d The queries for items are unified (a little bit) 2016-06-12 21:04:55 +02:00
rabuzarus 468f2d001e frio: scrollspy info - forgot to change all classes 2016-06-12 20:34:41 +02:00
rabuzarus 605399032d frio: bind short-info scrollspy on class fn (insteadof p-addr) 2016-06-12 20:25:30 +02:00
rabuzarus 85efa93898 frio: little css fix 2016-06-12 20:20:17 +02:00
rabuzarus 9db614de64 frio: some template clean up 2016-06-12 20:09:02 +02:00
Michael Vogel 18e3e814b8 Merge pull request #2599 from rabuzarus/1106-frio-settings
frio: add templates for user settings
2016-06-12 20:08:48 +02:00
Michael Vogel e51d559d6c Merge pull request #2598 from rabuzarus/1206-config-fix
fix config & pconfig
2016-06-12 20:08:06 +02:00
rabuzarus b19af8f0b7 frio: add css for settings templates 2016-06-12 19:59:27 +02:00
rabuzarus 0aa15f74ff Merge develop into 1106-frio-settings 2016-06-12 19:34:06 +02:00
rabuzarus b2ba25bd27 fix federation statistics 2016-06-12 19:15:12 +02:00
rabuzarus 64753f474c fix config & pconfig 2016-06-12 18:55:20 +02:00
rabuzarus 0af572ffba frio: first part for event template work 2016-06-12 18:23:10 +02:00
Michael Vogel 6d50d18242 Merge pull request #2584 from rabuzarus/0906-profiles
some restructure in profiles.php + frio template for profiles settings
2016-06-12 14:20:42 +02:00
Michael Vogel c138455c5e Merge remote-tracking branch 'upstream/develop' into 1606-contact-priority 2016-06-12 12:16:24 +02:00
Michael Vogel 0eb69b963e Merge pull request #2587 from rabuzarus/1006-short-info
frio: a short contact informations will be provided at the second nav…
2016-06-12 12:12:43 +02:00
Michael Vogel 04410a5b76 Merge pull request #2594 from rabuzarus/1210-login-tpl
frio: provide login.tpl
2016-06-12 12:08:54 +02:00
Michael Vogel 09fbcbc685 Just some added todo 2016-06-12 12:06:15 +02:00
rabuzarus 5fc5ef5461 frio: provide login.tpl 2016-06-12 11:51:43 +02:00
rabuzarus 3264efb238 Merge pull request #2583 from fabrixxm/frio-login-modal
Frio: login button opens a modal
2016-06-12 10:50:56 +02:00
Michael Vogel aac9caab2d Priority for native networks when searching by contact url 2016-06-12 10:46:15 +02:00
rabuzarus 56b600381e frio: add some more settings templates 2016-06-12 00:15:48 +02:00
rabuzarus f2ad8dd1d4 frio: add settings.tpl 2016-06-11 22:35:08 +02:00
rabuzarus 8ac7575d5b frio: closed profile setting sections on page load 2016-06-11 18:51:20 +02:00
rabuzarus c2f116f8fd frio short contact informations - some optical polishing 2016-06-11 17:43:02 +02:00
Michael Vogel 5fc0f06786 Merge pull request #2590 from rabuzarus/1106_finding_string
unify heading of search results to "results for:"
2016-06-11 11:53:20 +02:00
rabuzarus 35b6c93ba4 reset gitignore 2016-06-11 10:57:45 +02:00
rabuzarus d39f679230 Merge develop into 1006-short-info
Conflicts:
	view/theme/frio/js/theme.js
2016-06-11 10:52:26 +02:00
rabuzarus ca269b6329 unify heading of search results to "results for:" 2016-06-11 10:44:52 +02:00