keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
16854 commits 4 branches 0 tags 179 MiB
Commit graph

470 commits

Author SHA1 Message Date
Michael Vogel
5747cfc79c
Revert "Move Objects to Model" 2017-12-08 05:21:51 +01:00
Michael Vogel
e437c74d0e
Merge pull request #4031 from MrPetovan/task/3878-move-objects-to-model 
Move Objects to Model
 2017-12-08 05:02:21 +01:00
Adam Magness
48367220b8 Templete adjustment 
based on errors that were showing up in the debugger console on chrome
 2017-12-07 09:35:24 -05:00
Hypolite Petovan
52bddd580c Separate Object\Photo into Model\Photo and Object\Image 
- Renamed a bunch of functions to shorter or clearer names
 2017-12-07 08:56:11 -05:00
Hypolite Petovan
75181322ba Improve page contacblock for frio theme 2017-12-01 22:33:04 -05:00
Hypolite Petovan
ff459441cf
Merge branch 'develop' into task/admin-block-list 2017-12-01 00:48:13 -05:00
Hypolite Petovan
dc09319695 Add admin/contactblock page 
- Add page template
 2017-12-01 00:43:39 -05:00
Hypolite Petovan
16d0c30328 Move admin templates to dedicated sub-folder 2017-12-01 00:40:55 -05:00
Hypolite Petovan
052ba729d7 Improved translation functions 
- Add built-in vsprintf to t()
- Add built-in sprintf to tt()
 2017-12-01 00:35:40 -05:00
Adam Magness
54827e7fed Photo to src 
Move Photo to Friendica\Object namespace and replace require_once statments with use statements.
 2017-11-29 07:52:27 -05:00
Hypolite Petovan
3fbf2e3bcf
Merge pull request #3966 from rabuzarus/20171122_-_port_tagcloud 
A tag cloud widget for the profile page
 2017-11-26 11:16:14 -05:00
Michael
cb7648359c When we are requesting a conneczion, the contactis no longer "blocked" 2017-11-26 02:31:26 +00:00
rabuzarus
4224209497 Merge develop into 20171122_-_port_tagcloud 
Conflicts:
	include/features.php
 2017-11-25 23:41:20 +01:00
Michael
3cb906c420 Issue 3911: Fetch keywords for feeds 2017-11-25 11:59:20 +00:00
rabuzarus
59ae5633ec tag-cloud: some polishing + remove authors (we don't use it at the moment) 2017-11-22 23:18:01 +01:00
rabuzarus
d7d653aab6 port tag cloud widget from hubzilla 2017-11-22 21:29:07 +01:00
Hypolite Petovan
2336fa9d74 Add smart_threading user setting 2017-11-19 00:57:31 -05:00
Michael
731ec347b1 Removed old template parser 2017-11-11 09:26:23 +00:00
Adam Magness
4ca68c7af0 Class file relocations 
Issue #3878
 2017-11-08 08:37:03 -05:00
Adam Magness
b995e858e6 Review changes 
Replacements for ::delete() as well as changes to include use statements.
 2017-11-07 09:12:01 -05:00
Adam Magness
0dfa57948f Issue-#3873 
Replace deprecated functions with new syntax.
 2017-11-07 06:24:39 -05:00
Michael
2894214347 Misspelled "detailed" 2017-11-04 12:08:12 +00:00
Michael
7de3eae8d0 There is now a user switch to change between condensed and detailled notifications 2017-11-04 12:01:08 +00:00
rabuzarus
578dc6f967 frio: sanitize $schema only if the variable is initialized 2017-10-24 14:44:31 +02:00
rabuzarus
2687a42e3c frio: sanitise $schema 2017-10-23 22:14:35 +02:00
rabuzarus
7e273ba51b frio: fix wrong slider position in the theme_settings 2017-10-23 21:15:46 +02:00
rabuzarus
6a8969452a frio: add the possibility for the admin to change the colors for non personal pages 2017-10-23 20:26:31 +02:00
rabuzarus
1585918f29 frio: set a dummy img for background image if no img was set (Otherwise the empty value would be replaced in the browser with a path to the theme and the css would be loaded a second time) 2017-10-23 15:25:09 +02:00
rabuzarus
9be6dfadba frio: use cached css if no settings (or file) have changed 2017-10-23 15:16:23 +02:00
Michael Vogel
2c55d9f3ce Merge pull request #3817 from rabuzarus/20171019_-_fix_some_html_violations 
fix some HTML violations in frio
 2017-10-22 07:48:06 +02:00
Michael Vogel
2a5dd1e857 Merge pull request #3815 from rabuzarus/20171019_-_fix_more_posted_date_widget 
fix some more HTML violations in posted_date_widget.tpl
 2017-10-21 08:14:52 +02:00
rabuzarus
f2d51737eb fix some HTML violations in frio 2017-10-20 15:21:42 +02:00
rabuzarus
8167e75e6a fix some more HTML violations in posted_date_widget.tpl 2017-10-19 16:34:08 +02:00
rabuzarus
184bfc722d fix #3812 - some brocken parts in the display of events (default template) 2017-10-19 14:16:39 +02:00
rabuzarus
dd8ff1f097 remove unused 'aria-labelledby' in frios modal 2017-10-18 23:38:51 +02:00
rabuzarus
a6e8734a37 Bugfix: fix some duplicate ID 2017-10-18 23:22:05 +02:00
rabuzarus
7ddc5339fd frio: fix event seperator 2017-10-18 20:44:29 +02:00
rabuzarus
e5ce73b1f8 frio: fix margin and title for events 2017-10-18 20:18:50 +02:00
Michael Vogel
d60f96f0e1 Merge pull request #3797 from rabuzarus/20171015_-_duplicate_event 
add event action: duplicate events
 2017-10-18 18:57:58 +02:00
Tobias Diekershoff
cadc8aa6e8 Merge pull request #3787 from rabuzarus/20171013_-_format_event_in_stream 
event items are now more themeable in the networkstream
 2017-10-16 11:29:43 +02:00
rabuzarus
c1699364ae reload the acl if a new event edit or copy modal is opened 2017-10-15 22:34:31 +02:00
rabuzarus
74d813042f extend checkbox template for customized attributes 2017-10-15 18:45:49 +02:00
rabuzarus
204c134ab8 Buxfix: fix image floating in frios nav-short-info 2017-10-15 17:54:35 +02:00
rabuzarus
4584670af4 add event action: duplicate events 2017-10-15 17:30:28 +02:00
rabuzarus
dcbf4d6d11 fix event html construction (fixes #2646) 2017-10-13 20:03:47 +02:00
rabuzarus
553428d1b1 event items are now more themeable in the networkstream. 
The event description stays the same - but the theme developer can provide an template how the other event data should be organized and look
 2017-10-13 19:42:27 +02:00
Michael
df1e96441e Frio: Relocate message wasn't send 2017-10-07 15:45:00 +00:00
Michael
e8a2c68647 The plink in Diaspora posts now links to the correct place 2017-09-23 08:52:06 +00:00
Michael
a5cf2c69c8 Reworked network page 2017-09-13 06:43:43 +00:00
rabuzarus
2bf6b15833 Merge pull request #3675 from annando/mail-profile 
Links to profiles in mails now show the profile address as title
 2017-09-03 11:54:21 +02:00