Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'pull' | friendica | 2012-03-25 | 3 | -9/+17 |
|\ | |||||
| * | urgent fix to dispy-dark theme.php | Simon L'nu | 2012-03-25 | 1 | -1/+1 |
| | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| * | small fixes | tommy tomson | 2012-03-25 | 2 | -8/+16 |
| | | |||||
* | | theme screenshots | friendica | 2012-03-25 | 1 | -0/+0 |
|/ | |||||
* | dispy-dark not experimental. start implementing fpostit | Simon L'nu | 2012-03-25 | 19 | -16/+452 |
| | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
* | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-25 | 10 | -29/+135 |
|\ | | | | | | | | | | | | | | | * remotes/upstream/master: move community_pages to right_aside, fixes in css improved the inivitations and added a bit of sales pitch. * master: | ||||
| * | move community_pages to right_aside, fixes in css | tommy tomson | 2012-03-25 | 10 | -29/+135 |
| | | |||||
* | | increase version to 1.0 for dispys \o/ | Simon L'nu | 2012-03-25 | 2 | -2/+3 |
|/ | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
* | implement filer/file-as | Simon L'nu | 2012-03-25 | 8 | -38/+105 |
| | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
* | small fix in css | tommy tomson | 2012-03-24 | 4 | -4/+4 |
| | |||||
* | add right_aside to diabook-blue | tommy tomson | 2012-03-24 | 20 | -94/+5443 |
| | |||||
* | add connectable services to right_aside | tommy tomson | 2012-03-24 | 10 | -3/+19 |
| | |||||
* | add PostIt to right_aside, fixes in css | tommy tomson | 2012-03-24 | 10 | -17/+180 |
| | |||||
* | diabook: theme.php | Fabio Comuni | 2012-03-23 | 2 | -219/+62 |
| | | | | | | | remove code duplication last photos check for user "hidewall" remove unneeded regex move js code to close popup in main.js (missing stop event propagation in popup links) | ||||
* | fix in css right_aside | tommy tomson | 2012-03-23 | 5 | -34/+4953 |
| | |||||
* | small fix | tommy tomson | 2012-03-23 | 1 | -1/+1 |
| | |||||
* | fix 1024resolution | tommy tomson | 2012-03-23 | 2 | -14/+15 |
| | |||||
* | add right_aside to theme diabook | tommy tomson | 2012-03-23 | 5 | -10/+327 |
| | |||||
* | quattro(-green) styling the 'filed under: remove' text | Tobias Diekershoff | 2012-03-22 | 4 | -7/+52 |
| | |||||
* | missing tooltip for "file as" | friendica | 2012-03-22 | 6 | -6/+6 |
| | |||||
* | add file_as-option to diabook-derivates | tommy tomson | 2012-03-22 | 6 | -0/+10 |
| | |||||
* | add icons to aside diabook, fixes in css | tommy tomson | 2012-03-22 | 14 | -46/+65 |
| | |||||
* | add comix-plain | friendica | 2012-03-21 | 6 | -0/+414 |
| | |||||
* | smooth the comix comment box | friendica | 2012-03-21 | 1 | -0/+32 |
| | |||||
* | facepark is unsupported ATM | friendica | 2012-03-21 | 2 | -0/+0 |
| | |||||
* | Merge pull request #154 from tonybaldwin/master | friendica | 2012-03-20 | 24 | -0/+3661 |
|\ | | | | | added theme | ||||
| * | Merge remote branch 'upstream/master' | tony baldwin | 2012-03-21 | 51 | -378/+1086 |
| |\ | |||||
| * | | added Vijay's theme from facepark.in | tony baldwin | 2012-03-21 | 24 | -0/+3661 |
| | | | |||||
* | | | add comix theme | friendica | 2012-03-20 | 5 | -0/+386 |
| |/ |/| | |||||
* | | some tweakings for intro boxes (finally got an intro i could see :). dispy ↵ | Simon L'nu | 2012-03-20 | 3 | -13/+148 |
| | | | | | | | | | | | | synced with dispy-dark Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
* | | fix the comment box being too wide and looking off-kilter | Simon L'nu | 2012-03-18 | 2 | -2/+2 |
| | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
* | | [fix] whitespace in photo_view and like_noshare. dispy-dark clean up | Simon L'nu | 2012-03-17 | 2 | -11/+5 |
| | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
* | | remove auto-complete from darkzero-NS, dispys, since the comment one is now ↵ | Simon L'nu | 2012-03-16 | 2 | -6/+0 |
| | | | | | | | | | | | | global Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
* | | make auto-complete in darkzero-NS. other themes can use this easily. might ↵ | Simon L'nu | 2012-03-16 | 1 | -0/+3 |
| | | | | | | | | | | | | need to edit the id it hooks into Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
* | | make profiles-menu disappear when clicked outside it | Simon L'nu | 2012-03-16 | 2 | -0/+18 |
| | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
* | | weee, dispys get another update | Simon L'nu | 2012-03-16 | 15 | -195/+294 |
| | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
* | | more changes in dispy-dark | Simon L'nu | 2012-03-16 | 1 | -0/+6 |
| | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
* | | Merge branch 'pull' | friendica | 2012-03-15 | 15 | -32/+86 |
|\ \ | |||||
| * | | added icons to profile_side, fixes in css | tommy tomson | 2012-03-16 | 15 | -32/+86 |
| | | | |||||
* | | | undo git stuffup | friendica | 2012-03-15 | 3 | -4/+8 |
|/ / | |||||
* | | Merge pull request #136 from annando/master | friendica | 2012-03-15 | 3 | -8/+17 |
|\ \ | | | | | | | Mail improvements, item caching and so on | ||||
| * \ | Merge commit 'upstream/master' | Michael Vogel | 2012-03-15 | 57 | -384/+1152 |
| |\ \ | |||||
| * | | | Removed changes | Michael Vogel | 2012-03-11 | 2 | -19/+11 |
| | | | | |||||
| * | | | Merge commit 'upstream/master' | Michael Vogel | 2012-03-11 | 48 | -68/+6345 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: view/theme/diabook/wall_item.tpl view/theme/diabook/wallwall_item.tpl | ||||
| * | | | | Pages: Show every community page - even from foreign servers (with caching) | Michael Vogel | 2012-03-11 | 1 | -0/+3 |
| | | | | | |||||
| * | | | | Enabled Caching for items. Changed color of tags in diabook. | Michael Vogel | 2012-03-10 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | diabook: Moving the location between the icons | Michael Vogel | 2012-03-10 | 3 | -5/+7 |
| | | | | | |||||
* | | | | | fixed the sidebar edit thingy. haven't synced dispy yet. | Simon L'nu | 2012-03-15 | 2 | -24/+27 |
| |_|/ / |/| | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
* | | | | commit latest to dispy-dark. fixes in html css and js | Simon L'nu | 2012-03-15 | 15 | -83/+113 |
| | | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
* | | | | Merge https://github.com/friendica/friendica into pull | friendica | 2012-03-15 | 10 | -21/+74 |
|\ \ \ \ |