Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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) | ||||
* | user settings: don't show emoticons | Fabio Comuni | 2012-03-23 | 1 | -1/+1 |
| | |||||
* | 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 | 6 | -11/+329 |
| | |||||
* | quattro(-green) styling the 'filed under: remove' text | Tobias Diekershoff | 2012-03-22 | 4 | -7/+52 |
| | |||||
* | it's only item.filer ;-) | Tobias Diekershoff | 2012-03-22 | 2 | -2/+2 |
| | |||||
* | Merge branch 'quattrofiler' | Tobias Diekershoff | 2012-03-22 | 2 | -0/+6 |
|\ | |||||
| * | non static filer text | Tobias Diekershoff | 2012-03-22 | 2 | -2/+2 |
| | | |||||
| * | adding filer functionality to quattro(-green) | Tobias Diekershoff | 2012-03-22 | 2 | -0/+6 |
| | | |||||
* | | 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 | 2 | -2/+36 |
| | |||||
* | ika to ica | friendica | 2012-03-21 | 1 | -1/+1 |
| | |||||
* | facepark is unsupported ATM | friendica | 2012-03-21 | 2 | -0/+0 |
| | |||||
* | Merge branch 'pull' | friendica | 2012-03-20 | 24 | -0/+3661 |
|\ | |||||
| * | 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 | 65 | -403/+1121 |
| | |\ | |||||
| | * | | added Vijay's theme from facepark.in | tony baldwin | 2012-03-21 | 24 | -0/+3661 |
| | | | | |||||
* | | | | remove stray template variable from old code | friendica | 2012-03-20 | 1 | -1/+0 |
|/ / / | |||||
* | | | add comix theme | friendica | 2012-03-20 | 5 | -0/+386 |
| | | | |||||
* | | | use password field for DB input | friendica | 2012-03-20 | 1 | -1/+1 |
| |/ |/| | |||||
* | | 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> | ||||
* | | community discovery cont., cleanup of DB debugging | friendica | 2012-03-18 | 2 | -1/+3 |
| | | |||||
* | | Merge pull request #147 from CatoTH/master | friendica | 2012-03-18 | 2 | -1/+2 |
|\ \ | | | | | | | CSRF-Protection in the group-related form | ||||
| * | | CSRF-Protection in the group-related form (creating, renaming and dropping a ↵ | Tobias Hößl | 2012-03-18 | 2 | -1/+2 |
| | | | | | | | | | | | | group, adding/removing members from it) | ||||
* | | | 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 | 4 | -16/+10 |
| | | | | | | | | 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> | ||||
* | | Merge pull request #141 from CatoTH/master | Simon | 2012-03-16 | 2 | -3/+9 |
|\ \ | | | | | | | Private messages - tabindex | ||||
| * | | Bugfix of old IEs | Tobias Hößl | 2012-03-16 | 1 | -1/+1 |
| | | | |||||
| * | | Forgot to remove a debug line | Tobias Hößl | 2012-03-16 | 1 | -1/+0 |
| | | | |||||
| * | | Use tabindex to enable easy navigation in the dialog to write private mails; ↵ | Tobias Hößl | 2012-03-16 | 2 | -4/+11 |
| | | | | | | | | | | | | Recipient -> Subject -> Text field (tabindex has to be set to the IFRAME element after TinyMCE started) -> Send button | ||||
* | | | weee, dispys get another update | Simon L'nu | 2012-03-16 | 15 | -195/+294 |
|/ / | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
* | | missing close double quote in mail_list.tpl | Simon L'nu | 2012-03-16 | 1 | -1/+1 |
| | | | | | | | | 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 |
|\ \ |