rabuzarus
|
7dc5fc8b9f
|
Merge develop into 1206-events-template
Conflicts:
view/theme/frio/css/style.css
|
2016-06-17 14:33:08 +02:00 |
|
|
rabuzarus
|
4313982e02
|
frio - event - code clean up + docu
|
2016-06-17 14:27:33 +02:00 |
|
|
rabuzarus
|
8b4c416713
|
frio: events - split event form in different sections
|
2016-06-16 20:16:16 +02:00 |
|
Michael Vogel
|
3c9a80a31c
|
dfrn relocate: addr field added, gcontact update added
|
2016-06-15 21:23:22 +02:00 |
|
|
Michael Vogel
|
7f5a2d5c23
|
Categories were missing
|
2016-06-14 09:50:17 +02:00 |
|
|
Michael Vogel
|
a05f0c39a6
|
Merge remote-tracking branch 'upstream/develop' into 1606-time-travel
|
2016-06-13 22:32:40 +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 |
|
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 |
|
|
Michael Vogel
|
125d80292b
|
Some cleanup
|
2016-06-12 23:06:48 +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
|
64753f474c
|
fix config & pconfig
|
2016-06-12 18:55:20 +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
|
09fbcbc685
|
Just some added todo
|
2016-06-12 12:06:15 +02:00 |
|
|
Michael Vogel
|
aac9caab2d
|
Priority for native networks when searching by contact url
|
2016-06-12 10:46:15 +02:00 |
|
|
Fabrixxm
|
136ae34245
|
Add $default_value parameter to Config::get() and PConfig::get()
|
2016-06-10 12:00:34 +02:00 |
|
|
Fabrixxm
|
6c346b1ab6
|
Move Config and PConfig classes in \Friendica\Core namespace
|
2016-06-10 11:52:01 +02:00 |
|
|
Fabrixxm
|
f2e79e976d
|
set include/ folder base for 'Friendica' PSR4 namespace
|
2016-06-10 11:50:52 +02:00 |
|
|
rabuzarus
|
3a9a9e6a1c
|
frio + core: some restructure in profiles.php + frio template for profiles settings
|
2016-06-10 11:24:38 +02:00 |
|
|
fabrixxm
|
60c1172e7e
|
Merge pull request #2576 from rabuzarus/0806-PConfig
move config to its own class (with legacy support)
|
2016-06-10 11:13:08 +02:00 |
|
|
Michael Vogel
|
098a8ac6c2
|
Bugfix: In threads the contact data from users weren't taken.
|
2016-06-08 22:50:57 +02:00 |
|
|
rabuzarus
|
023c43fa4a
|
config && pconfig: return NULL if config is unset
|
2016-06-08 21:52:10 +02:00 |
|
|
rabuzarus
|
7e8ea1cb87
|
move config to its own class (with legacy support)
|
2016-06-08 11:02:18 +02:00 |
|
|
Michael Vogel
|
aad00ddc04
|
Renamed template
|
2016-06-08 07:11:16 +02:00 |
|
|
Michael Vogel
|
f59b21d4a8
|
Merge remote-tracking branch 'upstream/develop' into 1606-shared-template
|
2016-06-07 22:40:29 +02:00 |
|
|
Michael Vogel
|
e2e32eecac
|
New template for shared content instead of hardcoded stuff in source
|
2016-06-07 22:29:50 +02:00 |
|
|
rabuzarus
|
3a368214c0
|
frio: saved_searches_aside & searchbox template
|
2016-06-07 15:29:38 +02:00 |
|
|
Michael Vogel
|
fc66a86dc5
|
Some optimized sql queries
|
2016-06-06 22:57:27 +02:00 |
|
Tobias Diekershoff
|
9d72c3d170
|
Merge pull request #2565 from rabuzarus/0606-confic-docu
move pconfig to its own class
|
2016-06-06 18:31:37 +02:00 |
|
|
rabuzarus
|
fa02d0f2f8
|
rename PConfig::del to PConfig:delete
|
2016-06-06 10:46:33 +02:00 |
|
|
rabuzarus
|
f10011c282
|
move pconfig to it's own class PConfig
|
2016-06-06 10:22:14 +02:00 |
|
|
rabuzarus
|
5f081cc47b
|
add doxygen to config functions
|
2016-06-06 10:01:14 +02:00 |
|
|
Michael Vogel
|
3d27ebcb34
|
Added documentation
|
2016-06-06 06:29:03 +02:00 |
|
|
Michael Vogel
|
a25d58b2ee
|
Merge remote-tracking branch 'upstream/develop' into 1606-dbm
|
2016-06-06 06:21:36 +02:00 |
|
|
Michael Vogel
|
3e7e866e13
|
Baseurl removed
|
2016-06-05 21:22:14 +02:00 |
|
|
Michael Vogel
|
4b640dbd97
|
Fetching of profile data improved
|
2016-06-05 21:17:55 +02:00 |
|
|
Michael Vogel
|
ea3a6ec6eb
|
Some more cleanup and code removal.
|
2016-06-05 20:01:38 +02:00 |
|
|
Michael Vogel
|
98272fe386
|
Some better handling of "bd" and "birthday"
|
2016-06-05 15:09:40 +02:00 |
|
|
Michael Vogel
|
572402224f
|
"bd" now always shows the upcoming birthday
|
2016-06-05 15:03:04 +02:00 |
|
|
Michael Vogel
|
71d3274841
|
Unified contact data handling
|
2016-06-05 13:57:11 +02:00 |
|
|
Michael Vogel
|
0518f004c2
|
removed duplicated functions
|
2016-06-04 12:20:09 +02:00 |
|
|
Michael Vogel
|
b45772ba6e
|
Configurable amount of maximum processes
|
2016-06-04 11:04:26 +02:00 |
|
|
Michael Vogel
|
140225b1a8
|
Merge remote-tracking branch 'upstream/develop' into 1606-dbm
|
2016-06-04 10:18:43 +02:00 |
|
|
rabuzarus
|
33f7513ff3
|
Merge pull request #2554 from annando/1606-mention-class
Mentions are now having an own class
|
2016-06-04 09:45:42 +02:00 |
|
|
Michael Vogel
|
df337e57d1
|
Quit when processlist is too long
|
2016-06-03 23:10:23 +02:00 |
|
|
Michael Vogel
|
4914e8826b
|
Merge remote-tracking branch 'upstream/develop' into 1606-dbm
|
2016-06-02 07:37:37 +02:00 |
|
|
Michael Vogel
|
46659f15d3
|
One div too much
|
2016-06-01 21:58:50 +02:00 |
|