Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of https://github.com/friendica/friendica | Alexander Kampmann | 2012-04-05 | 890 | -5398/+45119 |
|\ | | | | | | | | | | | Conflicts: include/config.php update.php | ||||
| * | finish styling category tags and category input | Simon L'nu | 2012-04-05 | 2 | -0/+20 |
| | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| * | style categorytags | Simon L'nu | 2012-04-04 | 2 | -4/+4 |
| | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| * | update the dispy* templates | Simon L'nu | 2012-04-04 | 19 | -131/+188 |
| | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| * | move alert box away from nav links | friendica | 2012-04-04 | 1 | -1/+4 |
| | | |||||
| * | latest changes are the popup menu for notifs, fixes | Simon L'nu | 2012-04-04 | 2 | -20/+38 |
| | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| * | Merge branch 'pull' | friendica | 2012-04-03 | 24 | -120/+313 |
| |\ | |||||
| | * | smal fix | tommy tomson | 2012-04-03 | 1 | -1/+1 |
| | | | |||||
| | * | german translation for right_aside | tommy tomson | 2012-04-03 | 1 | -0/+8 |
| | | | |||||
| | * | make right_aside translatable and provide german translation... | tommy tomson | 2012-04-03 | 23 | -119/+304 |
| | | | | | | | | | | | | and some css-fixes | ||||
| * | | remove loozah themes which fell too far behind to recover | friendica | 2012-04-03 | 39 | -3762/+0 |
| |/ | |||||
| * | diabook-themes: css-fixes | tommy tomson | 2012-04-02 | 24 | -20/+125 |
| | | |||||
| * | diabook-themes: fixes in js | tommy tomson | 2012-04-02 | 4 | -112/+115 |
| | | |||||
| * | diabook-themes: fixed pageheader | tommy tomson | 2012-04-02 | 17 | -68/+98 |
| | | |||||
| * | diabook-themes: bugfixes / css-fixes | tommy tomson | 2012-04-02 | 17 | -17/+30 |
| | | |||||
| * | allow users to set categories on their posts | Michael Johnston | 2012-04-01 | 4 | -11/+33 |
| | | |||||
| * | diabook-themes: add link to global dir in "find friends" at right_aside | tommy tomson | 2012-04-02 | 12 | -12/+20 |
| | | |||||
| * | css-fixes | tommy tomson | 2012-04-02 | 7 | -12/+13 |
| | | |||||
| * | add new messages-layout in diabook | tommy tomson | 2012-04-01 | 25 | -8/+683 |
| | | |||||
| * | fix the display of community-plugin in diabook-themes | tommy tomson | 2012-04-01 | 16 | -222/+435 |
| | | |||||
| * | various bugfixes and css-fixes | tommy tomson | 2012-04-01 | 11 | -46/+69 |
| | | |||||
| * | qcomment overflow | friendica | 2012-04-01 | 1 | -0/+8 |
| | | |||||
| * | Merge branch 'pull' | friendica | 2012-04-01 | 5 | -11/+31 |
| |\ | |||||
| | * | latest fixes for dispys. tweaking/repairing | Simon L'nu | 2012-04-01 | 5 | -11/+31 |
| | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| * | | send unverified private mail using zrl | friendica | 2012-04-01 | 5 | -0/+131 |
| |/ | |||||
| * | diabook-themes: move "common tabs" to left side on settings page | tommy tomson | 2012-03-31 | 12 | -47/+31 |
| | | |||||
| * | move the common tabs to right_aside in diabook-derivates | tommy tomson | 2012-03-31 | 12 | -0/+10514 |
| | | |||||
| * | 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 |
| | | | |||||
| | * | bug-fixes in diabook-derivates | tommy tomson | 2012-03-31 | 17 | -40/+249 |
| | | | |||||
| | * | forgot the css changes for last push | Simon L'nu | 2012-03-31 | 2 | -14/+2 |
| | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| | * | theme fixes; fix qcomment (finally) | Simon L'nu | 2012-03-31 | 4 | -44/+86 |
| | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| * | | settings for unknown private mail acceptance | friendica | 2012-03-31 | 1 | -0/+4 |
| |/ | |||||
| * | quattro: move quattro-green inside quattro folder. | Fabio Comuni | 2012-03-30 | 16 | -72/+87 |
| | | | | | | | | Add config option to select quattro color scheme. | ||||
| * | Merge remote-tracking branch 'friendica/master' | Fabio Comuni | 2012-03-30 | 6 | -14/+36 |
| |\ | |||||
| | * | css-fixes in diabook-derivates | tommy tomson | 2012-03-30 | 6 | -14/+36 |
| | | | |||||
| * | | quattro-green: remove settings code | Fabio Comuni | 2012-03-30 | 1 | -29/+0 |
| | | | | | | | | | | | | Use config.php from quattro | ||||
| * | | quattro: add config.php | Fabio Comuni | 2012-03-30 | 3 | -35/+35 |
| | | | |||||
| * | | settings: add "display settings" tab, with UI-related settings. | Fabio Comuni | 2012-03-30 | 2 | -4/+24 |
| |/ | | | | | | | | | Load optional "config.php" from theme folder and show in page. Loading of "config.php" follow theme_info['extends'] property. | ||||
| * | css-fixes in diabook-derivates | tommy tomson | 2012-03-30 | 8 | -32/+29 |
| | | |||||
| * | css-fixes in diabook-derivates | tommy tomson | 2012-03-30 | 6 | -9/+19 |
| | | |||||
| * | quattro-green: added Description to the theme.php | Tobias Diekershoff | 2012-03-30 | 1 | -0/+1 |
| | | |||||
| * | quattro-green: adopted quattro option for centered display | Tobias Diekershoff | 2012-03-30 | 2 | -1/+56 |
| | | |||||
| * | add themes diabook-red & diabook-aerith | tommy tomson | 2012-03-30 | 170 | -6/+18107 |
| | | |||||
| * | quattro-greey: apply theming to private mail | Tobias Diekershoff | 2012-03-30 | 2 | -29/+128 |
| | | |||||
| * | tweaking stuff in dispys. i thought i fixed the login screens, but they're ↵ | Simon L'nu | 2012-03-29 | 6 | -58/+44 |
| | | | | | | | | | | | | b0rked right now. Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| * | theme file_as combobox for 2.0 | friendica | 2012-03-29 | 2 | -1/+8 |
| | | |||||
| * | css fixes in diabook-derivates | tommy tomson | 2012-03-29 | 16 | -23/+136 |
| | | |||||
| * | Merge pull request #185 from fabrixxm/master | fabrixxm | 2012-03-28 | 12 | -70/+439 |
| |\ | | | | | | | Updated private message pages | ||||
| | * | quattro: style pm pages | Fabio Comuni | 2012-03-28 | 8 | -64/+405 |
| | | |