nupplaPhil/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
21462 commits 2 branches 55 tags 148 MiB
Commit graph

228 commits

Author SHA1 Message Date
Adam Magness 35abc4bb64 get markup template 
implement getMarkupTemplate function
 2018-10-31 10:44:06 -04:00
Adam Magness 91facd2d0a replace macros 
implement new replaceMacros function
 2018-10-31 10:35:50 -04:00
Philipp Holzer 5a02e39a65
Rename App Methods 
- renamed a lot of App methods to CamelCase
- replaced direct public variables with get-/set-Methods
 2018-10-10 00:16:06 +02:00
Hypolite Petovan 18c8a7f247 Fix inline code span display 2018-09-19 23:10:41 -04:00
Michael Vogel 5af9596dde New item field "Post-type" and new table "permissionset" (#5408) 
* "post-type" replaces "bookmark" and "type"

* Removed some more type

* Added index to permission set

* The permission set is now stored

* The permission set is now removed upon expiry

* Post update now stores the permission set

* New file

* Permissions are now sorted

* Changed documentation
 2018-07-19 09:52:05 -04:00
ImgBotApp c50cc25902
[ImgBot] optimizes images 
*Total -- 7,020.51kb -> 6,174.86kb (12.05%)

/images/icons/10/edit.png -- 2.94kb -> 0.37kb (87.38%)
/images/icons/10/add.png -- 2.88kb -> 0.37kb (87.2%)
/images/icons/10/delete.png -- 2.95kb -> 0.38kb (87.14%)
/images/icons/10/gear.png -- 2.97kb -> 0.40kb (86.49%)
/images/icons/16/edit.png -- 3.06kb -> 0.49kb (83.99%)
/images/icons/10/menu.png -- 2.95kb -> 0.47kb (83.99%)
/images/icons/16/add.png -- 3.00kb -> 0.48kb (83.83%)
/images/icons/16/delete.png -- 3.07kb -> 0.50kb (83.67%)
/images/search_18.png -- 3.22kb -> 0.57kb (82.25%)
/images/icons/16/gear.png -- 3.12kb -> 0.56kb (82.18%)
/images/icons/22/edit.png -- 3.17kb -> 0.61kb (80.72%)
/images/icons/22/add.png -- 3.13kb -> 0.62kb (80.16%)
/images/icons/22/delete.png -- 3.22kb -> 0.65kb (79.81%)
/view/theme/frio/frameworks/bootstrap-colorpicker/img/bootstrap-colorpicker/alpha.png -- 3.19kb -> 0.66kb (79.49%)
/view/theme/frio/frameworks/bootstrap-colorpicker/img/bootstrap-colorpicker/alpha-horizontal.png -- 3.55kb -> 0.76kb (78.6%)
/images/icons/10/star.png -- 3.15kb -> 0.68kb (78.38%)
/images/icons/22/gear.png -- 3.30kb -> 0.74kb (77.72%)
/images/icons/16/menu.png -- 3.19kb -> 0.72kb (77.51%)
/view/theme/frio/frameworks/bootstrap-colorpicker/img/bootstrap-colorpicker/hue-horizontal.png -- 2.77kb -> 0.68kb (75.61%)
/view/theme/frio/frameworks/bootstrap-colorpicker/img/bootstrap-colorpicker/hue.png -- 2.90kb -> 0.71kb (75.5%)
/images/icons/22/menu.png -- 3.28kb -> 0.80kb (75.45%)
/images/icons/16/star.png -- 3.42kb -> 0.95kb (72.33%)
/images/blank.png -- 1.33kb -> 0.39kb (70.42%)
/images/icons/48/add.png -- 3.85kb -> 1.14kb (70.36%)
/images/icons/22/star.png -- 3.69kb -> 1.22kb (66.93%)
/view/theme/frio/img/select_arrow.png -- 0.95kb -> 0.31kb (66.87%)
/images/icons/48/edit.png -- 3.86kb -> 1.30kb (66.39%)
/images/icons/48/delete.png -- 3.90kb -> 1.32kb (66.3%)
/images/diaspora-logo.png -- 8.52kb -> 2.88kb (66.18%)
/view/theme/duepuntozero/deriv/imggreenzero/head.jpg -- 1.05kb -> 0.36kb (65.96%)
/view/theme/frio/img/mime/file.png -- 1.06kb -> 0.37kb (64.94%)
/view/theme/duepuntozero/deriv/imgeasterbunny/head.jpg -- 1.08kb -> 0.38kb (64.65%)
/view/theme/duepuntozero/deriv/imgpurplezero/head.jpg -- 1.08kb -> 0.38kb (64.65%)
/view/theme/frio/img/mime/word.png -- 1.05kb -> 0.37kb (64.62%)
/view/theme/frio/img/mime/excel.png -- 1.05kb -> 0.37kb (64.6%)
/view/theme/frio/img/mime/zip.png -- 1.09kb -> 0.39kb (64.33%)
/images/facebook.png -- 4.28kb -> 1.57kb (63.28%)
/images/icons/48/gear.png -- 4.13kb -> 1.53kb (62.89%)
/view/theme/frio/img/mime/powerpoint.png -- 1.11kb -> 0.43kb (61.2%)
/view/theme/frio/img/mime/video.png -- 1.13kb -> 0.46kb (59.39%)
/view/theme/frio/img/icon_search16x16.png -- 1.21kb -> 0.50kb (58.89%)
/images/icons/play.png -- 6.14kb -> 2.53kb (58.84%)
/view/theme/frio/img/mime/audio.png -- 1.10kb -> 0.46kb (58.36%)
/images/icons/text.png -- 6.03kb -> 2.52kb (58.25%)
/images/icons/video.png -- 6.01kb -> 2.52kb (58.1%)
/view/theme/frio/img/mime/image.png -- 1.18kb -> 0.52kb (55.47%)
/images/icons/48/menu.png -- 4.50kb -> 2.02kb (55.02%)
/images/icons/edit.png -- 8.10kb -> 3.71kb (54.19%)
/images/icons/lock.png -- 8.01kb -> 3.75kb (53.22%)
/images/icons/delete.png -- 7.72kb -> 3.62kb (53.06%)
/images/icons/48/star.png -- 4.66kb -> 2.20kb (52.91%)
/images/icons/add.png -- 8.48kb -> 4.02kb (52.6%)
/images/mail.png -- 10.30kb -> 4.95kb (51.93%)
/images/icons/unlock.png -- 8.20kb -> 3.95kb (51.79%)
/images/icons/audio.png -- 7.79kb -> 3.77kb (51.56%)
/images/icons/plugin.png -- 9.23kb -> 4.48kb (51.46%)
/images/icons/zip.png -- 9.60kb -> 4.71kb (50.96%)
/doc/img/editor_frost.png -- 3.70kb -> 1.84kb (50.37%)
/view/theme/frio/img/mime/pdf.png -- 1.23kb -> 0.62kb (49.72%)
/images/icons/gear.png -- 10.49kb -> 5.31kb (49.38%)
/view/theme/frio/img/mime/indesign.png -- 1.30kb -> 0.67kb (48.76%)
/doc/img/frost.png -- 1.96kb -> 1.01kb (48.68%)
/view/theme/frio/img/mime/illustrator.png -- 1.17kb -> 0.61kb (47.96%)
/view/theme/frio/img/mime/photoshop.png -- 1.21kb -> 0.64kb (47.29%)
/images/icons/image.png -- 13.66kb -> 7.22kb (47.17%)
/doc/img/diabook.png -- 3.22kb -> 1.74kb (46.03%)
/images/appnet.png -- 9.21kb -> 5.03kb (45.42%)
/images/blogger.png -- 9.07kb -> 4.99kb (44.95%)
/view/theme/frio/img/placeholder-postform-arrow.png -- 1.82kb -> 1.06kb (41.81%)
/doc/img/posts_define.png -- 3.04kb -> 1.78kb (41.44%)
/view/theme/frio/frameworks/bootstrap-colorpicker/img/bootstrap-colorpicker/saturation.png -- 8.61kb -> 5.10kb (40.72%)
/images/tumblr.png -- 5.92kb -> 3.54kb (40.23%)
/images/wordpress.png -- 20.29kb -> 12.24kb (39.66%)
/images/icons/link.png -- 7.28kb -> 4.43kb (39.21%)
/images/dreamwidth.png -- 7.36kb -> 4.48kb (39.08%)
/images/libertree.png -- 8.61kb -> 5.33kb (38.12%)
/images/googleplus.png -- 8.74kb -> 5.70kb (34.82%)
/doc/img/camera.png -- 0.87kb -> 0.58kb (33.41%)
/doc/img/paper_clip.png -- 0.65kb -> 0.44kb (33.13%)
/doc/img/friendica_rich_editor.png -- 9.65kb -> 6.50kb (32.68%)
/images/icons/menu.png -- 14.44kb -> 9.79kb (32.21%)
/images/gnusocial.png -- 17.53kb -> 12.05kb (31.26%)
/doc/img/friendica_editor.png -- 7.85kb -> 5.47kb (30.32%)
/view/theme/smoothly/images/photo-menu.jpg -- 2.74kb -> 1.92kb (29.99%)
/images/twitter.png -- 13.04kb -> 9.41kb (27.83%)
/images/icons/star.png -- 9.09kb -> 6.66kb (26.73%)
/view/theme/vier/screenshot.png -- 190.75kb -> 141.23kb (25.96%)
/doc/img/post_mark.png -- 0.72kb -> 0.55kb (24.22%)
/view/theme/vier/icons.png -- 19.84kb -> 15.16kb (23.58%)
/view/theme/duepuntozero/bbedit.png -- 2.09kb -> 1.61kb (23.36%)
/view/theme/quattro/icons/bbedit.png -- 2.09kb -> 1.61kb (23.36%)
/view/theme/quattro/showmore-bg.jpg -- 1.92kb -> 1.48kb (22.62%)
/images/screenshots/friendica-frio-red-profle-1.png -- 74.57kb -> 57.72kb (22.59%)
/images/person-48.jpg -- 2.12kb -> 1.66kb (21.69%)
/doc/img/post_tag.png -- 0.60kb -> 0.47kb (21.24%)
/view/theme/frio/img/screenshots/screenshot-mobile.png -- 45.25kb -> 35.72kb (21.06%)
/view/theme/smoothly/images/icons.png -- 19.29kb -> 15.25kb (20.96%)
/images/icons/notify_on.png -- 3.58kb -> 2.84kb (20.68%)
/spec/dfrn-snap2.jpg -- 240.94kb -> 192.52kb (20.1%)
/doc/img/video.png -- 0.61kb -> 0.49kb (20.03%)
/images/icons/info.png -- 4.19kb -> 3.38kb (19.24%)
/view/theme/duepuntozero/deriv/imgdarkzero/head.jpg -- 1.24kb -> 1.02kb (17.42%)
/images/screenshots/friendica-frio-red-profle-2.png -- 153.60kb -> 128.16kb (16.56%)
/doc/img/post_link.png -- 0.56kb -> 0.47kb (15.56%)
/images/icons.png -- 13.48kb -> 11.42kb (15.32%)
/view/theme/smoothly/images/power.png -- 3.05kb -> 2.59kb (15.28%)
/view/theme/duepuntozero/deriv/imggreenzero/greenicons.png -- 12.03kb -> 10.22kb (15%)
/images/person-80.jpg -- 3.03kb -> 2.61kb (13.99%)
/view/theme/frio/img/screenshots/screenshot-jot-modal.png -- 108.30kb -> 93.19kb (13.96%)
/images/icons/notice.png -- 3.61kb -> 3.11kb (13.92%)
/doc/img/editor_vier.png -- 2.63kb -> 2.27kb (13.8%)
/images/screenshots/friendica-frio-green-profle-1.png -- 158.43kb -> 136.58kb (13.79%)
/images/screenshots/friendica-frio-brown-profile-2.png -- 891.01kb -> 768.46kb (13.75%)
/doc/img/acl_win.png -- 53.89kb -> 46.57kb (13.58%)
/view/theme/smoothly/images/next.png -- 0.87kb -> 0.75kb (13.58%)
/doc/img/dispy.png -- 3.61kb -> 3.13kb (13.32%)
/images/icons/notify_off.png -- 4.24kb -> 3.68kb (13.25%)
/doc/img/darkbubble.png -- 2.43kb -> 2.11kb (13.03%)
/images/screenshots/friendica-frio-red-profle-3.png -- 570.89kb -> 497.47kb (12.86%)
/images/screenshots/friendica-frio-brown-profile-1.png -- 526.17kb -> 461.66kb (12.26%)
/view/theme/frio/screenshot.png -- 133.28kb -> 117.52kb (11.83%)
/view/theme/frio/img/screenshots/screenshot.png -- 133.28kb -> 117.52kb (11.83%)
/images/icons/feed.png -- 8.80kb -> 7.78kb (11.58%)
/images/screenshots/friendica-frio-green-profle-2.png -- 460.00kb -> 408.47kb (11.2%)
/images/icons/user.png -- 6.76kb -> 6.04kb (10.69%)
/view/theme/smoothly/images/prev.png -- 0.83kb -> 0.75kb (9.5%)
/images/icons/48/feed.png -- 2.63kb -> 2.39kb (9.03%)
/images/icons/48/user.png -- 2.22kb -> 2.03kb (8.55%)
/view/theme/duepuntozero/editicons.png -- 6.15kb -> 5.67kb (7.81%)
/images/content-types.png -- 3.80kb -> 3.52kb (7.43%)
/doc/img/post_categorize.png -- 0.48kb -> 0.44kb (7.38%)
/images/icons/16/play.png -- 0.50kb -> 0.46kb (7.09%)
/doc/img/editor_zero.png -- 2.60kb -> 2.42kb (7.05%)
/images/default-profile-mm.jpg -- 0.31kb -> 0.29kb (6.52%)
/images/screenshots/friendica-frio-mobile-profle-2.png -- 50.47kb -> 47.29kb (6.3%)
/doc/img/post_thumbs_down.png -- 0.51kb -> 0.48kb (6.14%)
/view/theme/duepuntozero/deriv/imggreenzero/border.jpg -- 0.33kb -> 0.31kb (6.14%)
/view/theme/duepuntozero/border.jpg -- 0.33kb -> 0.31kb (6.14%)
/images/default-profile-sm.jpg -- 0.34kb -> 0.32kb (6.07%)
/view/theme/duepuntozero/deriv/imgdarkzero/sectionend.jpg -- 0.35kb -> 0.33kb (5.92%)
/view/theme/duepuntozero/deriv/imgeasterbunny/border.jpg -- 0.36kb -> 0.33kb (5.77%)
/view/theme/duepuntozero/deriv/imgpurplezero/border.jpg -- 0.36kb -> 0.33kb (5.77%)
/view/theme/duepuntozero/head.jpg -- 0.37kb -> 0.35kb (5.48%)
/view/theme/smoothly/images/menu-user-pin.jpg -- 0.38kb -> 0.36kb (5.45%)
/images/plugin.png -- 2.00kb -> 1.89kb (5.43%)
/images/show_all_off.png -- 0.53kb -> 0.50kb (5.38%)
/images/person-175.jpg -- 5.76kb -> 5.45kb (5.36%)
/doc/img/post_share.png -- 0.43kb -> 0.41kb (4.95%)
/spec/dfrn2_contact_request.png -- 317.37kb -> 301.69kb (4.94%)
/doc/img/post_thumbs_up.png -- 0.50kb -> 0.47kb (4.72%)
/view/theme/duepuntozero/photo-menu.jpg -- 0.45kb -> 0.43kb (4.58%)
/images/default-profile.jpg -- 0.48kb -> 0.46kb (4.29%)
/view/theme/duepuntozero/screenshot.jpg -- 70.86kb -> 67.88kb (4.2%)
/images/onoff.jpg -- 0.49kb -> 0.47kb (4.18%)
/spec/dfrn2_contact_confirmation.png -- 245.40kb -> 235.22kb (4.15%)
/view/theme/smoothly/screenshot.png -- 131.94kb -> 126.54kb (4.09%)
/view/theme/duepuntozero/deriv/imgdarkzero/border.jpg -- 0.51kb -> 0.49kb (4.03%)
/doc/img/darkzero.png -- 2.80kb -> 2.69kb (4.01%)
/view/theme/quattro/screenshot.jpg -- 67.98kb -> 65.57kb (3.54%)
/images/icons/10/play.png -- 0.41kb -> 0.40kb (3.33%)
/doc/img/editor_darkbubble.png -- 2.49kb -> 2.40kb (3.3%)
/view/theme/quattro/icons/contacts3.png -- 0.55kb -> 0.53kb (3.04%)
/images/friendica-256.jpg -- 16.73kb -> 16.25kb (2.87%)
/view/theme/quattro/icons/men.png -- 0.38kb -> 0.37kb (2.79%)
/images/icons/22/image.png -- 0.89kb -> 0.87kb (2.73%)
/view/theme/frio/img/friendica-32.png -- 0.62kb -> 0.61kb (2.5%)
/images/icons/48/text.png -- 0.95kb -> 0.93kb (2.47%)
/images/screenshots/friendica-frio-mobile-profle-1.png -- 47.24kb -> 46.25kb (2.11%)
/view/theme/smoothly/images/rarrow.gif -- 0.99kb -> 0.97kb (2.07%)
/images/icons/48/video.png -- 1.00kb -> 0.98kb (2.05%)
/images/icons/48/notify_on.png -- 1.47kb -> 1.44kb (1.99%)
/images/icons/48/image.png -- 2.18kb -> 2.13kb (1.93%)
/view/theme/frio/img/screenshots/screenshot-scheme-red.png -- 750.10kb -> 736.91kb (1.76%)
/view/theme/frio/img/screenshots/screenshot-scheme-love-music.png -- 238.98kb -> 235.05kb (1.65%)
/images/icons/48/lock.png -- 1.31kb -> 1.29kb (1.64%)
/images/icons/10/plugin.png -- 0.46kb -> 0.45kb (1.49%)
/images/icons/48/play.png -- 0.99kb -> 0.98kb (1.47%)
/view/theme/frio/img/screenshots/screenshot-settings.png -- 50.67kb -> 49.96kb (1.41%)
/images/icons/48/zip.png -- 1.62kb -> 1.60kb (1.39%)
/doc/img/globe.png -- 0.79kb -> 0.78kb (1.24%)
/images/icons/48/audio.png -- 1.28kb -> 1.26kb (1.22%)
/images/icons/48/plugin.png -- 1.62kb -> 1.60kb (1.2%)
/images/icons/group.png -- 7.10kb -> 7.02kb (1.13%)
/images/friendica-128.jpg -- 8.17kb -> 8.08kb (1.11%)
/images/icons/10/audio.png -- 0.46kb -> 0.45kb (1.06%)
/images/icons/22/notify_on.png -- 0.70kb -> 0.70kb (0.83%)
/doc/img/editor_frio.png -- 1.43kb -> 1.42kb (0.68%)
/images/screenshots/friendica-frio-default-profile-1.png -- 666.68kb -> 662.45kb (0.63%)
/images/icons/16/image.png -- 0.65kb -> 0.65kb (0.45%)
/images/icons/48/group.png -- 2.34kb -> 2.33kb (0.38%)
 2018-07-13 14:38:11 +00:00
Michael c70ebadd7d Issue-3412 related: Don't send connection posts anymore 2018-05-19 19:34:51 +00:00
Tobias Diekershoff eec0826750 added link to the TOS page if it is activated 2018-05-16 11:57:06 +02:00
Hypolite Petovan daffc27061 Move suppress_tags config to template 
- Add new item.suppress_tags template variable
- Fix template formatting
 2018-03-25 00:38:23 -04:00
Hypolite Petovan cd392db078 Move js/ folder under view/ 
- Move library/cropper to view/js/cropper
- Move library/jquery-textcomplete to view/js/jquery-textcomplete
 2018-01-28 16:17:36 -05:00
Adam Magness a7d887a68e CSS files 
update plugin references in css files.
 2018-01-20 07:48:22 -05:00
Michael 0b5f7da270 forgotten templates 2018-01-04 14:04:08 +00:00
Michael 3ffea2cd2c We now have a global page for all global entries from the network. 2018-01-03 13:27:43 +00:00
Michael 731ec347b1 Removed old template parser 2017-11-11 09:26:23 +00:00
Michael 5adfeb0bd5 App::get_baseurl is now replaced with System::baseUrl 2017-08-26 07:32:10 +00:00
Michael 3c24bed412 New class "System" 2017-08-26 06:04:21 +00:00
RJ Madsen 255f38710c Added global directory link to the find people side panel 2017-07-06 14:19:58 -04:00
Hypolite Petovan d14da1214c Remove special case of "url" from insertFormatting 2017-05-21 13:41:28 -04:00
Hypolite Petovan 20043914e6 Move App to src 
- Add `use Friendica\App;` wherever needed
 2017-05-02 22:59:36 -04:00
Hypolite Petovan 56ee734b00 Cleanup /format pre-move 2017-05-02 22:59:24 -04: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 c38a5e443d Merge branch 'develop' into issue/#3062 
* develop: (68 commits)
  Added documentation
  update to the translation
  update to the translations
  translation docs now contain basic usage of the Transifex client
  - Replace TinyMCE-enabled filebrowser.tpl by filebrowser_plain.tpl content
  - Remove misc TinyMCE mentions in docs and minifyjs
  - Remove $theme_richtext_editor boot var - Remove "richtext" feature - Remove fix_mce_lf() function - Remove nomce parameter
  - Remove TinyMCE mentions in themes
  - Remove tinyMCE mentions or convert to addeditortext() - Remove $editselect template value
  Remove tinyMCE libraries
  limit the description of the meta tag to 160 characters in /mod/display
  Improved handling of non string values in the config
  Bugfix: Caching of non string cache values now works.
  Reformatted stuff, improved query
  Auto-focus first input field of modal when shown
  Use cache instead of config for storing last proc_run time
  Some added logging
  Bugfix for masses of php warnings
  Rearranged the logging
  Some changed logging
  ...

# Conflicts:
#	view/theme/frost-mobile/js/theme.js
#	view/theme/frost/js/theme.js
 2017-01-27 15:30:21 -05:00
Hypolite Petovan 4ad6a7f073 - Remove TinyMCE mentions in themes 2017-01-26 22:54:32 -05:00
Hypolite Petovan b61479ba6e Merge remote-tracking branch 'friendica/develop' into issue/#3062 
# Conflicts:
#	view/theme/duepuntozero/theme.php
#	view/theme/smoothly/theme.php
 2017-01-12 09:19:59 +11:00
Hypolite Petovan 623479a346 Normalize App parameter declaration (view folder) 2017-01-09 23:06:08 +11:00
Hypolite Petovan ecd86ec296 Check for existing element in openMenu() 
- Removed useless val() call in the various insertFormatting()
declarations
 2017-01-09 11:34:41 +11:00
Hypolite Petovan 479180ca8e Merge branch 'develop' into issue/#3062 2017-01-08 11:44:45 +11:00
Hypolite Petovan d7c9b293d3 Update insertFormatting() definition 
- Remove now useless comment parameter
- Formatting all around
- Update data-role=“insert-formatting” links
- Update onclick=“insertFormatting()” links
 2017-01-08 02:16:03 +11:00
Hypolite Petovan b6ce646d71 Use placeholder attribute for Share message 2017-01-08 02:06:03 +11:00
Hypolite Petovan daa8e4f901 Cleaning up, actual changes are in the next commits 
- Formatting
- Trailing spaces
- Extraneous blank lines
- Large comments
 2017-01-08 02:03:11 +11:00
Roland Häder fb817b18ad changed to this: 
---------------------
function bla (App &$a) {
	$a->bla = 'stuff';
}
---------------------

Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-20 10:59:06 +01:00
Roland Häder 884f44ce94 *much* more usage of App::get_baseurl() instead of $a->get_baseurl() (coding convention applied) 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-19 14:27:16 +01:00
Hypolite Petovan 0c9cc29a51 Added response active support to smoothly 
- Added "self" class to wall_thread.tpl to avoid conflict with the
already existing "active" class
- Added style
 2016-09-25 10:56:37 -04:00
rabuzarus 15471f3835 add possibility to load custom page templates + none.php pagetemplate is part of core now 2016-07-11 10:33:39 +02:00
Ben Roberts 864cf0f70d update MF2 and vcard data for issue #2629 2016-06-21 10:23:43 -04:00
Michael Vogel e2c0f04eeb Added short description to "mark as seen" 2016-06-01 07:05:44 +02:00
rabuzarus 98b62b80f3 rework autocomplete: seperate bbcode completion 2016-04-14 23:59:29 +02:00
rabuzarus 01b02dbcaa Merge develop into 1404_reworked_autocomplete 
Conflicts:
	include/text.php
	view/templates/head.tpl
	view/theme/duepuntozero/style.css
	view/theme/vier/style.css
 2016-04-14 16:23:51 +02:00
fabrixxm d30d13959b Merge pull request #2328 from rabuzarus/0602_contact_profile 
polishing of the contact-edit page
 2016-03-06 19:56:59 +01:00
Roland Häder 04a7d6384e
No need to set $a->theme_info = array() everywhere if you can define it in App 
itself.

Signed-off-by: Roland Haeder <roland@mxchange.org>
 2016-03-01 14:27:38 +01:00
rabuzarus 0db83b9586 contactedit-actions-button: move repair back to tabbar 2016-02-23 19:19:45 +01:00
Andrej Stieben e104c58191 Added div#pause to themes' default.php 
As requested by @tobiasd and @rabuzarus.
 2016-02-09 16:41:19 +01:00
rabuzarus 0b5d7b300e contactedit-actions-button: adjust the themes and template polishing 2016-02-08 23:15:20 +01:00
rabuzarus e3475bd587 rework autocomplete: css work 2016-01-21 13:28:29 +01:00
fabrixxm fcf7a791f1 Revert "Merge pull request #2223 from rabuzarus/2912_photo_widget" 
This reverts commit 83e54f70d3, reversing
changes made to ecf576bdd0.
 2016-01-04 11:46:19 +01:00
rabuzarus 20fbf670db photo aside widget for profile page 2015-12-30 00:26:50 +01:00
Michael Vogel 1f9644bded Merge pull request #2131 from rabuzarus/3011_hcard_vcard 
unify hcard and vcard
 2015-12-03 14:16:52 +01:00
rabuzarus 1d6d9d3d24 photos-albms widget: add some classes 2015-12-01 21:07:05 +01:00
rabuzarus 89c5989cfb unify hcard and vcard 2015-12-01 18:31:08 +01:00
fabrixxm a60b702df1 Merge pull request #2113 from annando/1511-manage-notifications 
The manage page now shows the notifications
 2015-11-30 12:04:53 +01:00