MrPetovan/friendica
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
4091 commits 3 branches 0 tags 96 MiB
Commit graph

4091 commits

This branch
This branch
All branches
Author SHA1 Message Date
Simon L'nu 2b9ea33e8b Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:
  fix editor

* master:
 2012-03-03 09:45:32 -05:00
tomtom84 792031c36e Merge pull request #65 from tomtom84/master 
fix editor in theme diabook
 2012-03-03 06:03:34 -08:00
tommy tomson b3ba2eb4d0 fix editor 2012-03-03 15:01:25 +01:00
Simon L'nu ba28404470 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:
  fix text-editor in theme
  german strings as of 28th Feb from transilex
  small fix in style.css
  fix star/unstar
  fixes in wall_item.tpl and style.css in theme diabook
  fix in wall_item.tpl new icon link.png
  add diabook to default themes
  fixed broken tags and notifications in theme

* master:
 2012-03-03 08:05:53 -05:00
tomtom84 8ffe15fbb1 Merge pull request #64 from tomtom84/master 
fix editor in theme diabook
 2012-03-03 04:30:31 -08:00
tommy tomson 60adef2463 fix text-editor in theme 2012-03-03 13:27:39 +01:00
Tobias Diekershoff 9d885c4801 german strings as of 28th Feb from transilex 2012-03-03 12:17:32 +01:00
tomtom84 b4361e37e0 Merge pull request #63 from tomtom84/master 
fixes in diabook theme
 2012-03-02 21:02:55 -08:00
tommy tomson 83c25b4386 small fix in style.css 2012-03-03 06:00:46 +01:00
tommy tomson 89f667ff76 fix star/unstar 2012-03-03 04:45:34 +01:00
friendica 2ae82ae3c2 Merge pull request #62 from tomtom84/master 
fixes in diabook theme
 2012-03-02 19:32:34 -08:00
tommy tomson d138d07c05 fixes in wall_item.tpl and style.css in theme diabook 2012-03-03 04:27:06 +01:00
tommy tomson 8f72d95b0e fix in wall_item.tpl 
new icon link.png
 2012-03-03 01:52:53 +01:00
friendica a66648356f add diabook to default themes 2012-03-02 16:24:26 -08:00
Simon L'nu 7ef861907e minor formatting issues 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-03-02 19:09:17 -05:00
Simon L'nu 705b4a00ce Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:
  fix @mention autocomplete in comments
  template proc: fix variables regexp

* master:
 2012-03-02 19:05:41 -05:00
Simon d32edf83d3 Merge pull request #61 from fabrixxm/master 
fix to variable rexexp and mentions autocomplete in comments
 2012-03-02 16:02:02 -08:00
tommy tomson d3f83c9375 fixed broken tags and notifications in theme 2012-03-03 00:41:02 +01:00
Fabio Comuni 3339428987 fix @mention autocomplete in comments 2012-03-03 00:12:45 +01:00
Fabio Comuni ae79de3039 Merge remote-tracking branch 'friendica/master' 2012-03-03 00:06:44 +01:00
Fabio Comuni 685686b3e8 template proc: fix variables regexp 2012-03-03 00:00:38 +01:00
Simon f1efa0991a Merge pull request #60 from simonlnu/master 
apply changes to templates to testbubble
 2012-03-02 11:01:21 -08:00
Simon L'nu 81de5f7802 apply changes to templates to testbubble 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-03-02 13:59:28 -05:00
Simon L'nu 02f8e95b1a Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:
  deleted readme.txt from folder diabook
  github finally working
  adjust3
  adjust2
  adjust

* master:
 2012-03-02 12:28:28 -05:00
Simon e2e9050d74 Merge pull request #58 from simonlnu/master 
fix for comment-wwedit-wrapper; CSS class in tpl had a stray $
 2012-03-02 09:28:04 -08:00
Simon d61ee3760d Merge pull request #59 from tomtom84/master 
diabook theme
 2012-03-02 09:25:42 -08:00
tommy tomson 64a85b2507 deleted readme.txt from folder diabook 2012-03-02 18:01:21 +01:00
Simon L'nu 9c698b1a60 fix for comment-wwedit-wrapper CSS class in tpl had a stray $ 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-03-02 12:00:16 -05:00
tommy tomson ac1d758f6e github finally working 2012-03-02 17:47:45 +01:00
tommy tomson d72520f5f1 adjust3 2012-03-02 17:45:21 +01:00
Fabio Comuni 8a51e29824 template proc: add variable filters 2012-03-02 17:22:16 +01:00
tommy tomson cb46e4a11f Merge remote-tracking branch 'tomtom84_friendica/master' into master-2 2012-03-02 17:21:06 +01:00
tommy tomson c26787ab94 adjust2 2012-03-02 17:18:11 +01:00
Simon L'nu 725daf2a5d Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 
* 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:
 2012-03-02 10:55:59 -05:00
Simon a3dcf491f1 Merge pull request #57 from fabrixxm/master 
template processor optimizations
 2012-03-02 07:55:38 -08:00
tommy tomson e2798cee16 adjust 2012-03-02 16:01:20 +01:00
Fabio Comuni aef737f376 template proc: allow isolation of var name between [ and ] 
$var.name -> $[var.name]
 2012-03-02 15:53:48 +01:00
Fabio Comuni 5fc3c3ab85 group: fix create new group form 2012-03-02 15:40:17 +01:00
Fabio Comuni ef34847501 templates: fix tags 2012-03-02 12:41:34 +01:00
Fabio Comuni 0bf087c895 template proc: remove unused function and commented out code 2012-03-02 12:36:22 +01:00
Fabio Comuni 60e5dda1b5 template proc: first optimization 2012-03-02 12:24:35 +01:00
Simon L'nu bcadd873ee Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:
  expand multiple heart smilies e.g. <3333

* master:
 2012-03-02 04:53:54 -05:00
friendica f1bf6dcdfb expand multiple heart smilies e.g. <3333 2012-03-02 01:24:20 -08:00
Simon L'nu f0fdd1a163 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 
* 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:
 2012-03-02 04:07:23 -05:00
friendica 90bdddca0d Merge branch 'pull' 2012-03-02 00:10:05 -08:00
friendica be231e3466 item table update for file feature 2012-03-02 00:09:10 -08:00
fabrixxm 3a609adfb7 Merge pull request #55 from fabrixxm/master 
Some minor and one majior mod in templates
 2012-03-02 00:00:03 -08:00
friendica f55ffcd48c Merge pull request #56 from tomtom84/master 
diabook theme
 2012-03-01 20:03:18 -08:00
tommy tomson 1fac47a247 Merge remote-tracking branch 'upstream/master' 2012-03-02 04:58:37 +01:00
friendica 8207272fbc Merge branch 'pull' 2012-03-01 18:54:50 -08:00