Commit graph

4110 commits

Author SHA1 Message Date
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
friendica
58e3372b23 probe for very old (0.97 or 1.0) RSS feed with an incorrect or generic content-type 2012-03-01 18:49:23 -08:00
friendica
a5256b7996 Merge pull request #54 from campino/master
Build documentation

This looks good. It may take me some time to get up to speed - and I'm not sure I have all the utilities available via my hosting provider.
2012-03-01 17:54:41 -08:00
tommy tomson
5183e737d0 diabook commit 2012-03-02 02:05:35 +01:00
Alexander Kampmann
dd9432903d Merge remote-tracking branch 'upstream/master' 2012-03-01 11:49:22 +01:00
Fabio Comuni
b6b7742579 Merge remote-tracking branch 'friendica/master' into randomerror 2012-03-01 11:47:45 +01:00
Fabio Comuni
ed42fa7d59 conversation: remove templating items in code and move it to template. 2012-03-01 11:46:08 +01:00
Alexander Kampmann
e0c659b34b 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
2012-03-01 11:44:33 +01:00
Fabio Comuni
c462ed9fc5 template proc: avoid a notice and allow template name to include to be passed with a variable value 2012-03-01 11:32:49 +01:00
Fabio Comuni
a26ce7c56b show relation in contact_template 2012-03-01 11:31:16 +01:00
Fabio Comuni
f0b6e76293 admin: fix small string 2012-03-01 11:28:48 +01:00
Simon L'nu
b7ab2a2fc9 Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
  yet more work on notifications
  notification enhancements
  better handling of multiple notifications for same item, and old notifications

* master:
2012-02-29 23:26:49 -05:00
friendica
bd2c8c92f1 yet more work on notifications 2012-02-29 19:23:01 -08:00
friendica
bbebb4c2a0 notification enhancements 2012-02-29 18:19:08 -08:00
friendica
84d5f495e6 better handling of multiple notifications for same item, and old notifications 2012-02-29 16:26:07 -08:00
Fabio Comuni
b71a3af457 Merge remote-tracking branch 'friendica/master' into randomerror 2012-02-29 14:58:37 +01:00
Simon L'nu
6855474146 Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* 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:
2012-02-29 06:56:59 -05:00
friendica
fb33b4f2bc Update LICENSE 2012-02-29 21:09:20 +11:00
friendica
aedb7c5f69 Update README 2012-02-29 21:07:33 +11:00
friendica
60ae0d8974 cleaned up mess created when both people request friendship and one approves as duplex 2012-02-28 17:32:44 -08:00
friendica
21803e0cd3 call time pass by reference deprecated 2012-02-28 14:54:17 -08:00
friendica
f40ef1bf46 Merge branch 'pull' 2012-02-28 14:53:41 -08:00
friendica
4dd4a22582 From Tobias H - catch some irregularities caused by cut/paste code 2012-02-28 14:52:23 -08:00
Simon L'nu
21d1dc48a8 Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
  fix url and network display

* master:
2012-02-28 16:43:08 -05:00
fabrixxm
733f830be4 fix url and network display 2012-02-28 19:10:27 +01:00
Simon L'nu
718c5ea23e Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
  update globaldir when page-type changes, add spam date field
  clicking contact on contacts page broken link

* master:
2012-02-28 05:25:05 -05:00
friendica
53412dacd4 update globaldir when page-type changes, add spam date field 2012-02-27 23:27:16 -08:00
friendica
2b730ae86d clicking contact on contacts page broken link 2012-02-27 18:46:11 -08:00
Simon L'nu
cf7e141055 Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
  cleanup notify subject lines

* master:
2012-02-27 21:08:19 -05:00
friendica
6c0fa7a166 Merge branch 'pull' 2012-02-27 17:18:53 -08:00
friendica
d7407f8daa cleanup notify subject lines 2012-02-27 17:18:19 -08:00
Simon L'nu
8c2bda46f7 Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
  revert 01a2791e3a to avoid random preg internal errors. fix contact_template

* master:
2012-02-27 13:34:19 -05:00