aboutsummaryrefslogtreecommitdiffstats
path: root/view
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'extend-convitems-dropdown' into 'dev'Mario2018-08-271-0/+4
|\ | | | | | | | | Extend cog dropdown & temp fix for feed display of corrupt mids See merge request hubzilla/core!1265
| * Add hook to extend conv_item cog dropdown menuM.Dent2018-08-261-0/+4
| |
* | Update wiki.tplMax Kostikov2018-08-251-2/+2
| |
* | Revert "Update wiki.tpl"Max Kostikov2018-08-251-428/+428
| | | | | | This reverts commit c16fda1cb6fef84788d3045b0edff367d2978c98
* | Revert "Update wiki.tpl"Max Kostikov2018-08-251-1/+1
| | | | | | This reverts commit ff1a0d217ff769a2e6e622915cb7e9d9eff327b5
* | Update wiki.tplMax Kostikov2018-08-251-1/+1
| |
* | Update nwiki_page_history.tplMax Kostikov2018-08-251-7/+7
| |
* | Update wiki.tplMax Kostikov2018-08-251-428/+428
| |
* | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-08-241-0/+1
|\ \
| * | tweak archive widget for articleszotlabs2018-08-221-0/+1
| | |
* | | Update hstrings.phpMax Kostikov2018-08-221-31/+31
| | |
* | | Update hmessages.poMax Kostikov2018-08-221-228/+196
| |/ |/|
* | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-08-221-1/+1
|\|
| * profile likes - liker image was a bit large and didn't make a very pleasant ↵zotlabs2018-08-211-1/+1
| | | | | | | | looking dropdown, may have been overlooked when other related things were changed to menu-img-1 class
* | Merge branch 'redbasic-addroomforfooter' into 'dev'Mario2018-08-221-0/+3
|\ \ | | | | | | | | | | | | Fix jumpy sidebars See merge request hubzilla/core!1261
| * | Fix jumpy sidebarsM.Dent2018-08-211-0/+3
| | |
* | | Merge branch 'redbasic-addroomforfooter' into 'dev'Mario2018-08-212-2/+12
|\| | | | | | | | | | | | | | Add bottom margin on aside elements and main to allow for viewport footer. See merge request hubzilla/core!1259
| * | Add bottom margin on aside elements and main to allow for viewport footer.M.Dent2018-08-202-2/+12
| |/
* / Update catalan translations for sstrings up to 18th July 2018fadelkon2018-08-206-1851/+2442
|/
* possible fixes for can_comment_on_post(), provide wiki_list on wiki sidebarzotlabs2018-08-151-0/+1
|
* Merge remote-tracking branch 'mike/master' into devMario Vavti2018-08-121-1/+1
|\
| * prevent json-ld bombing, turn off browser autocomplete on channel sources ↵zotlabs2018-08-111-1/+1
| | | | | | | | creation
* | Merge branch 'oauth2-ui-pr' into 'dev'Mario2018-08-121-3/+4
|\ \ | |/ |/| | | | | Oauth2 ui pr See merge request hubzilla/core!1255
| * OAuth2 UI and settings updatesM.Dent2018-08-101-3/+4
| |
* | Update Spanish translationManuel Jiménez Friaza2018-07-305-16/+33
| |
* | Update hstrings.phpMax Kostikov2018-07-261-9/+9
| |
* | Update hmessages.poMax Kostikov2018-07-261-9/+10
| |
* | Update passchanged_eml.tplMax Kostikov2018-07-261-1/+1
| |
* | Update lostpass_eml.tplMax Kostikov2018-07-261-1/+1
| |
* | Update hstrings.phpkostikov2018-07-231-75/+94
| |
* | Update hmessages.pokostikov2018-07-231-183/+171
| |
* | Merge branch 'patch-2' into 'dev'Mario2018-07-217-65/+118
|\ \ | | | | | | | | | | | | New russian templates See merge request hubzilla/core!1233
| * | Update update_fail_eml.tplkostikov2018-07-201-13/+14
| | |
| * | Create register_verify_member.tplkostikov2018-07-201-0/+34
| | |
| * | Update register_verify_eml.tplkostikov2018-07-201-10/+9
| | |
| * | Update register_open_eml.tplkostikov2018-07-201-14/+12
| | |
| * | Update passchanged_eml.tplkostikov2018-07-201-11/+15
| | |
| * | Update lostpass_eml.tplkostikov2018-07-201-17/+20
| | |
| * | Add new filekostikov2018-07-201-0/+14
| | |
* | | Merge branch 'dev' into 'dev'Mario2018-07-212-7104/+15657
|\ \ \ | |/ / |/| | | | | | | | Update russian translation for 3.6 See merge request hubzilla/core!1230
| * | Update hstrings.phpkostikov2018-07-201-1633/+3130
| | |
| * | Update hmessages.pokostikov2018-07-201-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
| | | | | | (cherry picked from commit cbab7d215046d999c3f808b3946ea378c4475a72)
* | Fix wrong plural function logickostikov2018-07-181-1/+1
| | | | | | (cherry picked from commit 42840886119420b4efad511da0cb307f74542545)
* | when calling timeago() from mod_mail.js it is called before the translations ↵Mario Vavti2018-07-132-1/+3
| | | | | | | | are applied - move the call to main.js and be more specific with the selector to not trigger calls for other modules (eg network) which is handled elsewhere to not be to much of an performance hog (to many dates at a time)
* | 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
|/