| ←Prev date Next date→ Show only urls | (Click on time to select a line by its url) |
| Who | What | When |
|---|---|---|
| Tiki|bot | New Forum Posts: New Auto-toc in Tiki 15 alpha doing away with old Auto-toc formed via headers on pages? - https://tiki.org/tiki-view_forum_thread.php?forumId=4&comments_parentId=58842
New Forum Posts: FrOSCon 2016 Aug 20th/21st Germany - https://tiki.org/tiki-view_forum_thread.php?forumId=26&comments_parentId=58841 New Forum Posts: Roundtable March 2016 - https://tiki.org/tiki-view_forum_thread.php?forumId=26&comments_parentId=58834 | [00:31] |
| New Forum Posts: New Auto-toc in Tiki 15 alpha doing away with old Auto-toc formed via headers on pages? - http://tiki.org/tiki-view_forum_thread.php?forumId=4&comments_parentId=58842
New Forum Posts: FrOSCon 2016 Aug 20th/21st Germany - http://tiki.org/tiki-view_forum_thread.php?forumId=26&comments_parentId=58841 New Forum Posts: Roundtable March 2016 - http://tiki.org/tiki-view_forum_thread.php?forumId=26&comments_parentId=58834 | [00:41] | |
| .... (idle for 15mn) | ||
| jonnyb | joined #tikiwiki | [00:56] |
| .......... (idle for 49mn) | ||
| joined #tikiwiki | [01:45] | |
| fabricius | joined #tikiwiki | [01:47] |
| ...................... (idle for 1h48mn) | ||
| joined #tikiwiki | [03:35] | |
| ....... (idle for 33mn) | ||
| dond | joined #tikiwiki
Hi all... having some trouble getting to grips with Tikiwiki permissions. I am setting up a documentation site. I want the site divided into about 6 areas. Within each area I want to designate users who can see the content and users who can edit the content. A user who can edit content in area A should not be able to edit in area B. Seems simple but I can't seem to get page creation to work within each area without granting it globally. Can anyone suggest? | [04:08] |
| Tiki|bot | New Forum Posts: New Auto-toc in Tiki 15 alpha doing away with old Auto-toc formed via headers on pages? - http://suite.tiki.org/tiki-view_forum_thread.php?forumId=4&comments_parentId=58842
New Forum Posts: FrOSCon 2016 Aug 20th/21st Germany - http://suite.tiki.org/tiki-view_forum_thread.php?forumId=26&comments_parentId=58841 New Forum Posts: Roundtable March 2016 - http://suite.tiki.org/tiki-view_forum_thread.php?forumId=26&comments_parentId=58834 | [04:23] |
| New Forum Posts: New Auto-toc in Tiki 15 alpha doing away with old Auto-toc formed via headers on pages? - http://tiki.org/tiki-view_forum_thread.php?forumId=4&comments_parentId=58842
New Forum Posts: FrOSCon 2016 Aug 20th/21st Germany - http://tiki.org/tiki-view_forum_thread.php?forumId=26&comments_parentId=58841 New Forum Posts: Roundtable March 2016 - http://tiki.org/tiki-view_forum_thread.php?forumId=26&comments_parentId=58834 | [04:33] | |
| ............... (idle for 1h10mn) | ||
| New Forum Posts: New Auto-toc in Tiki 15 alpha doing away with old Auto-toc formed via headers on pages? - https://tiki.org/tiki-view_forum_thread.php?forumId=4&comments_parentId=58842
New Forum Posts: FrOSCon 2016 Aug 20th/21st Germany - https://tiki.org/tiki-view_forum_thread.php?forumId=26&comments_parentId=58841 New Forum Posts: Roundtable March 2016 - https://tiki.org/tiki-view_forum_thread.php?forumId=26&comments_parentId=58834 | [05:43] | |
| New Forum Posts: New Auto-toc in Tiki 15 alpha doing away with old Auto-toc formed via headers on pages? - http://tiki.org/tiki-view_forum_thread.php?forumId=4&comments_parentId=58842
New Forum Posts: FrOSCon 2016 Aug 20th/21st Germany - http://tiki.org/tiki-view_forum_thread.php?forumId=26&comments_parentId=58841 New Forum Posts: Roundtable March 2016 - http://tiki.org/tiki-view_forum_thread.php?forumId=26&comments_parentId=58834 | [05:53] | |
| ......... (idle for 40mn) | ||
| New Forum Posts: New Auto-toc in Tiki 15 alpha doing away with old Auto-toc formed via headers on pages? - https://tiki.org/tiki-view_forum_thread.php?forumId=4&comments_parentId=58842
New Forum Posts: FrOSCon 2016 Aug 20th/21st Germany - https://tiki.org/tiki-view_forum_thread.php?forumId=26&comments_parentId=58841 New Forum Posts: Roundtable March 2016 - https://tiki.org/tiki-view_forum_thread.php?forumId=26&comments_parentId=58834 | [06:33] | |
| New Forum Posts: New Auto-toc in Tiki 15 alpha doing away with old Auto-toc formed via headers on pages? - http://tiki.org/tiki-view_forum_thread.php?forumId=4&comments_parentId=58842
New Forum Posts: FrOSCon 2016 Aug 20th/21st Germany - http://tiki.org/tiki-view_forum_thread.php?forumId=26&comments_parentId=58841 New Forum Posts: Roundtable March 2016 - http://tiki.org/tiki-view_forum_thread.php?forumId=26&comments_parentId=58834 | [06:43] | |
| .......... (idle for 48mn) | ||
| torsten1 | joined #tikiwiki | [07:31] |
| ............ (idle for 55mn) | ||
| IRFAN_ | joined #tikiwiki
left #tikiwiki | [08:26] |
| fabricius | joined #tikiwiki
joined #tikiwiki | [08:36] |
| ....... (idle for 34mn) | ||
| Tiki|bot | New Forum Posts: bottom margin in .alert class on success popup (trunk) - http://tiki.org/tiki-view_forum_thread.php?forumId=26&comments_parentId=58843 | [09:13] |
| ...... (idle for 28mn) | ||
| fabricius | joined #tikiwiki | [09:41] |
| ....... (idle for 33mn) | ||
| Tiki|bot | New Forum Posts: bottom margin in .alert class on success popup (trunk) - https://tiki.org/tiki-view_forum_thread.php?forumId=26&comments_parentId=58843
New Forum Posts: New Auto-toc in Tiki 15 alpha doing away with old Auto-toc formed via headers on pages? - https://tiki.org/tiki-view_forum_thread.php?forumId=4&comments_parentId=58842 New Forum Posts: FrOSCon 2016 Aug 20th/21st Germany - https://tiki.org/tiki-view_forum_thread.php?forumId=26&comments_parentId=58841 | [10:14] |
| New Forum Posts: bottom margin in .alert class on success popup (trunk) - http://tiki.org/tiki-view_forum_thread.php?forumId=26&comments_parentId=58843
New Forum Posts: New Auto-toc in Tiki 15 alpha doing away with old Auto-toc formed via headers on pages? - http://tiki.org/tiki-view_forum_thread.php?forumId=4&comments_parentId=58842 New Forum Posts: FrOSCon 2016 Aug 20th/21st Germany - http://tiki.org/tiki-view_forum_thread.php?forumId=26&comments_parentId=58841 | [10:24] | |
| Jyhem | polom | [10:25] |
| ...... (idle for 29mn) | ||
| Tiki|bot | New Forum Posts: bottom margin in .alert class on success popup (trunk) - https://suite.tiki.org/tiki-view_forum_thread.php?forumId=26&comments_parentId=58843
New Forum Posts: New Auto-toc in Tiki 15 alpha doing away with old Auto-toc formed via headers on pages? - https://suite.tiki.org/tiki-view_forum_thread.php?forumId=4&comments_parentId=58842 New Forum Posts: FrOSCon 2016 Aug 20th/21st Germany - https://suite.tiki.org/tiki-view_forum_thread.php?forumId=26&comments_parentId=58841 | [10:54] |
| New Forum Posts: bottom margin in .alert class on success popup (trunk) - http://tiki.org/tiki-view_forum_thread.php?forumId=26&comments_parentId=58843
New Forum Posts: New Auto-toc in Tiki 15 alpha doing away with old Auto-toc formed via headers on pages? - http://tiki.org/tiki-view_forum_thread.php?forumId=4&comments_parentId=58842 New Forum Posts: FrOSCon 2016 Aug 20th/21st Germany - http://tiki.org/tiki-view_forum_thread.php?forumId=26&comments_parentId=58841 | [11:04] | |
| chibaguy | joined #tikiwiki | [11:08] |
| Tiki-KGB | 03yonixxx r57911 10trunk/templates/mail/invite_tempuser.tpl * [UI] Removing punctuation to avoid troubles if user use copy/paste | [11:20] |
| Bsfez | joined #tikiwiki
polom | [11:20] |
| torsten_ | joined #tikiwiki
polom | [11:21] |
| Bsfez | Hi torsten | [11:21] |
| torsten_ | how r u Bernard | [11:22] |
| Bsfez | Great thanks | [11:22] |
| torsten_ | I trx webchat on phone . Seems minor efficient to use. very small font and everything.
will go up and sit on laptop ( rather) /s/trx/try | [11:23] |
| Bsfez | :) | [11:26] |
| jonnyb | joined #tikiwiki | [11:28] |
| Tiki|bot | New Forum Posts: Enabling plugin and cache - http://tiki.org/tiki-view_forum_thread.php?forumId=26&comments_parentId=58845 | [11:35] |
| ....... (idle for 33mn) | ||
| Tiki-KGB | 03yonixxx r57912 10trunk/lib/wiki-plugins/wikiplugin_exercise.php * [UI] Improving description ans adding missing information on the plugin help. | [12:08] |
| ..... (idle for 24mn) | ||
| 03chibaguy r57913 10branches/ 10(101 files in 63 dirs)
[FIX] Improve interface strings including fixing typos and grammatical errors and using more natural expressions. | [12:32] | |
| Tiki|bot | New Forum Posts: Enabling plugin and cache - https://tiki.org/tiki-view_forum_thread.php?forumId=26&comments_parentId=58845
New Forum Posts: bottom margin in .alert class on success popup (trunk) - https://tiki.org/tiki-view_forum_thread.php?forumId=26&comments_parentId=58843 New Forum Posts: New Auto-toc in Tiki 15 alpha doing away with old Auto-toc formed via headers on pages? - https://tiki.org/tiki-view_forum_thread.php?forumId=4&comments_parentId=58842 | [12:35] |
| fabricius | joined #tikiwiki | [12:39] |
| Mobileguy | joined #tikiwiki
hello. This is chibaguy via iPhone. just checking out the irc client. | [12:42] |
| Tiki|bot | New Forum Posts: Enabling plugin and cache - http://tiki.org/tiki-view_forum_thread.php?forumId=26&comments_parentId=58845
New Forum Posts: bottom margin in .alert class on success popup (trunk) - http://tiki.org/tiki-view_forum_thread.php?forumId=26&comments_parentId=58843 New Forum Posts: New Auto-toc in Tiki 15 alpha doing away with old Auto-toc formed via headers on pages? - http://tiki.org/tiki-view_forum_thread.php?forumId=4&comments_parentId=58842 | [12:45] |
| .... (idle for 19mn) | ||
| fabricius | hello chibaguy | [13:04] |
| chibaguy | hi fabricius | [13:05] |
| fabricius | how is mobile client? | [13:05] |
| chibaguy | It was fine. No problems.
It's called Mango Lite, on iOS. Free but not open source, I think. | [13:05] |
| ....... (idle for 34mn) | ||
| jonnyb | pompompolom | [13:40] |
| Tiki-KGB | 03jonnybradley r57914 10(155 files in 73 dirs) * [MRG] Automatic merge, branches/15.x 57906 to 57913 | [13:42] |
| chibaguy | Hi jonnyb | [13:45] |
| jonnyb | hi chibaguy | [13:45] |
| amette_ | joined #tikiwiki | [13:57] |
| .... (idle for 16mn) | ||
| fabricius | joined #tikiwiki | [14:13] |
| jonnyb | polom fabricius | [14:25] |
| Tiki-KGB | 03jonnybradley r57915 10branches/15.x/admin/include_textarea.php
[FIX] plugins: Plugins are no long cached according to textarea (if they ever were?) so clear the cache for each language with the same key as they were cached with in WikiLib::list_plugins (thanks BSfez) 03jonnybradley r57916 10branches/15.x/templates/mail/user_watch_comment.tpl * [FIX] notifs: Use sefurl for comment notifications 03jonnybradley r57917 10branches/15.x/lib/tiki-js.js [FIX] plugin edit: Some minor bootstrappification to the plugin edit form, looks a bit nicer now, but is still in a jquery-ui dialog | [14:26] |
| amette_ | left #tikiwiki
joined #tikiwiki | [14:33] |
| Tiki-KGB | 03jonnybradley r57918 10(5 files in 5 dirs) * [MRG] Automatic merge, branches/15.x 57913 to 57917 | [14:34] |
| .......... (idle for 49mn) | ||
| fabricius | polom jonnyb
oh left | [15:23] |
| Tiki|bot | New Forum Posts: Enabling plugin and cache - http://suite.tiki.org/tiki-view_forum_thread.php?forumId=26&comments_parentId=58845
New Forum Posts: bottom margin in .alert class on success popup (trunk) - http://suite.tiki.org/tiki-view_forum_thread.php?forumId=26&comments_parentId=58843 New Forum Posts: New Auto-toc in Tiki 15 alpha doing away with old Auto-toc formed via headers on pages? - http://suite.tiki.org/tiki-view_forum_thread.php?forumId=4&comments_parentId=58842 | [15:25] |
| New Forum Posts: problem with register / autoassign own group - https://tiki.org/tiki-view_forum_thread.php?forumId=26&comments_parentId=58848
New Forum Posts: Enabling plugin and cache - https://tiki.org/tiki-view_forum_thread.php?forumId=26&comments_parentId=58845 New Forum Posts: bottom margin in .alert class on success popup (trunk) - https://tiki.org/tiki-view_forum_thread.php?forumId=26&comments_parentId=58843 | [15:35] | |
| New Forum Posts: problem with register / autoassign own group - http://tiki.org/tiki-view_forum_thread.php?forumId=26&comments_parentId=58848
New Forum Posts: Enabling plugin and cache - http://tiki.org/tiki-view_forum_thread.php?forumId=26&comments_parentId=58845 New Forum Posts: bottom margin in .alert class on success popup (trunk) - http://tiki.org/tiki-view_forum_thread.php?forumId=26&comments_parentId=58843 | [15:45] | |
| Bsfez | joined #tikiwiki | [15:47] |
| Tiki-KGB | 03chibaguy r57919 10branches/15.x/templates/tiki-upload_file_progress.tpl * [FIX] Replace table-for-layout with Bootstrap media classes.
03chibaguy r57920 10branches/ 10(70 files in 55 dirs) [FIX] Improve interface strings including fixing typos and grammatical errors and using more natural expressions. | [15:50] |
| 03chibaguy r57921 10branches/15.x/themes/ 10base_files/less/tiki-miscellaneous_global.less 10base_files/css/tiki_base.css
[FIX] Left-align link text in dropdown-menu items ("More") (override align-center of .btn class). | [16:02] | |
| .... (idle for 18mn) | ||
| 03yonixxx r57922 10branches/ 1015.x/templates/mail/invite_tempuser.tpl 1015.x 1015.x/templates * [BP/r57911] [UI] Removing punctuation to avoid troubles if user use copy/paste | [16:20] | |
| 03yonixxx r57923 10branches/ 1015.x 1015.x/lib/wiki-plugins/wikiplugin_exercise.php
[BP/r57912] Improving description ans adding missing information on the plugin help. | [16:26] | |
| Tiki|bot | New Forum Posts: problem with register / autoassign own group - https://suite.tiki.org/tiki-view_forum_thread.php?forumId=26&comments_parentId=58848
New Forum Posts: Enabling plugin and cache - https://suite.tiki.org/tiki-view_forum_thread.php?forumId=26&comments_parentId=58845 New Forum Posts: bottom margin in .alert class on success popup (trunk) - https://suite.tiki.org/tiki-view_forum_thread.php?forumId=26&comments_parentId=58843 | [16:35] |
| Tiki-KGB | 03yonixxx r57924 10branches/15.x/templates/mail/invite_tempuser.tpl * [FIX] Improving translation. | [16:40] |
| Tiki|bot | New Forum Posts: problem with register / autoassign own group - http://tiki.org/tiki-view_forum_thread.php?forumId=26&comments_parentId=58848
New Forum Posts: Enabling plugin and cache - http://tiki.org/tiki-view_forum_thread.php?forumId=26&comments_parentId=58845 New Forum Posts: bottom margin in .alert class on success popup (trunk) - http://tiki.org/tiki-view_forum_thread.php?forumId=26&comments_parentId=58843 | [16:45] |
| Bsfez | joined #tikiwiki | [16:54] |
| ..... (idle for 24mn) | ||
| Tiki-KGB | 03yonixxx r57925 10(76 files in 61 dirs) * [MRG] Automatic merge, branches/15.x 57917 to 57924 | [17:18] |
| ....... (idle for 32mn) | ||
| 03jonnybradley r57926 10branches/ 1015.x/lib/wiki-plugins/wikiplugin_annotation.php 1015.x/themes/base_files/css/tiki_base.css 1015.x/themes/base_files/less/tiki-bootstrap_overrides.less 1015.x/lib/jquery_tiki/wikiplugin-annotation.js
[FIX] annotation: Allow links to not show (by default), centre text vertically in the popover (by removing the bottom margin from all popover paragraphs), and add a short delay to popover hide so you can get to the popover to click the link (if showing) Thanks BSfez and marclaporte 03jonnybradley r57927 10(5 files in 5 dirs) * [MRG] Automatic merge, branches/15.x 57924 to 57926 | [17:50] | |
| .... (idle for 16mn) | ||
| 03jonnybradley r57928 10branches/15.x/templates/tiki-calendar.tpl
[FIX] full-calendar: Bootstrap modal was still appearing behind the backdrop sometimes despite r57821 (i only fixed event edit, not add new...) Thanks taylordustin, hopefully addresses wish5858? | [18:06] | |
| jonnyb | joined #tikiwiki
repolom (oops, fell out) Jyhem: having a look at https://dev.tiki.org/item5857 :) | [18:14] |
| Jyhem | jonnyb: thanks a lot!
I can't believe nobody raised this issue in 2 years! | [18:28] |
| jonnyb | think i found the problem | [18:38] |
| Tiki-KGB | 03jonnybradley r57929 10branches/15.x/lib/wiki-plugins/wikiplugin_tracker.php
[FIX] registration: Fix confusion over user_register_prettytracker_tpl pref overriding the tpl parameter, and test that pref for whether it's a wiki page of a .tpl file. Hope it resolves 5857, thanks Jyhem | [18:42] |
| jonnyb | Jyhem: i did svn up on http://jyhem-9952-5857.show.tikiwiki.org/tiki-register.php and it looks ok now (i think)
did i do it right? | [18:42] |
| Jyhem_laptop | jonnyb: TESTING !!!!! :-D | [18:56] |
| Tiki-KGB | 03jonnybradley r57930 10branches/15.x/lang/he/language.js * [FIX] lang: Missing comma in he/js | [18:58] |
| Jyhem_laptop | btw, is the roundtable in 1,2 or 3 hours? | [18:59] |
| jonnyb | next week i thought, no? | [18:59] |
| Jyhem_laptop | I don't mind but I thought tonight
let me look | [19:00] |
| jonnyb | tehre was emails about it on the list and most people said next week was good
https://tiki.org/Roundtable+Meeting+2016+03 i won't be around though as travelling for easter | [19:00] |
| Jyhem_laptop | You are correct: next week
I intend to suggest we volunteer for testing the new html5 version of BBB, if they want to upgrade it in exchange for constructive criticism :-D | [19:04] |
| jonnyb | +1 for that :)
i just ran php get_strings.php and it seems to ahve fixed a load of stuff, like duplicated indexes etc, i think i should commit... sound ok? i'll do a mail to devs to get people to check their translations, it's all too much to review properly but i think it needs doing (more regularly) | [19:07] |
| Jyhem_laptop | Yes, it needs doing before a release
and more, but at least now | [19:08] |
| jonnyb | i thought i was part of the release script? but it looks like it hasn't been done for ages | [19:09] |
| Tiki-KGB | 03jonnybradley r57931 10branches/ 10(52 files in 52 dirs) * [FIX] lang: Ran get_strings.php - translators please check all is ok, thanks | [19:10] |
| Jyhem_laptop | doing it early actually gives people a chance to translate | [19:11] |
| jonnyb | that's what i thought | [19:13] |
| Tiki-KGB | 03jonnybradley r57932 10branches/15.x/lang/de/language.js * [FIX] lang: Duplicated translation in de/js (hope i kept the right one?) | [19:14] |
| jonnyb | i've also been running code inspections on them and picked up some errors | [19:14] |
| xavi | joined #tikiwiki
long time no poloms.... | [19:18] |
| jonnyb | polom xavi
:D | [19:19] |
| xavi | hi jonny
trying the web irc client from the bus (smartphone) | [19:19] |
| jonnyb | good timing - i've been meddling with the lang files (and don't really know what i'm doing ;) ) | [19:20] |
| xavi | he he you brave man! :-)
hopefully since next week I'll be for a few months (at least) more available in the tikiverse... | [19:20] |
| Jyhem_laptop | hi xavi, nice to hear from you :) | [19:22] |
| xavi | xavi looking forward to it | [19:22] |
| jonnyb | jonnyb is very pleased to hear that | [19:22] |
| xavi | hi jean marc | [19:22] |
| Telesight | joined #tikiwiki | [19:22] |
| xavi | btw, today i experienced connexting to the bbb instance of tiki.org through smartphone... using the flash client, and having everything working! (including mic and speakers)!!!
using android | [19:23] |
| Tiki-KGB | 03jonnybradley r57933 10branches/15.x/lib/core/Search/MySql/QueryBuilder.php
[FIX] lang: Don't try and translate the contents of the get_class function, use a tr param | [19:24] |
| xavi | and the truck is to use a browser called "puffin" (impressive)
s/truck/trick | [19:24] |
| jonnyb | coolio! | [19:25] |
| xavi | jonnyb, this puffin browser is known to work on ios devices also | [19:25] |
| Tiki-KGB | 03jonnybradley r57934 10branches/ 10(52 files in 52 dirs) * [FIX] lang: get_strings again following get_class fix r57933 | [19:26] |
| xavi | so you'll be able to hear also while in the road and such, etc, just from your phone | [19:26] |
| jonnyb | thanks, i hadn't heard of that one | [19:27] |
| Jyhem_laptop | hahaha, there goes jonny's excuse for next week :-D | [19:27] |
| xavi | or even to talk in the meeting (but driving and touching a phone is a dangerous activity of course) | [19:27] |
| jonnyb | ha ha | [19:27] |
| xavi | :-) | [19:27] |
| Jyhem_laptop | BTW, jonnyb: congratulations on the fix for 5857. Testing is successful | [19:28] |
| jonnyb | super, glad to be able to help :)
and guess what... | [19:29] |
| xavi | btw also, today i moved a tiki 12/site to a new server that seemed to have only mariadb installable instead of mysql, and i did hit a weird error that was new, compared to using mydql | [19:29] |
| Jyhem_laptop | registered, got email, followed link, got validated, logged out, could log in again. extra tracker items stored. All good
thanks a lot | [19:29] |
| jonnyb | i had a look at the page about doing the copyright date updating and got rather lost - all too advanced shell stuff for me, any chance you could work your magic sometime?
;) | [19:30] |
| Jyhem_laptop | Jyhem_laptop going to push his luck with registration with login=email now :-D
sure, just remind me the page url xavi: what new mariadb error? Jyhem_laptop looks at servers and mysql versions | [19:30] |
| jonnyb | https://dev.tiki.org/Source+Code+Copyright+Change+Info
i can do the search & replace bits obviously but it's the clever commit in chunks part i don't get | [19:34] |
| xavi | jyhem: PHP Fatal error: Call to a member function getElementsByTagName() on a non-object in /var/www/html/lib/bigbluebuttonlib.php on line 432
re puffin: http://www.puffinbrowser.com | [19:35] |
| Jyhem | xavi: I see no relation to the database
It seems to get data from httprequest, not from any database | [19:41] |
| xavi | ah, ok, then it might be related.to the fact that the corresponding bbb server is not fully upgraded yet (well, the recordings not processed yet)
ok, thks for feedback. i gotta go. see you soon :-) | [19:43] |
| Jyhem | xavi: that's more likely
jonnyb: the copyright thing. In trunk or 15.x? trunk is the obvious choice, but since we have the semi-auto commit and we want it in 15.x... I guess 15.x | [19:44] |
| jonnyb | we can't release 15 until it's done really, so yes, in 15.x please
i'll do the merge :) | [19:47] |
| Tiki-KGB | 03jonnybradley r57935 10(59 files in 57 dirs) * [MRG] Automatic merge, branches/15.x 57926 to 57934 | [19:48] |
| .... (idle for 16mn) | ||
| 03patrick-proulx r57936 10branches/15.x/lib/ 10comments/commentslib.php 10core/Search/Elastic/Connection.php * [FIX] Minor fixes to avoid warnings | [20:04] | |
| Jyhem | How come we have our copiryght on files in vendors_extra??? | [20:12] |
| jonnyb | ha, that's not right
which ones? | [20:13] |
| Jyhem | M vendor_extra/index.php
M vendor_extra/pear/Auth/Container/index.php M vendor_extra/pear/Auth/Frontend/index.php M vendor_extra/pear/Auth/OpenID/index.php M vendor_extra/pear/Auth/Yadis/index.php M vendor_extra/pear/Auth/index.php M vendor_extra/pear/DB/index.php M vendor_extra/pear/Minify/CSS/index.php M vendor_extra/pear/Minify/index.php M vendor_extra/pear/Net/DNS/RR/index.php M vendor_extra/pear/Net/DNS/index.php M vendor_extra/pear/Net/LDAP2/index.php M vendor_extra/pear/Net/index.php M vendor_extra/pear/OS/index.php M vendor_extra/pear/PEAR/ChannelFile/index.php M vendor_extra/pear/PEAR/Command/index.php M vendor_extra/pear/PEAR/Downloader/index.php M vendor_extra/pear/PEAR/Frontend/index.php M vendor_extra/pear/PEAR/Installer/Role/index.php M vendor_extra/pear/PEAR/Installer/index.php M vendor_extra/pear/PEAR/PackageFile/Generator/index.php M vendor_extra/pear/PEAR/PackageFile/Parser/index.php M vendor_extra/pear/PEAR/PackageFile/index.php M vendor_extra/pear/PEAR/PackageFile/v2/index.php M vendor_extra/pear/PEAR/REST/index.php M vendor_extra/pear/PEAR/Task/Postinstallscript/index.php M vendor_extra/pear/PEAR/Task/Replace/index.php M vendor_extra/pear/PEAR/Task/Unixeol/index.php M vendor_extra/pear/PEAR/Task/Windowseol/index.php M vendor_extra/pear/PEAR/Task/index.php M vendor_extra/pear/PEAR/Validator/index.php M vendor_extra/pear/PEAR/index.php | [20:13] |
| jonnyb | well vendor_extra/index.php is ours :) | [20:14] |
| Jyhem | M vendor_extra/pear/XML/index.php
M vendor_extra/pear/XML_Parser/Parser/index.php M vendor_extra/pear/XML_Parser/examples/index.php M vendor_extra/pear/XML_Parser/index.php M vendor_extra/pear/XML_Parser/tests/index.php M vendor_extra/pear/index.php definitely not right | [20:14] |
| jonnyb | nope, PEAR stuff is PEAR's
but i guess it was from before we had vendors and vendors_extra ah, they're all index.php files? i guess they are tiki ones then | [20:14] |
| Jyhem | Well, I'll refrain from changing the copyrights on these for now and get the rest done | [20:16] |
| jonnyb | well if they're in there they should be correct, no?
for some reason we add them all over the place for people that have their web servers set up wrong :( | [20:16] |
| Jyhem | You are right. It's all about index.php files we put there for security
Jyhem relieved | [20:17] |
| Tiki-KGB | 03jyhem r57937 10branches/ 10(200 files in 42 dirs) * Copyright bumped to 2016 Happy new year
03jyhem r57938 10branches/ 10(200 files) * Copyright bumped to 2016 Happy new year (again) 03jyhem r57939 10branches/ 10(200 files in 178 dirs) * Copyright bumped to 2016 Happy new year (again) 03jyhem r57940 10branches/ 10(200 files in 193 dirs) * Copyright bumped to 2016 Happy new year (again) | [20:22] |
| Jyhem | I expect a bit less than 20 commits :)
(look, no hands) | [20:24] |
| Tiki-KGB | 03jyhem r57941 10branches/ 10(200 files in 64 dirs) * Copyright bumped to 2016 Happy new year (again)
03jyhem r57942 10branches/ 10(200 files in 9 dirs) * Copyright bumped to 2016 Happy new year (again) | [20:26] |
| jonnyb | thanks Jyhem | [20:26] |
| Tiki-KGB | 03jyhem r57943 10branches/ 10(200 files in 28 dirs) * Copyright bumped to 2016 Happy new year (again)
03jyhem r57944 10branches/15.x/lib/test/ 10(200 files in 48 dirs) * Copyright bumped to 2016 Happy new year (again) 03jyhem r57945 10branches/ 10(200 files in 30 dirs) * Copyright bumped to 2016 Happy new year (again) 03jyhem r57946 10branches/ 10(200 files in 36 dirs) * Copyright bumped to 2016 Happy new year (again) 03jyhem r57947 10branches/ 10(200 files in 26 dirs) * Copyright bumped to 2016 Happy new year (again) 03jyhem r57948 10branches/ 10(200 files in 68 dirs) * Copyright bumped to 2016 Happy new year (again) 03jyhem r57949 10branches/ 10(200 files in 30 dirs) * Copyright bumped to 2016 Happy new year (again) 03jyhem r57950 10branches/ 10(200 files in 32 dirs) * Copyright bumped to 2016 Happy new year (again) | [20:28] |
| Jyhem | you are welcome. I feel the template fix was harder than that. It's just the computer doing the work by itself :) | [20:32] |
| jonnyb | that's what they're for :) | [20:33] |
| Tiki-KGB | 03jyhem r57951 10branches/ 10(200 files in 54 dirs) * Copyright bumped to 2016 Happy new year (again)
03jyhem r57952 10branches/ 10(200 files in 33 dirs) * Copyright bumped to 2016 Happy new year (again) 03jyhem r57953 10branches/ 10(200 files in 82 dirs) * Copyright bumped to 2016 Happy new year (again) 03jyhem r57954 10branches/ 10(200 files in 59 dirs) * Copyright bumped to 2016 Happy new year (again) 03jyhem r57955 10branches/ 10(68 files in 6 dirs) * Copyright bumped to 2016 Happy new year (again) | [20:34] |
| jonnyb | is that all of them Jyhem?
i'll do a merge if so (then finish for today) hmmm, actually i expect the merge commit will fail won't it :( guess i'll have to use the same for command after all... | [20:39] |
| Jyhem | Yes, that's it
don't do 1000 loops. 20 were plenty enough | [20:45] |
| jonnyb | will do
am copying the command off the wiki page (and adding a note about it) | [20:47] |
| Jyhem | I fixed the command in the page. 1000 → 20 and "commit" was missing from the svn command | [20:48] |
| jonnyb | super, thanks
it's still merging... (and i'm hungry) | [20:48] |
| ok, here they come (hopefully)
yup, looks good - off for food now | [20:58] | |
| Tiki-KGB | 03jonnybradley r57956 10trunk/ 10(200 files in 42 dirs) * [MRG] Automatic merge, branches/15.x 57934 to 57955 (batch commit)
03jonnybradley r57957 10trunk/ 10(200 files) * [MRG] Automatic merge, branches/15.x 57934 to 57955 (batch commit) 03jonnybradley r57958 10trunk/ 10(200 files in 178 dirs) * [MRG] Automatic merge, branches/15.x 57934 to 57955 (batch commit) 03jonnybradley r57959 10trunk/ 10(200 files in 193 dirs) * [MRG] Automatic merge, branches/15.x 57934 to 57955 (batch commit) 03jonnybradley r57960 10trunk/ 10(200 files in 64 dirs) * [MRG] Automatic merge, branches/15.x 57934 to 57955 (batch commit) 03jonnybradley r57961 10trunk/ 10(200 files in 9 dirs) * [MRG] Automatic merge, branches/15.x 57934 to 57955 (batch commit) 03jonnybradley r57962 10trunk/lib/ 10(200 files in 28 dirs) * [MRG] Automatic merge, branches/15.x 57934 to 57955 (batch commit) 03jonnybradley r57963 10trunk/lib/ 10(200 files in 48 dirs) * [MRG] Automatic merge, branches/15.x 57934 to 57955 (batch commit) 03jonnybradley r57964 10trunk/lib/ 10(200 files in 30 dirs) * [MRG] Automatic merge, branches/15.x 57934 to 57955 (batch commit) 03jonnybradley r57965 10trunk/lib/ 10(200 files in 36 dirs) * [MRG] Automatic merge, branches/15.x 57934 to 57955 (batch commit) 03jonnybradley r57966 10trunk/lib/ 10(200 files in 26 dirs) * [MRG] Automatic merge, branches/15.x 57934 to 57955 (batch commit) 03jonnybradley r57967 10trunk/lib/ 10(200 files in 68 dirs) * [MRG] Automatic merge, branches/15.x 57934 to 57955 (batch commit) 03jonnybradley r57968 10trunk/lib/core/ 10(200 files in 30 dirs) * [MRG] Automatic merge, branches/15.x 57934 to 57955 (batch commit) 03jonnybradley r57969 10trunk/lib/core/ 10(200 files in 32 dirs) * [MRG] Automatic merge, branches/15.x 57934 to 57955 (batch commit) 03jonnybradley r57970 10trunk/lib/core/ 10(200 files in 54 dirs) * [MRG] Automatic merge, branches/15.x 57934 to 57955 (batch commit) 03jonnybradley r57971 10trunk/lib/core/ 10(200 files in 33 dirs) * [MRG] Automatic merge, branches/15.x 57934 to 57955 (batch commit) 03jonnybradley r57972 10trunk/ 10(200 files in 82 dirs) * [MRG] Automatic merge, branches/15.x 57934 to 57955 (batch commit) 03jonnybradley r57973 10trunk/ 10(200 files in 59 dirs) * [MRG] Automatic merge, branches/15.x 57934 to 57955 (batch commit) 03jonnybradley r57974 10trunk/ 10(68 files in 6 dirs) * [MRG] Automatic merge, branches/15.x 57934 to 57955 (batch commit) | [21:00] |
| Tiki|bot | joined #tikiwiki
New Forum Posts: Truncation - http://tiki.org/tiki-view_forum_thread.php?forumId=26&comments_parentId=58850 | [21:15] |
| torsten1 | joined #tikiwiki | [21:24] |
| ..... (idle for 24mn) | ||
| Tiki-KGB | 03jonnybradley r57975 10trunk/templates 10trunk * [MRG] Automatic merge, branches/15.x 57934 to 57955 | [21:48] |
| amette_ | left #tikiwiki
joined #tikiwiki | [21:50] |
| ................ (idle for 1h16mn) | ||
| left #tikiwiki
joined #tikiwiki | [23:06] | |
| ←Prev date Next date→ Show only urls | (Click on time to select a line by its url) |