aboutsummaryrefslogtreecommitdiffstats
path: root/view
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dev' into 'dev'Mario2018-08-216-1851/+2442
* Merge branch 'dev' into 'dev'Mario2018-07-315-16/+33
* Merge branch '3.6RC'Mario Vavti2018-07-2597-8322/+16583
|\
| * Merge branch 'patch-2' into 'dev'Mario2018-07-232-258/+265
| * Update update_fail_eml.tplkostikov2018-07-211-13/+14
| * Update register_verify_eml.tplkostikov2018-07-211-10/+9
| * Update register_open_eml.tplkostikov2018-07-211-14/+12
| * Update passchanged_eml.tplkostikov2018-07-211-11/+15
| * Update lostpass_eml.tplkostikov2018-07-211-17/+20
| * Add new filekostikov2018-07-211-0/+14
| * Update hstrings.phpkostikov2018-07-211-1633/+3130
| * Update hmessages.pokostikov2018-07-211-5471/+12527
| * prevent double file uploads when dropping files into jotMario Vavti2018-07-201-0/+1
| * fix jot drag and dropMario Vavti2018-07-201-6/+9
| * Update hmessages.pokostikov2018-07-181-1/+1
| * Fix wrong plural function logickostikov2018-07-181-1/+1
| * when calling timeago() from mod_mail.js it is called before the translations ...Mario Vavti2018-07-132-1/+3
| * let timeago render the dateMario Vavti2018-07-131-1/+1
| * let timeago render the dateMario Vavti2018-07-131-1/+1
| * update jquery.timeago libMario Vavti2018-07-131-2/+2
| * Update hstrings.php - spelling - PrivatsphäreHeiko Förster2018-07-081-1/+1
| * fix css regressionMario Vavti2018-07-072-3/+1
| * don't provide manage apps button when viewing all availablezotlabs2018-07-051-1/+1
| * appstore changeszotlabs2018-07-042-0/+9
| * plugins -> addonszotlabs2018-06-281-4/+4
| * Merge remote-tracking branch 'mike/master' into devMario Vavti2018-06-251-1/+0
| |\
| | * remove the white-space pre-wrap property on code blocks. This should probably...zotlabs2018-06-241-1/+0
| * | Merge branch 'dev' of https://framagit.org/hubzilla/core into devMario Vavti2018-06-2527-513/+4
| |\ \
| | * \ Merge branch 'patch-1' into 'dev'Mike Macgirvin2018-06-202-2/+2
| | |\ \ | | | |/ | | |/|
| | | * fix simple errorjeroenpraat2018-06-181-1/+1
| | | * fix simple errorjeroenpraat2018-06-181-1/+1
| | * | channel sources: add 'resend' option to discard original author - similar to ...zotlabs2018-06-182-0/+2
| | * | remove several unused/unreferenced templateszotlabs2018-06-1723-511/+0
| | |/
| * / updates justified gallery lib to version 3.7 and minor fixes for full templateMario Vavti2018-06-251-4/+5
| |/
| * Merge branch 'dev' of https://framagit.org/hubzilla/core into devMario2018-06-174-3/+7
| |\
| | * hubzilla core issue #1227 - affinity slider unable to reach 0,99 when slider ...zotlabs2018-06-151-2/+2
| | * wiki: word-wrap code on any characterzotlabs2018-06-141-0/+2
| | * optionally report total available space when uploadingzotlabs2018-06-131-0/+1
| | * SECURITY: provide option to disable the cloud 'root' directory and make the c...zotlabs2018-06-131-0/+1
| | * Merge branch 'master' of ../hz into devzotlabs2018-06-101-1/+1
| | |\
| | | * hubzilla core issue #1218zotlabs2018-06-101-1/+1
| * | | some work on mod groupMario2018-06-176-124/+91
| |/ /
| * | fix issue #1219Mario Vavti2018-06-091-1/+1
| * | move cid filter js to the widgetMario Vavti2018-06-092-4/+5
| * | new feature filter network by nameMario Vavti2018-06-083-0/+14
| |/
| * fixes for search_item.tplMario Vavti2018-06-072-49/+41
| * Merge remote-tracking branch 'mike/master' into devMario Vavti2018-06-065-8/+8
| |\
| | * some work to make menus editable by visitors with webpage write permissions; ...zotlabs2018-06-055-8/+8
| * | rely on the pf argument to determine if we deal with a forum or not. xchan_pu...Mario Vavti2018-06-051-0/+2
| |/
| * finalize filters and forum notificationsMario Vavti2018-06-025-4/+9