clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
5,226 Commits 3 Branches 0 Tags 183 MiB
Commit Graph

5226 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Simon L'nu 74b237d46d Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:
  diabook-themes: theme-settings: "wide"-option and new screenshots

* master:
 2012-04-17 15:36:45 -04:00
Tobias Hößl e3af818263 Typo 2012-04-17 19:31:06 +00:00
tommy tomson 5b407b5ee7 diabook-themes: theme-settings: "wide"-option and new screenshots 2012-04-17 19:45:53 +02:00
Simon 97c50a0924 Merge pull request #242 from simonlnu/master 
[SECURITY] finish ripping out fpostit
 2012-04-17 10:22:39 -07:00
Simon L'nu f4ff75cace [SECURITY] finish ripping out fpostit 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-04-17 13:21:30 -04:00
Simon L'nu d92bab6693 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:
  update to the German string files
  diabook-themes: removed fpostit due to security issues and small fix in german translation
  naked br appearing when attaching and textplain
  Some Bugfixes, and variable checks
  rev update

* master:
 2012-04-17 13:17:13 -04:00
Simon 04af5d9e2c Merge pull request #241 from simonlnu/master 
rip out fpostit
 2012-04-17 10:16:56 -07:00
Simon L'nu 1b2209fb3c rip out fpostit 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-04-17 13:15:11 -04:00
Tobias Diekershoff dbff4252d4 Merge branch 'master' of https://github.com/friendica/friendica 2012-04-17 18:07:20 +02:00
Tobias Diekershoff 757e3429ac update to the German string files 2012-04-17 18:06:28 +02:00
tommy tomson b30c761aae diabook-themes: removed fpostit due to security issues and small fix in german translation 2012-04-17 16:15:49 +02:00
friendica 8269d6aa19 Merge pull request #240 from CatoTH/master 
Some bugfixes / Notices
 2012-04-17 06:50:09 -07:00
friendica e6330e3b96 naked br appearing when attaching and textplain 2012-04-17 06:11:41 -07:00
Tobias Hößl 720c8324c7 Some Bugfixes, and variable checks 2012-04-17 11:33:50 +00:00
friendica a742199035 Merge https://github.com/friendica/friendica into pull 2012-04-16 22:59:09 -07:00
friendica 7ebca2b37d rev update 2012-04-16 22:58:52 -07:00
Simon 621bf6bab4 Merge pull request #239 from simonlnu/master 
multiple ui and other fixes
 2012-04-16 21:29:05 -07:00
Simon L'nu 68e1523496 finally fix the ui in the settings. it was fugly.... other bug fixes too 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-04-17 00:26:37 -04:00
Simon L'nu 4e967fc79f Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master: (22 commits)
  diabook-themes: bugfix (sry, necessary)
  diabook-themes: small bug/css-fixes ---> ver. 1.019
  diabook-themes: bug-fixes
  diabook-themes: minor bugfixes
  turn on comment edit
  propagate edited comments
  edited comments weren't being relayed
  rev update
  diabook-themes: css-fixes
  open contact edit in same window
  where did this "lang" string come from and why?
  function name typo
  track requested profile error msg
  DBA: Reverting back to original source
  DBA: Nothing really done ..
  DBA: Deactivation of the mysqli-class for testing purposes.
  API: Improved the timeline. Several (disabled) tests with caching of photos.
  html2plain: changed behaviour for the "hr" element.
  API: Tweetdeck is now working
  API: Added Public Timeline
  ...

* master:
 2012-04-16 22:58:28 -04:00
tommy tomson f08844a8a5 diabook-themes: bugfix (sry, necessary) 2012-04-16 19:23:11 +02:00
tommy tomson 15dc8f4b21 diabook-themes: small bug/css-fixes ---> ver. 1.019 2012-04-16 18:51:08 +02:00
tommy tomson b32a731517 diabook-themes: bug-fixes 2012-04-16 17:12:08 +02:00
tommy tomson 947b6073b1 diabook-themes: minor bugfixes 2012-04-16 16:05:29 +02:00
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