nupplaPhil/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
5353 commits 2 branches 55 tags 148 MiB
Commit graph

5353 commits

This branch
This branch
All branches
Author SHA1 Message Date
friendica fd2f7dd6ae turn on comment edit 2012-04-16 03:51:48 -07:00
friendica 0b838e4cc7 propagate edited comments 2012-04-16 02:09:00 -07:00
friendica c8598e7da6 edited comments weren't being relayed 2012-04-16 01:35:27 -07:00
friendica 37bb3c330d rev update 2012-04-15 16:21:20 -07:00
friendica 93df525f5c Merge pull request #238 from annando/master 
API: Support of the statusnet application
 2012-04-15 16:00:07 -07:00
tommy tomson b5c164bf2f diabook-themes: css-fixes 2012-04-15 19:58:26 +02:00
friendica f994f9abc6 open contact edit in same window 2012-04-15 06:34:01 -07:00
friendica c4e8ef330e where did this "lang" string come from and why? 2012-04-15 06:04:54 -07:00
friendica 97715c73fc Merge https://github.com/friendica/friendica into pull 2012-04-15 05:12:14 -07:00
friendica 0a3454c841 function name typo 2012-04-15 05:11:52 -07:00
Simon f299749758 Merge pull request #237 from simonlnu/master 
REALLY fix fpostit this time
 2012-04-15 00:20:12 -07:00
Simon L'nu 6a2f0eb475 REALLY fix fpostit this time 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-04-15 03:18:55 -04:00
Simon L'nu d90076b01a Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:

* master:
 2012-04-15 03:17:01 -04:00
Simon 4572179a24 Merge pull request #236 from simonlnu/master 
fix fpostJS, add and fix some other stuff
 2012-04-14 23:14:52 -07:00
Simon L'nu d836be1dc3 fix fpostJS, add and fix some other stuff 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-04-15 02:13:36 -04:00
Simon L'nu adc932a5e2 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:
  diabook-themes: added js for auto-growing comment-textareas
  diabook: theme-settings: add a wide-option
  Another bunch of executable permission removal
  Removed execution permission: lintian warning in Debian packaging

* master:
 2012-04-15 00:40:21 -04:00
tommy tomson dddf3307af diabook-themes: added js for auto-growing comment-textareas 2012-04-15 04:39:33 +02:00
tommy tomson 170c15ceb9 diabook: theme-settings: add a wide-option 2012-04-15 02:50:16 +02:00
friendica 31b1d353b2 Merge pull request #234 from copyninja/master 
Executable permisson removal on files which are not elf/script
 2012-04-14 14:50:54 -07:00
friendica 0939029b74 track requested profile error msg 2012-04-14 14:45:09 -07:00
Simon 4ef5b9c4e3 Merge pull request #235 from simonlnu/master 
string fix: typo. slow down scroll to top in dispys
 2012-04-14 13:25:51 -07:00
Simon L'nu 6278b2a923 string fix: typo. slow down scroll to top in dispys 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-04-14 16:24:35 -04:00
Simon L'nu 1dd22be4d2 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:
  bogus empty list element in dfrn_request page when emailnet not enabled
  zrl on random profile
  zrl hook
  bug #372 - category feeds
  pass zrl's to/through global directory

* master:
 2012-04-14 15:12:39 -04:00
Vasudev Kamath 41d74c0868 Another bunch of executable permission removal 2012-04-14 20:16:06 +05:30
Vasudev Kamath 626bb57e1d Removed execution permission: lintian warning in Debian packaging 2012-04-14 20:04:54 +05:30
friendica 6591b292a1 bogus empty list element in dfrn_request page when emailnet not enabled 2012-04-14 05:32:31 -07:00
friendica 6af4183302 zrl on random profile 2012-04-14 05:07:00 -07:00
friendica f4ea764aaf zrl hook 2012-04-14 04:54:26 -07:00
Michael Vogel e825a73f1d DBA: Reverting back to original source 2012-04-14 13:35:11 +02:00
friendica 9dd0ef2aeb bug #372 - category feeds 2012-04-14 04:19:41 -07:00
Michael Vogel eb27c32065 DBA: Nothing really done .. 2012-04-14 13:17:58 +02:00
Michael Vogel 4e220ec391 Merge commit 'upstream/master' 2012-04-14 13:15:25 +02:00
friendica 0d869ceb65 pass zrl's to/through global directory 2012-04-14 03:51:41 -07:00
Simon L'nu 16f729912a Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:
  one more
  additional marital status selectors

* master:
 2012-04-14 01:34:25 -04:00
friendica 7c63ca8364 one more 2012-04-13 17:39:12 -07:00
friendica 0d0aa7495b additional marital status selectors 2012-04-13 17:34:02 -07:00
Simon 1a0995f1bb Merge pull request #233 from simonlnu/master 
lighten wrapper shadow a bit on dispy
 2012-04-13 17:14:46 -07:00
Simon L'nu 96cda3136b lighten wrapper shadow a bit on dispy 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-04-13 20:14:09 -04:00
Simon L'nu 13930e9a80 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:

* master:
 2012-04-13 20:13:30 -04:00
Simon 5877587e6e Merge pull request #232 from simonlnu/master 
neat little changes. hopefully the shadow will be well recieved
 2012-04-13 16:31:25 -07:00
Simon L'nu 6b46fe3dfe neat little changes. hopefully the shadow will be well recieved 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-04-13 19:30:07 -04:00
Simon L'nu a3d95f79f2 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:
  well that was a silly mistake...
  setting wasn't being applied
  rev update
  diabook-themes: theme-settings: users can set font-size and line-height for posts and comments
  diabook: theme-settings: users can set font-size and line-height for posts and comments
  diabook-themes: small fixes
  quattro: language icon in navbar
  move html out of lang_selector() and new template lang_selector.tpl
  display settings: show theme screenshot on page load
  quattro: add admin theme settigs. darker items background with a bottom border.
  admin: change global theme settings
  quattro: work on     "like" activitiy items less visible     fixes to widths     popup notification out of navbar     category input in jot
  validate_url allow naked subdomain if is "localhost"

* master:
 2012-04-13 19:26:18 -04:00
friendica bfb821e918 well that was a silly mistake... 2012-04-13 16:12:06 -07:00
friendica d1b57d6e74 setting wasn't being applied 2012-04-13 15:37:25 -07:00
friendica e71f01b549 Merge https://github.com/friendica/friendica into pull 2012-04-13 14:44:57 -07:00
friendica dfe774179a rev update 2012-04-13 14:44:37 -07:00
tommy tomson a300616bcb diabook-themes: theme-settings: users can set font-size and line-height for posts and comments 2012-04-13 22:08:13 +02:00
tomtom84 1ab69c2720 Merge pull request #231 from tomtom84/master 
fixes in theme diabook
 2012-04-13 12:36:07 -07:00
tommy tomson 2c843466a9 diabook: theme-settings: users can set font-size and line-height for posts and comments 2012-04-13 21:34:21 +02:00
tommy tomson 615cd53e51 diabook-themes: small fixes 2012-04-13 18:28:11 +02:00