Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Merge branch 'pull' | friendica | 2012-04-01 | 37 | -236/+1125 | |
|\ \ | ||||||
| * | | css-fixes | tommy tomson | 2012-04-02 | 7 | -12/+13 | |
| * | | Merge pull request #197 from tomtom84/master | tomtom84 | 2012-04-01 | 25 | -8/+683 | |
| |\ \ | ||||||
| | * | | add new messages-layout in diabook | tommy tomson | 2012-04-01 | 25 | -8/+683 | |
| |/ / | ||||||
| * | | Merge pull request #196 from tomtom84/master | tomtom84 | 2012-04-01 | 16 | -222/+435 | |
| |\ \ | ||||||
| | * | | fix the display of community-plugin in diabook-themes | tommy tomson | 2012-04-01 | 16 | -222/+435 | |
| |/ / | ||||||
* / / | slight improvement in handling of plaintext feeds | friendica | 2012-04-01 | 2 | -3/+10 | |
|/ / | ||||||
* | | that didn't quite work out | friendica | 2012-04-01 | 1 | -2/+2 | |
* | | Merge branch 'pull' | friendica | 2012-04-01 | 11 | -46/+69 | |
|\ \ | ||||||
| * \ | Merge pull request #195 from tomtom84/master | tomtom84 | 2012-04-01 | 11 | -46/+69 | |
| |\ \ | ||||||
| | * | | various bugfixes and css-fixes | tommy tomson | 2012-04-01 | 11 | -46/+69 | |
| |/ / | ||||||
* / / | document tinymce fixes/workarounds | friendica | 2012-04-01 | 1 | -1/+5 | |
|/ / | ||||||
* | | qcomment overflow | friendica | 2012-04-01 | 1 | -0/+8 | |
* | | try slightly better detection of html in feeds | friendica | 2012-04-01 | 1 | -3/+4 | |
* | | Merge branch 'pull' | friendica | 2012-04-01 | 6 | -12/+32 | |
|\ \ | ||||||
| * \ | Merge pull request #194 from simonlnu/master | Simon | 2012-04-01 | 5 | -11/+31 | |
| |\ \ | ||||||
| | * | | latest fixes for dispys. tweaking/repairing | Simon L'nu | 2012-04-01 | 5 | -11/+31 | |
| | * | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-01 | 2 | -9/+6 | |
| | |\ \ | | |/ / | |/| | | ||||||
| * | | | line 86: s/Friendika/Friendica/ | Simon | 2012-04-01 | 1 | -1/+1 | |
| | * | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-31 | 45 | -94/+10852 | |
| | |\ \ | ||||||
| | * | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-31 | 0 | -0/+0 | |
* | | | | | send unverified private mail using zrl | friendica | 2012-04-01 | 10 | -6/+387 | |
|/ / / / | ||||||
* | / / | fix "between yourself and You" in mail list | friendica | 2012-03-31 | 1 | -8/+5 | |
| |/ / |/| | | ||||||
* | | | more error handling | friendica | 2012-03-31 | 2 | -1/+4 | |
* | | | ensure all new users get a timezone. We'll use UTC until they choose otherwise. | friendica | 2012-03-31 | 2 | -2/+6 | |
* | | | handle escaped file chars in display and search | friendica | 2012-03-31 | 5 | -13/+10 | |
* | | | Merge branch 'pull' | friendica | 2012-03-31 | 12 | -0/+10498 | |
|\ \ \ | ||||||
| * \ \ | Merge pull request #193 from tomtom84/master | tomtom84 | 2012-03-31 | 12 | -47/+31 | |
| |\ \ \ | ||||||
| | * | | | diabook-themes: move "common tabs" to left side on settings page | tommy tomson | 2012-03-31 | 12 | -47/+31 | |
| |/ / / | ||||||
| * | | | Merge pull request #192 from tomtom84/master | tomtom84 | 2012-03-31 | 12 | -0/+10514 | |
| |\ \ \ | ||||||
| | * | | | move the common tabs to right_aside in diabook-derivates | tommy tomson | 2012-03-31 | 12 | -0/+10514 | |
| |/ / / | ||||||
* / / / | escape % in file_tag_query as it is ultimately embedded in a sprintf | friendica | 2012-03-31 | 2 | -1/+5 | |
|/ / / | ||||||
* | | | register hooks for a COPA plugin | friendica | 2012-03-31 | 1 | -0/+7 | |
* | | | some js fixes - ignore backspace as history selector and cleanup errors closi... | friendica | 2012-03-31 | 1 | -4/+13 | |
* | | | Merge branch 'pull' | friendica | 2012-03-31 | 25 | -116/+355 | |
|\ \ \ | ||||||
| * | | | bug fix in diabook-aerith and -red | tommy tomson | 2012-03-31 | 6 | -22/+22 | |
| * | | | Merge pull request #191 from tomtom84/master | tomtom84 | 2012-03-31 | 17 | -40/+249 | |
| |\ \ \ | | |/ / | |/| | | ||||||
| | * | | bug-fixes in diabook-derivates | tommy tomson | 2012-03-31 | 17 | -40/+249 | |
| |/ / | ||||||
| * | | Merge pull request #190 from simonlnu/master | Simon | 2012-03-31 | 2 | -14/+2 | |
| |\ \ | ||||||
| | * | | forgot the css changes for last push | Simon L'nu | 2012-03-31 | 2 | -14/+2 | |
| * | | | Merge pull request #189 from simonlnu/master | Simon | 2012-03-31 | 4 | -44/+86 | |
| |\| | | ||||||
| | * | | theme fixes; fix qcomment (finally) | Simon L'nu | 2012-03-31 | 4 | -44/+86 | |
| | * | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-31 | 2 | -9/+7 | |
| | |\ \ | | |/ / | |/| | | ||||||
| | * | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-30 | 32 | -275/+423 | |
| | |\ \ | ||||||
| | * | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-30 | 0 | -0/+0 | |
* | | | | | settings for unknown private mail acceptance | friendica | 2012-03-31 | 5 | -18/+45 | |
|/ / / / | ||||||
* | / / | warning cleanup | friendica | 2012-03-30 | 2 | -9/+7 | |
| |/ / |/| | | ||||||
* | | | Merge branch 'pull' | friendica | 2012-03-30 | 31 | -265/+398 | |
|\ \ \ | ||||||
| * \ \ | Merge pull request #188 from fabrixxm/master | friendica | 2012-03-30 | 22 | -218/+328 | |
| |\ \ \ | ||||||
| | * | | | quattro: move quattro-green inside quattro folder. | Fabio Comuni | 2012-03-30 | 16 | -72/+87 |