Commit graph

1195 commits

Author SHA1 Message Date
duthied
24595c55d7 Merge pull request #16 from duthied/master
Minor ui tweaks
2011-10-04 09:13:49 -07:00
Devlon Duthie
f7d055687e - moved the header for profile permissions out of the scrolling div
- tweaks to the testbubble theme's nav
2011-10-04 11:10:57 -05:00
Olivier Migeot
c0cda02963 Updated french locale. 2011-10-04 12:06:01 +02:00
Olivier Migeot
273594af62 Merge remote branch 'upstream/master' 2011-10-04 11:45:57 +02:00
Friendika
e4b4c1e9f8 Merge pull request #15 from fabrixxm/master
some work on quattro theme and a little fix to JS
2011-10-03 05:17:00 -07:00
Fabio Comuni
4d5580ab77 fix typo 2011-10-03 09:38:58 +02:00
Fabio Comuni
b476575a98 quattro: add comment box 2011-10-03 09:38:17 +02:00
Devlon Duthie
f84c208ac5 broke 'find similar' matches content into a tpl in core, added an extended tpl to testbubble that lists the profile tags 2011-10-03 01:45:27 -05:00
Devlon Duthie
da53ebf4b3 added activetab var to message.php for templates
(testbubble only) added logic to photo header to make tab 'sticky' (active class for styling)
(testbubble only) css fix for avatars in wallitems
2011-10-02 20:37:47 -05:00
Devlon Duthie
8e38fe6f47 Merge branch 'master' of http://github.com/friendika/Free-Friendika 2011-10-02 18:39:53 -05:00
Devlon Duthie
f6f5e5b993 aspect ratio fixes for photos in testbubble theme
some other testbubble styling tweaks
2011-10-02 18:38:08 -05:00
Friendika
8c9a6b0512 fix notifications duepuntozero 2011-10-02 02:46:54 -07:00
Friendika
7059b8378c Merge pull request #11 from duthied/master
Aspect ratio improvement for photos in album, implemented only in testbubble theme
2011-10-01 23:36:23 -07:00
Friendika
0ad9e7b5f4 option to not post photos to status stream 2011-10-01 06:20:41 -07:00
Friendika
8f47540e9b darkbubble - event legibility 2011-10-01 04:37:28 -07:00
Friendika
78c00c287d legibility improvements to darkbubble, mark as a derived theme 2011-10-01 04:25:40 -07:00
Devlon Duthie
c15690563d class and wrapper div added to photo for aspect ratio display
testbubble theme styling for aspect ratio on photos
2011-10-01 01:52:06 -05:00
Devlon Duthie
6f610eb614 1. added button class to tpl files
2. messages - moved delete X into message div and new message form div
3. began work on creating thumbnail versions of albums - needs aspect ratio correction (javascript)
4. changed font-size and font-variation on vcard for better readability.
5. streamlining continued with the CSS file
2011-09-30 01:01:15 -05:00
Friendika
097c1f8da7 do not poll for abandoned accounts 2011-09-29 21:20:19 -07:00
Friendika
bc98930537 Merge branch 'pull' 2011-09-29 15:33:12 -07:00
Friendika
c68569040e added back for photos page until we can get rid of it cleanly 2011-09-29 15:32:16 -07:00
tobiasd
dd316ef6f6 Merge pull request #9 from tobiasd/6cf5da1e4bc43d8446f5789bc93f82673ec64c2e
German strings
2011-09-29 00:06:23 -07:00
Tobias Diekershoff
6cf5da1e4b update to the German strings 2011-09-29 09:03:06 +02:00
Friendika
6d36fab90f reverting wall_item.tpl 2011-09-28 23:54:22 -07:00
Devlon Duthie
0881c04cea classes added to core + testbubble theme
some fixes to testbubble theme related to tab styling
2011-09-29 01:20:39 -05:00
Friendika
ffa3b67365 fix nav-selected duepuntozero 2011-09-28 23:10:23 -07:00
Friendika
5279f99278 missing uploads on testbubble 2011-09-28 22:13:33 -07:00
Friendika
50c4077c5b basic darkbubble - improve as needed 2011-09-28 16:22:08 -07:00
Friendika
bedb4eb715 just hostname not url in hm:host - host xrd document 2011-09-28 15:07:01 -07:00
Friendika
d0f45bf281 apps broken in all themes, apps link misplaced in testbubble 2011-09-28 04:19:42 -07:00
Friendika
360a46178b create zot batch keys 2011-09-28 03:45:48 -07:00
fabrixxm
207f739f90 Merge pull request #6 from fabrixxm/master
more work on ui
2011-09-28 01:35:32 -07:00
Fabio Comuni
41617ee987 fix search_item.tpl, fix 'new' view in network page, fix walltowall template in 'quattro' theme 2011-09-28 10:30:32 +02:00
Friendika
4343a73076 move connect button down a smidgin 2011-09-28 00:53:55 -07:00
Fabio Comuni
68a6bfdee5 Items lock icon 2011-09-28 09:43:31 +02:00
Fabio Comuni
c120cc8ea9 added missing "delete selected items" link 2011-09-28 09:32:53 +02:00
Fabio Comuni
dccd2da356 Merge remote-tracking branch 'friendika/master' 2011-09-28 09:27:59 +02:00
Friendika
44d7c6aac3 connect button overlapping profile details 2011-09-27 22:03:07 -07:00
Fabio Comuni
e986fc3e30 quattro: actions in wall_item
less html in conversation.php
removed unused tpls
fixed old themes
2011-09-27 16:54:33 +02:00
Friendika
75af366122 zot/salmon new key format for batch keys 2011-09-27 06:50:18 -07:00
Friendika
59525e1e32 restore privacy icons after theme upgrade 2011-09-27 05:24:26 -07:00
Fabio Comuni
30df9abeac fix loozah themes navbar 2011-09-27 13:45:25 +02:00
Friendika
1e288dc8a3 loozah theme vcard float not cleared 2011-09-27 01:32:54 -07:00
Friendika
8c6e7a24cd Merge branch 'pull' 2011-09-27 01:29:08 -07:00
Friendika
2118dd3160 vcard elements float not cleared 2011-09-27 01:28:22 -07:00
Fabio Comuni
3dca29b3d5 port old themes 2011-09-27 10:19:32 +02:00
Fabio Comuni
e9638b6980 Adds theme info file to define 'parent' theme from where load tpl files 2011-09-27 09:32:20 +02:00
Fabio Comuni
939449602a Merge remote-tracking branch 'fabrix/newui' 2011-09-27 08:57:16 +02:00
Devlon Duthie
78c3210f6a fixed a bug I introduced when working on the testbubble theme - user's photo widget header div wasn't closed correctly
+ some opera-friendly style changes
2011-09-27 00:29:34 -05:00
Fabio Comuni
ec4061e6fe quattro: fix star 2011-09-26 11:50:48 +02:00
Fabio Comuni
968e7bb3b1 Fixes for testbubble 2011-09-26 11:48:02 +02:00
Fabio Comuni
5792b3d358 Merge branch 'master' into newui 2011-09-26 11:42:48 +02:00
Friendika
428e676641 fix minor placement issues on old themes from testbubble theme changes 2011-09-25 22:29:30 -07:00
Devlon Duthie
c05178c105 notification theming + other misc. styling 2011-09-25 22:09:41 -05:00
Devlon Duthie
7285bb2db9 added templates to testbubble theme to clarify the delete buttons vsxt on the edit group/drop group
misc. changes to notifications.png for style-specific icons
2011-09-25 19:23:26 -05:00
Devlon Duthie
1a3cc02b41 moved 'view in contextabove the 'end' line of a wall item so it's clear that the link belongs to that item
some various other css tweaks
2011-09-25 18:33:19 -05:00
Devlon Duthie
25dbedd971 fixed jot perms button to be less lame 2011-09-25 18:05:57 -05:00
Devlon Duthie
7dbf112092 added widget class to saved arch block on search page
added header to search results where there are results
2011-09-25 16:01:05 -05:00
Devlon Duthie
a1fc1be9da added contact_edit.tpl to testbubble theme, moved drop iconinto contact-edit-links divs 2011-09-25 15:49:33 -05:00
Devlon Duthie
19963884c2 moved invite friends into 'find people' block
misc. styling tweaks
2011-09-25 15:45:03 -05:00
Devlon Duthie
45043b77f1 fixed styling of register link to handle case where registration is closed
moved lost plink into div with login submit button
2011-09-25 15:08:31 -05:00
Devlon Duthie
f96d8fba3a changed class of visible test under profle, was picking up styling for buttons 2011-09-25 14:20:25 -05:00
Devlon Duthie
bbaec4cb78 moved contact group header out of scrolling div so it doens't vanish whenlot
more css tweaks
2011-09-25 14:08:08 -05:00
Devlon Duthie
cb1c6dd1e3 really commiting files this time, still getting the hang of git.
some images added, some classes added to groupidebar, contacts sidebar
notification flags moved out of nav and into banner for testbubble the
testbubble css tweaks
2011-09-25 13:20:19 -05:00
Devlon Duthie
634e52a671 added testbubble mai, and modified some core fle to add classes 2011-09-24 23:54:23 -05:00
Friendika
3a2bf8ab7c w3c compliance fixes, owner attribution on likes defaulting to local owner, not item creator 2011-09-23 03:12:31 -07:00
Friendika
c63adcfae0 bug #159 multiple definition of string_plural_form function when changing languages 2011-09-21 07:09:37 -07:00
Friendika
deeae7bdb5 diaspora markdown changes, parse_url format change 2011-09-20 15:23:36 -07:00
Friendika
8a11cec61a allow setting all the bookmarked URL fields via script/API 2011-09-19 22:21:55 -07:00
Friendika
d6d24f3b6a personal notes going to wall instead of PN in dispy 2011-09-19 16:51:52 -07:00
fabrixxm
ad3d2bd6ae Merge pull request #173 from fabrixxm/master
a pair of missing IT email templates
2011-09-19 05:45:43 -07:00
Fabio Comuni
ca71808515 IT: missing email templates 2011-09-19 14:43:17 +02:00
Fabio Comuni
991656a3ef Show "404.tpl" instead of using 'notice()' in case of 404 2011-09-19 11:52:32 +02:00
Friendika
0a30a91b14 basic zot discovery framework 2011-09-19 02:13:59 -07:00
Friendika
672ecc7f7d more tag infrastructure 2011-09-18 22:42:47 -07:00
Fabio Comuni
6b6f45f9f1 quattro: initial style of conversations 2011-09-16 12:51:14 +02:00
Fabio Comuni
80af4f3fe6 new icons 2011-09-16 12:50:15 +02:00
Fabio Comuni
9d2afc2d3c Merge remote-tracking branch 'friendika/master' into newui 2011-09-16 09:39:29 +02:00
Fabio Comuni
019b735ec7 Merge branch 'newui' of github.com:fabrixxm/friendika into newui 2011-09-15 10:39:41 +02:00
Fabio Comuni
7e806429cc quattro 2011-09-15 10:38:37 +02:00
Friendika
d7a2ab9c1f send profile visits to 'redir' window 2011-09-09 16:22:32 -07:00
Friendika
3f59f63224 saved searches on search page, templates: Invalid argument supplied for foreach() on line 167 2011-09-08 21:42:52 -07:00
fabrixxm
d284f8017c Merge remote-tracking branch 'friendika/master' into newui 2011-09-08 20:15:27 +02:00
Fabio Comuni
2f93a4d70d style vcard infos 2011-09-08 10:11:57 +02:00
Friendika
18315a1377 Russian translation (80% complete) 2011-09-06 01:52:45 -07:00
Friendika
eeecb412aa view bookmarks 2011-09-06 00:55:24 -07:00
Friendika
e921b97a7f bug #127, add Diaspora notes to Connect (dfrn_request) page, get rid of security warnings 2011-09-05 18:34:30 -07:00
Fabio Comuni
08e54234e3 profiles popup menu in sidebar 2011-09-05 16:55:40 +02:00
Fabio Comuni
abd65e00ab Load infos and notices via ping and show them with js popup 2011-09-05 14:01:21 +02:00
Fabio Comuni
14125ce67b Add tipTip js tooltips 2011-09-05 11:32:40 +02:00
Fabio Comuni
2c1aca7ffe fix aside contact block, add edit profiles icon 2011-09-05 11:16:08 +02:00
Fabio Comuni
20ca451200 move js to js folder 2011-09-05 11:15:30 +02:00
Fabio Comuni
ab5bda526e move icons style in new file 2011-09-05 11:14:43 +02:00
Fabio Comuni
0283cbfcd3 Merge remote-tracking branch 'friendika/master' into newui 2011-09-05 09:09:34 +02:00
Friendika
7e8100d2cd custom attags 2011-09-04 22:40:36 -07:00
Friendika
82f7f33cf5 bookmarks + bug #140 2011-09-04 19:58:03 -07:00
Friendika
481853d2cc saved searches on network page 2011-09-04 17:35:06 -07:00
Friendika
f6a43afb8d set max height of acl names to avoid wrap 2011-09-04 06:18:26 -07:00
Friendika
e440353013 truncate overflow text on acl selector items (3 themes) 2011-09-04 05:41:11 -07:00
Friendika
d49895a8a1 Merge pull request #169 from michal-s/master
minor changes of czech translations
2011-09-02 22:20:47 -07:00
Michal Supler
7813f1798f minor changes of czech translations 2011-09-03 02:01:15 -03:00
Erkan Yilmaz
463a136c15 typo in German admin log page 2011-09-02 10:17:17 +02:00
Fabio Comuni
058e329dfb Fix profile vcard and style 2011-09-01 12:37:30 +02:00
Fabio Comuni
18f6d4e639 small fix to IT strings 2011-09-01 12:39:42 +02:00
Fabio Comuni
8b615133d5 remove html from profile vcard code 2011-08-31 17:31:44 +02:00
Fabio Comuni
54f0685a03 quattro: more colors 2011-08-31 17:30:48 +02:00
Fabio Comuni
62295af1f2 quattro: cleanup and split of less files 2011-08-31 16:19:17 +02:00
Fabio Comuni
5ce6f893a6 Apps popup menu in navbar 2011-08-31 16:18:03 +02:00
Fabio Comuni
71d44d78ec Installed apps as array instead of string 2011-08-31 16:17:32 +02:00
Fabio Comuni
d0926240a8 Merge remote-tracking branch 'friendika/master' into newui 2011-08-30 11:00:23 +02:00
Friendika
22d9d97d71 remove "online reputation" section on contact editing - nobody ever uses it, and there is no interface to query it. 2011-08-29 19:18:59 -07:00
fabrixxm
8438da7d70 Small fix to IT strings 2011-08-26 16:36:02 +02:00
Friendika
99ea045723 some minor work on contact edit page 2011-08-25 18:12:42 -07:00
Friendika
83605cf3dc theme settings for contact photo menu 2011-08-25 05:15:05 -07:00
Friendika
71fc694c67 contact photo menu 2011-08-24 23:20:04 -07:00
Friendika
74d61ed00b contact menu beginnings 2011-08-24 22:40:26 -07:00
Olivier Migeot
1548449586 Small fix 2011-08-24 18:04:16 +02:00
Olivier Migeot
1f5a67c81f French translation up to date. 2011-08-24 17:47:21 +02:00
Tobias Diekershoff
56c29a527d Merge github.com:tobiasd/friendika 2011-08-24 07:38:05 +02:00
Friendika
56d64316f4 diaspora photos ? 2011-08-23 18:17:35 -07:00
Tobias Diekershoff
9cd28af4e8 fixed a missing string in DE 2011-08-23 06:32:21 +02:00
Friendika
eb2ef6dec4 diaspora admin toggle, update install guide 2011-08-22 18:52:02 -07:00
fabrixxm
d5567eb297 compatiblity for old themes 2011-08-22 14:06:55 +02:00
fabrixxm
d8bd4fbb3e Merge branch 'master' into newui 2011-08-22 13:56:08 +02:00
Michal Supler
f3c5154f0c added Czech translation of mail messages 2011-08-21 23:45:43 -03:00
fabrixxm
b465d1f30b Merge pull request #158 from fabrixxm/master
Some works on API
2011-08-19 08:03:20 -07:00
fabrixxm
fc9c73da49 API: missing template and small fix for hotot 2011-08-19 15:09:10 +02:00
Friendika
609741573c darkzero - friend request - identity address invisible 2011-08-18 17:11:57 -07:00
tobiasd
bdd71b10be Merge pull request #155 from tobiasd/master
update DE strings
2011-08-18 01:07:33 -07:00
Tobias Diekershoff
bea02876eb update DE strings 2011-08-18 10:05:33 +02:00
Friendika
9634287839 fix several probe related issues 2011-08-17 23:01:44 -07:00
fabrixxm
8cc368966d Update IT strings 2011-08-17 19:52:10 +02:00
fabrixxm
07b6c868b3 remove javascript to set selectect nav item. enanche img template prefetch ignoring 2011-08-17 18:36:24 +02:00
fabrixxm
bdf42473a0 Merge remote-tracking branch 'friendika/master' into newui 2011-08-17 17:35:37 +02:00
Friendika
b28b468b21 cleanup 2011-08-16 20:05:02 -07:00
Friendika
e15e18e0d1 hopefully fix statusnet bug by altering our feed format slightly 2011-08-12 21:01:51 -07:00
Friendika
e3841ce15c pt-br strings.php update from messages.po change 2011-08-09 19:05:43 -07:00
Abinoam P. Marques Jr.
4cfe75c6bc small typo - pt-br localization 2011-08-09 22:34:44 -03:00
Tobias Diekershoff
e2873e542b fixed some typos 2011-08-09 16:19:39 +02:00
Tobias Diekershoff
97b2c56c98 update of the German localization 2011-08-09 15:57:08 +02:00
Friendika
7eb7f77413 use separate hcard from profile url 2011-08-07 19:26:44 -07:00
Friendika
8ae0a8a94c fix statusnet_html timelines on api 2011-08-05 07:26:54 -07:00
Friendika
1d659bd854 move public profile warning to top of page 2011-08-05 06:42:27 -07:00
Friendika
112fc59e31 more api tweaks 2011-08-05 05:17:18 -07:00
Friendika
2abcf76ec1 salmon protocol changes magicsig draft-experimental, fixes to hostxrd 2011-08-04 22:37:45 -07:00
Friendika
639204c2ec diaspora structures 2011-08-03 22:05:20 -07:00
Friendika
1aaded10b4 api compatibility fixes 2011-08-02 20:02:07 -07:00
Friendika
2637831d90 some more zot changes migrating back to f9a mainline 2011-08-01 21:02:25 -07:00
Friendika
326a873082 merge diaspora/friendika vcard formats - not yet complete 2011-08-01 05:13:59 -07:00
Friendika
0c9f033505 some api enhancements 2011-07-31 16:35:53 -07:00
Fabio Comuni
6c423feed2 add missing link to navbar 2011-07-29 16:32:01 +02:00
Fabio Comuni
97eea6ecd6 style update 2011-07-29 16:24:18 +02:00
Fabio Comuni
d12e2cbfe9 Fix nav template and add missing strings 2011-07-29 16:23:47 +02:00
Friendika
f47d582736 api/statusnet/config.xml 2011-07-28 21:56:56 -07:00
Friendika
41c7d71e3b make profile-jot-desc track lock state changes 2011-07-28 20:44:35 -07:00
Friendika
04675e3ec3 revup 2011-07-28 16:49:43 -07:00
Friendika
06802dd8fe auto focus jot editor 2011-07-25 20:10:21 -07:00
Fabio Comuni
23d6339a41 change to some nav ids, notice in empty notifications popup 2011-07-25 17:12:42 +02:00
Fabio Comuni
ba4ea589d0 update style 2011-07-25 16:55:43 +02:00
Fabio Comuni
5fb2b522f4 move <header> and <nav> tag into nav.tpl. add notification popup items template 2011-07-25 16:53:27 +02:00
Fabio Comuni
dfba0f13c8 Merge branch 'newacl' into newui 2011-07-25 08:59:28 +02:00
Fabio Comuni
363c4c5798 Remove "share" greyed text in jot editor when user reshare an item 2011-07-25 08:56:51 +02:00
Tobias Diekershoff
a09bdf5ad6 added link to community page to dispy theme menu 2011-07-24 11:07:39 +02:00
Tobias Diekershoff
a4f7e8e8fe dispy theme hide editor if without focus 2011-07-24 09:32:20 +02:00
Tobias Diekershoff
abc01cad20 Merge branch 'master' of git://github.com/friendika/friendika 2011-07-23 07:43:25 +02:00
Tobias Diekershoff
a213a9babf dispy ACL into the fancybox 2011-07-23 07:41:20 +02:00
Fabio Comuni
93eda9d9c1 Initial work on new UI 2011-07-22 17:37:51 +02:00
Fabio Comuni
5c9eb19767 fix "resend" function when editor is disabled 2011-07-22 08:46:29 +02:00
Fabio Comuni
096ecba883 Use new ACL selector in photo edit 2011-07-20 14:19:20 +02:00
Fabio Comuni
19c93adf84 Use popup ACL selector in photo upload. js_upload use new acl selector. 2011-07-20 11:40:24 +02:00
Fabio Comuni
7a069c1438 Load tinyMCE on post editor only if needed. 2011-07-20 11:08:42 +02:00
Fabio Comuni
020deefba6 Merge remote-tracking branch 'friendika/master' into newacl 2011-07-20 10:01:12 +02:00
Fabio Comuni
1c9ed08620 show acl selector in a popup with fancybox 2011-07-20 10:00:33 +02:00
Friendika
9048ecd85c diaspora encryption xml template 2011-07-19 22:58:38 -07:00
Friendika
1d35d1e5a1 Merge pull request #141 from fabrixxm/newacl
New jot ACL selector
2011-07-19 17:24:09 -07:00
Fabio Comuni
0a3ae96093 add icons to acl selector 2011-07-19 17:15:34 +02:00
Fabio Comuni
89eefbe46c Fix style and scrollbar 2011-07-19 16:34:27 +02:00
Fabio Comuni
9fa0956966 New jot acl selector 2011-07-19 16:17:58 +02:00
Friendika
07a77a4d27 resize editor 2011-07-18 21:25:49 -07:00
Friendika
7008bec045 improved code blocks 2011-07-18 19:17:16 -07:00
Friendika
c0b8e63a3f basic diaspora discovery 2011-07-18 18:13:46 -07:00
Friendika
25b4aacf3b green icons for greenzero 2011-07-18 16:42:39 -07:00
Friendika
1fa2231c20 invite system 2011-07-17 21:12:31 -07:00
Friendika
f35a61761a Merge pull request #139 from fabrixxm/update
Experiment with on-line update
2011-07-15 01:29:46 -07:00
Friendika
ed94028894 template for statusnet api config.xml 2011-07-14 03:38:25 -07:00
Friendika
7534b8873b link tips on nav bar 2011-07-14 03:05:54 -07:00
Fabio Comuni
34ab2aa959 move update link in admin aside 2011-07-13 08:58:47 +02:00
Friendika
74a608e1c7 openid settings appearing when disabled, don't tag numbers, install admin not getting set 2011-07-12 23:14:38 -07:00
Friendika
706b6e8c84 email notifications not working - unable to change notification settings 2011-07-12 05:09:07 -07:00
Fabio Comuni
4fdc5ff30c First test for friendika "live" update 2011-07-08 17:12:08 +02:00
Friendika
2d2b500639 input the admin email address during install/setup. 2011-07-07 19:12:35 -07:00
Friendika
d99dfbe4ef friendika-z configuration details in admin page 2011-07-07 18:25:56 -07:00
Friendika
8cc6e69705 Merge pull request #138 from fabrixxm/master
some minor tweaks
2011-07-07 15:33:32 -07:00
Fabio Comuni
bf19b219ef duepuntozero: style blockquote 2011-07-07 14:27:39 +02:00
Fabio Comuni
4116beb276 duepuntozero: style "connect" link in profile page 2011-07-07 14:03:47 +02:00
Friendika
d7b5a606fb don't show mailbox settings at all if disabled 2011-07-06 20:27:18 -07:00
Fabio Comuni
2c2df90dc0 Add missing files from previus checkin 2011-07-06 14:19:03 +02:00
Fabio Comuni
e7834e60f8 Update settings page to use field templates.
Add tabs to switch user settings/plugin settings
Add new field templates 'custom', 'password', radio' and 'yesno'
Update main.js to support advanced fileds
Update duepuntozero, dispy e loozah themes
2011-07-06 12:10:00 +02:00
Friendika
92831c9416 Merge pull request #135 from fabrixxm/dispy
More Dispy css
2011-07-04 22:17:35 -07:00
fabrixxm
4e7a5dc56e Merge branch 'dispy' of github.com:fabrixxm/friendika into dispy 2011-07-05 07:11:57 +02:00