aboutsummaryrefslogtreecommitdiffstats
path: root/view
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into tresredmatrix2015-05-174-23/+23
|\
| * Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-174-23/+23
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: include/bb2diaspora.php include/diaspora.php include/enotify.php mod/admin.php mod/cloud.php mod/dav.php mod/home.php mod/invite.php mod/like.php mod/mitem.php mod/p.php mod/pubsites.php mod/setup.php mod/siteinfo.php util/messages.po
| | * updated the templates to the {{}}, compared toRazlo2015-05-174-23/+23
| | |
* | | Merge branch 'master' into tresredmatrix2015-05-141-4/+3
|\| |
| * | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-141-4/+3
| |\|
| | * Add sprintf.js v1.0.2.Klaus Weidenbach2015-05-141-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | This script provides sprintf() for JavaScript. It can be used for example for translating strings used in JavaScript with variables. It is licensed under BSD-3-Clause and can be found on GitHub: https://github.com/alexei/sprintf.js
| | * Dutch 100\% againjeroenpraat2015-05-122-56/+76
| | |
| | * update pt-br transationAlexandre Hannud Abdo2015-05-112-6099/+7075
| | |
* | | Merge branch 'master' into tresredmatrix2015-05-1456-8598/+8554
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: include/Import/refimport.php include/activities.php include/attach.php include/event.php include/externals.php include/identity.php include/items.php include/notifier.php include/photos.php include/taxonomy.php include/zot.php mod/channel.php mod/connedit.php mod/events.php mod/item.php mod/like.php mod/manage.php mod/mood.php mod/ping.php mod/poke.php mod/subthread.php mod/tagger.php mod/thing.php
| * | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-109-74/+86
| |\| | | | | | | | | | | | | | | | | | | Conflicts: mod/mitem.php view/de/messages.po view/de/strings.php
| | * provide drop down submenu suggestions in edit modeMario Vavti2015-05-101-0/+2
| | |
| | * copy/paste typoMario Vavti2015-05-101-1/+1
| | |
| | * provide ability to create submenusMario Vavti2015-05-106-8/+18
| | |
| | * update to German stringszottel2015-05-082-5226/+5453
| | |
| * | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-075-227/+242
| |\|
| | * provide wrap variable for comanche menusMario Vavti2015-05-071-1/+5
| | |
| | * Update Dutchjeroenpraat2015-05-072-221/+232
| | |
| | * adjust icon sizeMario Vavti2015-05-072-5/+5
| | |
| * | missed one...redmatrix2015-05-061-1/+1
| | |
| * | change notification colourredmatrix2015-05-061-1/+1
| | |
| * | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-063-0/+28
| |\|
| | * allow blocks to have custom classes and add a new template called zen which ↵Mario Vavti2015-05-061-0/+10
| | | | | | | | | | | | gives you an empty page to work with
| | * Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-05-055-8101/+8002
| | |\
| | * | turn consensus items into diaspora polls for that networkredmatrix2015-05-052-0/+18
| | | |
| * | | second pass name changeredmatrix2015-05-0543-236/+236
| | | |
| * | | first pass name changeredmatrix2015-05-0522-363/+363
| | |/ | |/|
| * | Merge pull request #317 from tuscanhobbit/devPaolo T2015-05-042-4048/+3998
| |\ \ | | | | | | | | Italian translation
| | * | Italian translationPaolo Tacconi2015-05-042-4048/+3998
| | | |
| * | | fix center page content settingMario Vavti2015-05-041-1/+2
| | | |
| * | | Updating Dutchjeroenpraat2015-05-022-4052/+4002
| | |/ | |/|
* | | Merge branch 'master' into tresfriendica2015-04-298-21/+102
|\| | | | | | | | | | | | | | Conflicts: include/notifier.php
| * | fix block viewMario Vavti2015-04-291-1/+1
| | |
| * | Merge https://github.com/redmatrix/redmatrix into pending_mergefriendica2015-04-281-1/+0
| |\ \
| | * | revert some changes in justified galleryMario Vavti2015-04-281-1/+0
| | | |
| * | | version updatefriendica2015-04-281-1/+1
| |/ /
| * | Provide webpage layout descriptionMario Vavti2015-04-252-4/+12
| | |
| * | css fixesMario Vavti2015-04-242-0/+8
| | |
| * | provide block titles in blocklistMario Vavti2015-04-242-7/+11
| | |
| * | webpages layout fixesMario Vavti2015-04-243-13/+75
| | |
* | | Merge branch 'master' into tresfriendica2015-04-23160-28987/+32063
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: include/Contact.php include/ItemObject.php include/api.php include/attach.php include/diaspora.php include/dir_fns.php include/enotify.php include/event.php include/expire.php include/items.php include/notifier.php include/notify.php include/photos.php include/taxonomy.php include/text.php include/widgets.php include/zot.php mod/admin.php mod/channel.php mod/dirsearch.php mod/display.php mod/editwebpage.php mod/events.php mod/home.php mod/item.php mod/manage.php mod/mood.php mod/network.php mod/page.php mod/photos.php mod/ping.php mod/post.php mod/thing.php mod/viewsrc.php view/css/mod_events.css
| * | webpages blocks fixesMario Vavti2015-04-234-24/+95
| | |
| * | provide headings for blocks and layoutsMario Vavti2015-04-224-2/+36
| | |
| * | missing classMario Vavti2015-04-211-1/+1
| | |
| * | move .lockview to style.css and a typoMario Vavti2015-04-212-5/+5
| | |
| * | missing dropdown classMario Vavti2015-04-211-1/+1
| | |
| * | bring lockstate to webpagesMario Vavti2015-04-212-4/+7
| | |
| * | bring lockview to menu items, slightly change the way /lockview is calledMario Vavti2015-04-217-21/+20
| | |
| * | rework and hopefully improve webpage menu creation workflowMario Vavti2015-04-219-93/+138
| | |
| * | issue #162friendica2015-04-202-1/+2
| | |
| * | attach an id to menues, allow $menu_title to be empty, if no custom menu ↵Mario Vavti2015-04-192-16/+12
| | | | | | | | | | | | class is provided use default redbasic classes
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 17:39:21 +0000