aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | | * | | | | fixed apps csstommy tomson2012-03-032-1/+8
| | | | | | | |
| | * | | | | | Merge pull request #67 from tomtom84/mastertomtom842012-03-037-10/+17
| | |\| | | | | | | | | | | | | | | | | | | | | fixes in diabook theme
| | | * | | | | fixed star/unstartommy tomson2012-03-037-10/+17
| | | | | | | |
| | * | | | | | Merge pull request #66 from tomtom84/mastertomtom842012-03-0311-2/+2
| | |\| | | | | | | | |_|_|/ / | | |/| | | | fixed editor and admin-sec in theme diabook
| | | * | | | fixed admintommy tomson2012-03-0311-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | fixed editor
| | * | | | | Merge pull request #65 from tomtom84/mastertomtom842012-03-032-14/+34
| | |\| | | | | | | |_|/ / | | |/| | | fix editor in theme diabook
| | | * | | fix editortommy tomson2012-03-032-14/+34
| | | | | |
| | * | | | Merge pull request #64 from tomtom84/mastertomtom842012-03-0310-7/+204
| | |\| | | | | | | | | | | | | | | fix editor in theme diabook
| | | * | | fix text-editor in themetommy tomson2012-03-0310-7/+204
| | | | | |
| | * | | | german strings as of 28th Feb from transilexTobias Diekershoff2012-03-032-142/+142
| | | | | |
| | * | | | Merge pull request #63 from tomtom84/mastertomtom842012-03-023-1/+5
| | |\| | | | | | | | | | | | | | | fixes in diabook theme
| | | * | | small fix in style.csstommy tomson2012-03-031-1/+5
| | | | | |
| | | * | | fix star/unstartommy tomson2012-03-032-0/+0
| | | | | |
| | * | | | Merge pull request #62 from tomtom84/masterfriendica2012-03-025-34/+51
| | |\| | | | | | | | | | | | | | | fixes in diabook theme
| | | * | | fixes in wall_item.tpl and style.css in theme diabooktommy tomson2012-03-033-8/+12
| | | | | |
| | | * | | fix in wall_item.tpltommy tomson2012-03-033-10/+13
| | | | | | | | | | | | | | | | | | | | | | | | new icon link.png
| | | * | | fixed broken tags and notifications in themetommy tomson2012-03-033-16/+26
| | | | | |
| * | | | | revupfriendica2012-03-041-1/+1
| |/ / / /
| * | / / add diabook to default themesfriendica2012-03-022-2/+2
| | |/ / | |/| |
| * | | Merge pull request #61 from fabrixxm/masterSimon2012-03-022-2/+11
| |\ \ \ | | | | | | | | | | fix to variable rexexp and mentions autocomplete in comments
| | * | | fix @mention autocomplete in commentsFabio Comuni2012-03-031-1/+1
| | | | |
| | * | | Merge remote-tracking branch 'friendica/master'Fabio Comuni2012-03-0333-127/+2470
| | |\ \ \ | | |/ / / | |/| | |
| * | | | Merge pull request #60 from simonlnu/masterSimon2012-03-026-123/+135
| |\ \ \ \ | | | | | | | | | | | | apply changes to templates to testbubble
| | * | | | apply changes to templates to testbubbleSimon L'nu2012-03-026-123/+135
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| | * | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-020-0/+0
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: deleted readme.txt from folder diabook github finally working adjust3 adjust2 adjust * master:
| * | | | Merge pull request #58 from simonlnu/masterSimon2012-03-025-4/+4
| |\ \ \ \ | | | | | | | | | | | | fix for comment-wwedit-wrapper; CSS class in tpl had a stray $
| | * | | | fix for comment-wwedit-wrapper CSS class in tpl had a stray $Simon L'nu2012-03-025-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| | * | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-0213-69/+50
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: template proc: allow isolation of var name between [ and ] group: fix create new group form templates: fix tags template proc: remove unused function and commented out code template proc: first optimization * master:
| | * \ \ \ \ Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-021-0/+12
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: expand multiple heart smilies e.g. <3333 * master:
| | * \ \ \ \ \ Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-0236-640/+952
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: item table update for file feature probe for very old (0.97 or 1.0) RSS feed with an incorrect or generic content-type diabook commit conversation: remove templating items in code and move it to template. Enabled automated doc building. Changes: -build.xml, phing build file -@package tags at acl_selector.php and db_update.php -added documentation and some IDE files to .gitignore -automated tool to find files that corrupt the doc build process -removed ansi characters from SSH1.php, docBlox could not handle them template proc: avoid a notice and allow template name to include to be passed with a variable value show relation in contact_template admin: fix small string fix visualization in groupeditor less html in mod/group.php, template for group members editor, quattro theme for group edit. * master:
| | * \ \ \ \ \ \ Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-02-298-35/+115
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: yet more work on notifications notification enhancements better handling of multiple notifications for same item, and old notifications * master:
| | * \ \ \ \ \ \ \ Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-02-298-10/+24
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: Update LICENSE Update README cleaned up mess created when both people request friendship and one approves as duplex call time pass by reference deprecated From Tobias H - catch some irregularities caused by cut/paste code * master:
| | * \ \ \ \ \ \ \ \ Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-02-281-1/+2
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: fix url and network display * master:
| | * \ \ \ \ \ \ \ \ \ Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-02-286-55/+14
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: update globaldir when page-type changes, add spam date field clicking contact on contacts page broken link * master:
| | * \ \ \ \ \ \ \ \ \ \ Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-02-272-9/+18
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: cleanup notify subject lines * master:
| | * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-02-273-7/+9
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: revert 01a2791e3a to avoid random preg internal errors. fix contact_template * master:
| | * | | | | | | | | | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-02-270-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: fixed syntax errors add plugin hooks to enotify * master:
| * | | | | | | | | | | | | | Merge pull request #59 from tomtom84/masterSimon2012-03-0223-0/+2331
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | / / | | | |_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | diabook theme
| | * | | | | | | | | | | | deleted readme.txt from folder diabooktommy tomson2012-03-021-0/+0
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | github finally workingtommy tomson2012-03-021-2/+0
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | adjust3tommy tomson2012-03-021-0/+1
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | Merge remote-tracking branch 'tomtom84_friendica/master' into master-2tommy tomson2012-03-021-0/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | adjusttommy tomson2012-03-0224-0/+2332
| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | adjust2tommy tomson2012-03-0223-0/+2331
| | |/ / / / / / / / / / / /
| * | | | | | | | | | | | | Merge pull request #57 from fabrixxm/masterSimon2012-03-0213-69/+50
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | / | | | |_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | template processor optimizations
| | | | | | | | | | | | * template proc: fix variables regexpFabio Comuni2012-03-031-1/+10
| | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | |
| | * | | | | | | | | | template proc: allow isolation of var name between [ and ]Fabio Comuni2012-03-021-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | $var.name -> $[var.name]
| | * | | | | | | | | | group: fix create new group formFabio Comuni2012-03-021-0/+1
| | | | | | | | | | | |
| | * | | | | | | | | | templates: fix tagsFabio Comuni2012-03-0210-20/+22
| | | | | | | | | | | |
| | * | | | | | | | | | template proc: remove unused function and commented out codeFabio Comuni2012-03-021-44/+1
| | | | | | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-31 04:50:37 +0000