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
Friendika
20d3aa2e77
community page
2011-07-04 20:57:07 -07:00
Fabio Comuni
2359783b9f
dispy: style private mails
2011-07-04 11:30:53 +02:00
Friendika
9871cc8c0e
profile match layout issues
2011-07-03 22:53:11 -07:00
Friendika
5ceeb6752d
starred items
2011-07-03 19:41:04 -07:00
Friendika
ab7f209fe3
add starred, unstarred icons to duepuntozero, loozah
2011-07-02 20:51:27 -07:00
Friendika
24836f2966
improvied group highlighting, move new group link down
2011-07-02 02:47:01 -07:00
Friendika
2d4f2f86cb
improved group-selected highlighting
2011-07-02 02:34:19 -07:00
Friendika
b1aa77584f
indicate currently selected group in group picker
2011-07-01 06:14:15 -07:00
Friendika
53653f6a4d
consolidate perrmisions sql, minor duepuntozero validation fixes
2011-06-30 17:35:35 -07:00
Fabio Comuni
762bb8de79
update oembed and widgets plugins settings form
2011-06-30 17:00:26 +02:00
Fabio Comuni
779292077c
style template field outside admin pages
2011-06-30 16:43:04 +02:00
Fabio Comuni
81e7535914
Add javascript var "baseurl"
...
Add field_richtext template
2011-06-30 16:42:27 +02:00
Fabio Comuni
f4a1820110
re-added last item date in admin user page. relative_date return 'never' if null is passed
2011-06-29 16:06:32 +02:00
Fabio Comuni
1e307e9869
Fix bug #98 , add "never" to relative_date(), fix batch operations
2011-06-29 12:05:09 +02:00
Friendika
5023eed605
change simplepie path in dispy
2011-06-28 21:30:46 -07:00
Friendika
0b221e8945
bug #96 move libraries to library - better alignment of like rotator
2011-06-28 21:11:52 -07:00
Friendika
60caa03494
darkzero textareas hard to read
2011-06-28 19:08:13 -07:00
Tobias Diekershoff
399c5aed1e
added deleteCheckedItems to jot-header.tpl
2011-06-28 13:03:19 +02:00
Friendika
1947b74e5b
some basic margins for friend suggestion screen
2011-06-27 16:18:06 -07:00
fabrixxm
cfd59f6ac8
dispy: photos display don't overflow onto sidebar
2011-06-27 18:23:03 +02:00
Friendika
c410c9013c
friend suggestions
2011-06-26 22:57:08 -07:00
Friendika
23f00aaab4
recipient ui, friend suggestions
2011-06-26 21:55:24 -07:00
Friendika
3fe1e19725
pass notify endpoint with friend suggestions
2011-06-26 19:30:57 -07:00
Friendika
59d9070d13
suggestion template
2011-06-25 19:10:38 -07:00
Fabio Comuni
e7737d2ea4
dispy: style profile tab
2011-06-23 12:36:36 +02:00
Fabio Comuni
95a933c9a2
dispy: update icons, style events
2011-06-23 12:13:04 +02:00
Fabio Comuni
5de7d0f12f
add profile tabs to "photos", "events" and "notes". in dispy, show active tab.
2011-06-23 11:30:17 +02:00
Fabio Comuni
655f5c7b9f
use "contacts/<id_contact>" url as subject id, as statusnet and twitter use urls like "domain/<id_user>".
...
This seem to make StatusNet Desktop client work better.
2011-06-21 12:00:52 +02:00
Fabio Comuni
7cd7a79807
remove duplicate tag in atom response
2011-06-21 11:44:26 +02:00
Fabio Comuni
296f1b0123
add users infos to rss and atom api responses
2011-06-21 11:41:16 +02:00
Friendika
55112cfdd0
item source
2011-06-20 19:08:40 -07:00
Friendika
db336929cd
add rate limit call so spaz will work
2011-06-20 17:16:13 -07:00
Friendika
f256e31e4f
Merge pull request #122 from tobiasd/master
...
German language stuff
2011-06-20 04:17:37 -07:00
Friendika
b86ae9de7f
use atom_time on atom entries
2011-06-20 01:38:26 -07:00
Tobias Diekershoff
f0c5a1b21b
typo and wording for the German language files
2011-06-20 09:47:42 +02:00
Friendika
b56e00c7c5
api post sort of working - output status,user need to be swapped
2011-06-19 20:13:24 -07:00
Friendika
c2dcff0d02
move profile privacy settings to the Privacy section of the Settings page
2011-06-19 16:47:03 -07:00
fabrixxm
33bafa62aa
dispy code tag style
2011-06-19 12:17:13 +02:00
fabrixxm
4bc8ab6e7d
Update dispy. Add admin link and styles, add help link, other fixes
2011-06-19 11:21:30 +02:00
fabrixxm
c10e913a4b
update admin style in loozah
2011-06-19 11:20:35 +02:00
fabrixxm
3b759585d2
fix banner in duepuntozero
2011-06-19 11:20:13 +02:00
bufalo1973
ccffd583d1
Added backslash to $name so it doesn't throws an error.
...
Añadida una barra a $name para que no dé error.
2011-06-18 14:01:49 -07:00
Friendika
cf9f23fb74
Merge pull request #118 from fabrixxm/admin
...
Admin work
2011-06-18 00:17:36 -07:00
fabrixxm
4b633d54bb
admin: fix last item date in users list, fix plugins details template
2011-06-18 08:52:51 +02:00
fabrixxm
23931ab719
Admin: add translatable strings, remove 'rino' settings, invert 'no'-setings, add "plugin_admin" hook for global plugins settings. add settings to twitter connector as example.
2011-06-18 08:29:59 +02:00
Friendika
9e2db5d5a6
tooltip for selecting items
2011-06-17 23:06:42 -07:00
Friendika
787f079d13
improved UI for checked items to be deleted
2011-06-17 22:58:15 -07:00
Friendika
fb0b22fb13
fix admin log viewer (will only read the last 5M of the log, and puts the text into a scrolling div)
2011-06-16 22:20:12 -07:00
Friendika
bb73c0b9f3
Merge branch 'pull'
2011-06-16 15:29:04 -07:00
Friendika
6709beb2ac
Merge pull request #117 from tobiasd/master
...
german strings and green background for the greenzero theme
2011-06-16 15:27:45 -07:00
Friendika
b61a7158da
Merge pull request #116 from fabrixxm/admin
...
Admin pages
2011-06-16 15:27:12 -07:00
Friendika
0f3292fefb
revup
2011-06-16 15:26:39 -07:00
Tobias Diekershoff
6802911522
put the green back in the panel background
2011-06-16 17:22:03 +02:00
Tobias Diekershoff
bca1dcf2d6
Merge branch 'master' of git://github.com/friendika/friendika
2011-06-16 15:30:51 +02:00
Fabio Comuni
a652cd5095
admin styles to loozah. missing user admin template
2011-06-16 15:08:50 +02:00
Fabio Comuni
ede011cc32
Admin users page. some fix to template processor.
2011-06-16 14:56:43 +02:00
Fabio Comuni
5f583fb8d6
Admin: register policy in site page, initial users page. Aside 'Users' link show pending registrations.
2011-06-16 12:05:35 +02:00
Friendika
c92e6ed929
avoid race condition on delete checked items
2011-06-16 00:38:41 -07:00
Friendika
e5b54e74ba
delete selected items
2011-06-15 20:43:39 -07:00
Tobias Diekershoff
dbf6ee6a05
Merge branch 'master' of git://github.com/friendika/friendika
2011-06-15 07:02:38 +02:00
Friendika
fcdebc2324
event theming
2011-06-14 20:07:40 -07:00
Friendika
5105b3febc
event calendar links, editing
2011-06-14 19:48:37 -07:00
Fabio Comuni
b7dc9f8867
Update info comments in all plugins
2011-06-14 15:08:03 +02:00
Fabio Comuni
00e142e4f7
Load plugin info from plugin file. Show README.md or README from plugin dir in plugin details page
2011-06-14 14:21:43 +02:00
Fabio Comuni
283160901f
update styles
2011-06-14 14:21:00 +02:00
Fabio Comuni
25d1637ec4
simple plugin details and log view in admin
2011-06-14 11:54:14 +02:00
Fabio Comuni
b1184f3fde
Merge remote-tracking branch 'friendika-master/master' into admin
2011-06-14 10:37:54 +02:00
Fabio Comuni
5882d8d022
Initial plugins admin page
2011-06-14 10:35:56 +02:00
Tobias Diekershoff
d08b068031
Merge branch 'master' of git://github.com/friendika/friendika
2011-06-14 08:10:38 +02:00
Friendika
fb92dbf5d6
link events + personal notes to profile tabs
2011-06-13 20:32:30 -07:00
Fabio Comuni
ab27f1393e
Admin site page
2011-06-13 18:03:06 +02:00
Fabio Comuni
a1c59d6011
Fix it strings
2011-06-13 12:53:03 +02:00
Fabio Comuni
494288ab9f
Add admin page in nav
2011-06-13 12:52:52 +02:00
Fabio Comuni
3364c2a2d8
Initial admin page
2011-06-13 12:52:29 +02:00
Tobias Diekershoff
4d3c6941ca
Merge branch 'master' of git://github.com/friendika/friendika
2011-06-11 08:33:02 +02:00
Friendika
d66056af9d
reduce visibility of lang-select flag (duepuntozero)
2011-06-10 20:39:46 -07:00
Tobias Diekershoff
8390e8b19b
Merge branch 'master' of git://github.com/friendika/friendika
2011-06-10 07:02:53 +02:00
Friendika
b857a49bfe
event publish
2011-06-09 21:23:45 -07:00
Tobias Diekershoff
7ffd0ee41a
Merge branch 'master' of git://github.com/friendika/friendika
2011-06-09 10:20:47 +02:00
Friendika
d371241e66
events
2011-06-09 00:58:45 -07:00
Friendika
df8ac668b8
more calendar work, undo strict_privacy flag to use different approach
2011-06-08 21:06:02 -07:00
Tobias Diekershoff
9ef5cb1c38
Merge branch 'master' of git://github.com/friendika/friendika
2011-06-08 07:21:19 +02:00
Friendika
33fe26ecb0
more progress on events
2011-06-07 20:10:43 -07:00
Tobias Diekershoff
e036434b8a
Merge branch 'master' of git://github.com/friendika/friendika
2011-06-07 20:03:58 +02:00
fabrixxm
16446ab0d0
update it strings
2011-06-07 11:44:20 +02:00
Friendika
9f51233451
event listings
2011-06-06 20:17:36 -07:00
Fabio Comuni
89fc56723d
Add 'attach' and 'language' icons and enable file upload in dispy template
2011-06-06 15:38:21 +02:00
Friendika
edbad772ba
add flag for experimental themes
2011-06-05 18:05:25 -07:00
Friendika
c4cec593ba
position language selector in dispy
2011-06-05 17:51:39 -07:00
Friendika
4284c6f9ee
use icon for language selector instead of hotkey
2011-06-05 17:32:56 -07:00
Tobias Diekershoff
bda839635c
Update to the German language files
2011-06-01 18:34:49 +02:00
Tobias Diekershoff
2413a6b422
Merge branch 'master' of git://github.com/friendika/friendika
2011-06-01 07:56:27 +02:00
Friendika
fc34641d4a
improve colour balance and banner on html email notifications
2011-05-31 22:41:09 -07:00
Friendika
fa986849c9
Brazilian (portugese) translation
2011-05-31 21:40:57 -07:00
Friendika
b8c4d73377
show group affiliations in contact editor
2011-05-31 19:24:26 -07:00
Tobias Diekershoff
745d075397
Merge branch 'master' of git://github.com/friendika/friendika
2011-05-31 07:36:25 +02:00
Friendika
7fb9aa24fb
bug #87 alert if email settings don't open mailbox, also display last email connect time
2011-05-29 21:20:50 -07:00
Tobias Diekershoff
087f79236e
Merge branch 'master' of git://github.com/friendika/friendika
2011-05-30 06:19:59 +02:00
Friendika
bddcc41518
Czech (cs) language
2011-05-29 20:36:21 -07:00
Tobias Diekershoff
770d1bb7a3
Merge branch 'master' of git://github.com/friendika/friendika
2011-05-28 10:37:33 +02:00
Friendika
341f853b04
search from network page
2011-05-26 17:47:33 -07:00
Tobias Diekershoff
5e01432c6f
Merge branch 'master' of git://github.com/friendika/friendika
2011-05-26 08:20:27 +02:00
Friendika
61b730d567
cleanup content type icons
2011-05-25 20:01:53 -07:00
Friendika
8e8054bc80
position the attach icon in loozah
2011-05-25 15:54:02 -07:00
Friendika
c0f529cf38
Merge pull request #111 from fabrixxm/dispy
...
fix profile images and contact selector in group editor in dispy theme
2011-05-25 15:48:02 -07:00
Tobias Diekershoff
e9df9d22c0
typo
2011-05-25 19:51:36 +02:00
Tobias Diekershoff
697e3464ab
German translations
2011-05-25 13:36:12 +02:00
Tobias Diekershoff
4a95b6361b
new german strings
2011-05-25 13:34:57 +02:00
Friendika
2a679b1164
file attachments
2011-05-25 02:08:15 -07:00
Friendika
de482058b8
fix attach icon
2011-05-24 23:01:24 -07:00
Friendika
73b4faca5c
basic file upload/attach
2011-05-24 22:40:52 -07:00
Friendika
eb152fdc24
more position tweaks on attach icons
2011-05-24 21:04:59 -07:00
Friendika
3239381447
better margins
2011-05-24 20:56:49 -07:00
Friendika
703ab6f5ee
remove padding
2011-05-24 20:52:23 -07:00
Friendika
87de839974
attachment display
2011-05-24 20:41:29 -07:00
Friendika
4447739702
attachment icons
2011-05-24 20:03:30 -07:00
Friendika
e3d1ef8ef7
ability to hide profile and wall from unknown people
2011-05-24 16:30:52 -07:00
Fabio Comuni
73040891f1
fix profile images and contact selector in group editor in dispy theme
2011-05-24 11:33:34 +02:00
Friendika
19ccd658eb
Merge branch 'pull'
2011-05-23 18:18:01 -07:00
Fabio Comuni
e1107b55c6
add info() function. Works like notice() but show messages in a div with class info-message.
...
update code to use info() instead of notice() when appropriate (non-error message)
add info-message class style in themes
2011-05-23 11:39:57 +02:00
fabrixxm
866940ab5d
fix IT string.php
2011-05-23 09:13:35 +02:00
Friendika
42acd9462a
set photo height,width as !important if changing defaults
2011-05-22 19:52:54 -07:00
Friendika
ae317296d7
missed two refs
2011-05-22 19:45:29 -07:00
Friendika
36966c72c8
wall item photos use style instead of height, width
2011-05-22 19:40:36 -07:00
Chris Case
991885f1d4
improved standards compliance of some of the tags and fixed an issue which caused text to bump-over youtube video embeds
2011-05-22 19:18:58 -07:00
Chris Case
4cff911939
merged multipart email changes
2011-05-21 21:40:16 -07:00
Chris Case
dfc05af73b
email updates
2011-05-21 19:26:51 -07:00
Chris Case
11dd0c8571
html email updates
2011-05-21 19:23:56 -07:00
Friendika
681885a120
"notes" app
2011-05-20 01:15:02 -07:00
Friendika
9ab6055b24
textlen defined outside function
2011-05-19 20:41:40 -07:00
Friendika
20807ab8b4
dispy jot-header.tpl missing some code updates
2011-05-19 20:11:09 -07:00
Friendika
a27b7fb28d
more indicators of public visibility
2011-05-19 19:55:34 -07:00
Friendika
f151565029
bug #73 - move 'view in context' and wall-item-outside-wrapper-end inside wall-item-outside-wrapper so all item content is updated with ajax.
2011-05-18 21:49:41 -07:00
Friendika
990d5e82a0
doc updates - connecting to services
2011-05-18 17:29:12 -07:00
Tobias Diekershoff
c533370873
spelling fix
2011-05-17 16:13:50 +02:00
Friendika
f9444c8be5
admin directory view
2011-05-16 18:52:27 -07:00
Friendika
8674d01432
provide textmode "micropro" (small profile display but without the photo) for better scalability of group selection tools when confronted with huge numbers of contacts
2011-05-12 18:55:28 -07:00
Friendika
0c51305c72
Merge pull request #99 from tobiasd/master
...
updats to the DE strings
2011-05-11 19:25:04 -07:00
Friendika
1ca9263c87
bug #66 , identity address string malformed if line wraps
2011-05-11 05:23:45 -07:00
Friendika
b2e92e0af3
deprecate load_view_file
2011-05-11 04:37:13 -07:00
Tobias Diekershoff
7689d81d9a
small changes to the new translations
2011-05-11 10:56:39 +02:00
Tobias Diekershoff
5609353fc3
updated the German translation
2011-05-11 10:49:07 +02:00
Friendika
5eea0d5ecb
photo lockview not working, temp fix for po2php
2011-05-10 20:10:13 -07:00
Friendika
c052d68828
don't use load_view_file() except in email templates and install of htconfig - to avoid getting wrong file when package is updated by copying over an older version.
2011-05-10 16:12:50 -07:00
Fabio Comuni
70fdba924e
Update IT strings
2011-05-10 14:20:18 +02:00
Friendika
944f1a7f4c
extra slashes in header
2011-05-10 02:18:39 -07:00
Friendika
26d748f6d8
Merge pull request #96 from fabrixxm/api
...
Status.net Api
2011-05-05 04:29:45 -07:00
Friendika
b3fa03d3b4
Merge pull request #95 from fabrixxm/dispy
...
Dispy
2011-05-05 04:29:14 -07:00
Fabio Comuni
b70a2dad33
Dispy theme works
2011-05-05 10:53:25 +02:00
Fabio Comuni
b3a5fccc9d
template for photo display
2011-05-05 10:53:03 +02:00
Friendika
6348e4e47b
contact edit tool buttons a bit crowded
2011-05-04 22:18:36 -07:00
Friendika
59fd70e568
issues with private photos - hitting internal size limits
2011-05-04 02:20:44 -07:00
Friendika
07d4cf53ad
Merge pull request #94 from fabrixxm/dispy.
...
Dispy theme
2011-05-02 15:43:27 -07:00
fabrixxm
c003dbc4a4
remove unneeded file
2011-05-02 22:04:11 +02:00
fabrixxm
d359b5088f
Merge remote-tracking branch 'origin/dispy' into dispy
2011-05-02 22:00:17 +02:00
fabrixxm
1b01eebc1e
Dispy theme works
2011-05-02 21:57:21 +02:00
Friendika
6c47f262cc
warn if msg is visible to all
2011-05-01 19:50:00 -07:00
Fabio Comuni
2f83e134f9
Dispy: fix user menu order, alignment issues, new items counters not showing up, jot acl, contact edit, location display
2011-04-29 12:37:35 +02:00
Fabio Comuni
dd053ebe22
fix icons in item toolbar and edit contact
2011-04-29 10:40:58 +02:00
fabrixxm
f6984f9929
works on dispy theme
2011-04-28 19:32:35 +02:00
fabrixxm
9393e3321d
Dispy theme
2011-04-28 19:01:46 +02:00
fabrixxm
daa7dc983b
Icons as CSS classes, hide net/home/mail/notify-update divs with no value
2011-04-28 19:01:35 +02:00
fabrixxm
976d1eaf43
API work
2011-04-27 17:46:23 +02:00
Fabio Comuni
41f6ccc039
More works on api
2011-04-21 17:03:31 +02:00
Friendika
b93b04e4a1
macro typo
2011-04-20 06:06:29 -07:00
Friendika
3787e1e500
provide disclosure warning on private network page
2011-04-19 21:09:25 -07:00
Friendika
a0179235d2
provide a way to disable mailbox integration
2011-04-18 20:20:04 -07:00
Friendika
b84f49df10
Merge branch 'translateitems' of https://github.com/fabrixxm/friendika into fabrixxm-translateitems
2011-04-18 15:51:03 -07:00
Friendika
42613902ed
sv update
2011-04-18 15:35:04 -07:00
Fabio Comuni
ee16413935
Merge remote-tracking branch 'friendika-master/master'
2011-04-18 16:58:20 +02:00
Friendika
b81eefbffb
sv language had unquoted quotes in strings
2011-04-17 23:38:12 -07:00
Friendika
229eb9c681
Merge branch 'imap'
2011-04-17 23:28:39 -07:00
Friendika
ab099e9102
email integration, cont.
2011-04-17 23:27:11 -07:00
Friendika
c347a5d6c9
sv language update
2011-04-16 15:57:24 -07:00
Fabio Comuni
62dbfffe39
darkzero theme, dark variant of duepuntozero
2011-04-15 17:15:40 +02:00
Friendika
d21144d0a3
spanish fix
2011-04-14 20:48:59 -07:00
Friendika
44c47f118c
"profile locator/address" is now called "Identity Address" to reduce confusion
2011-04-14 20:37:42 -07:00
Friendika
b5ccb8e205
ensure host xrd is correct, even if installed in subpath
2011-04-14 19:43:00 -07:00
Friendika
e88cf38604
spanish translation update
2011-04-14 15:20:25 -07:00
Friendika
54368e3a0d
initial spanish translation
2011-04-14 02:34:43 -07:00
Fabio Comuni
0afef6b17e
arrays and simple conditional blocks in template, template for nav, load templates from themes
2011-04-14 09:22:38 +02:00
Friendika
df67793559
sync recent update to loozah theme
2011-04-13 21:26:39 -07:00
Friendika
974077c06c
contact "repair/relocate URL" tool
2011-04-13 20:14:30 -07:00
Friendika
5198e039df
better visibility of default post permissions
2011-04-13 17:11:24 -07:00
Friendika
17a7dae67d
doco
2011-04-13 16:58:21 -07:00
Olivier Migeot
0c9c4c1714
Fixed plurals def
2011-04-13 14:49:44 +02:00
Olivier Migeot
e051fa3605
Merge remote branch 'mike/master'
2011-04-13 14:25:13 +02:00
Tobias Diekershoff
e28f0fe016
Typo and updates
2011-04-13 13:26:08 +02:00
Olivier Migeot
aa358b707c
More french.
2011-04-13 10:04:34 +02:00
Friendika
4a514fa966
minor ui tweaks
2011-04-12 21:29:58 -07:00
Friendika
e8a0dd40b2
profile visibility editor
2011-04-12 21:21:33 -07:00
Friendika
b52fd6c2db
Merge branch 'omigeot-master'
2011-04-12 15:18:54 -07:00
Friendika
5545c8ada9
cleanup
2011-04-12 05:37:26 -07:00
Olivier Migeot
cd491fc9a3
French translation updated to reflect the last templates conversion.
2011-04-12 13:55:48 +02:00
Olivier Migeot
85f709320b
Merge remote branch 'mike/master'
2011-04-12 13:55:43 +02:00
Friendika
61915a524d
first cut at group chooser UI
2011-04-12 01:31:55 -07:00
Friendika
6da84027af
visual display of group members
2011-04-11 22:47:16 -07:00
Friendika
de8b381149
bug #44 wallwall in loozah issue after recent template fix
2011-04-11 18:52:29 -07:00
Friendika
68731a2c39
photo menu added to wallwall template
2011-04-11 16:00:13 -07:00
Friendika
2dc7882f74
more validation fixes
2011-04-10 23:03:50 -07:00
Friendika
a0956ee955
some w3c validation issues
2011-04-10 23:01:38 -07:00
Friendika
58508201a5
bug #37 , ampersand + everything following in url is stripped when using link icon to share link
2011-04-10 03:36:12 -07:00
Friendika
0ddf84eb5a
Merge branch 'fabrixxm-master'
2011-04-08 04:46:22 -07:00
Fabio Comuni
969cc6996a
Fix a typo, updated IT strings
2011-04-08 12:35:42 +02:00
Friendika
b8479cc2f9
Merge branch 'opensearch' of https://github.com/fabrixxm/friendika into fabrixxm-opensearch
2011-04-08 01:52:01 -07:00
Fabio Comuni
1713ffb41c
add opensearch support
2011-04-08 10:40:04 +02:00
Tobias Diekershoff
c4fe889713
Updates to the German strings
2011-04-08 10:36:58 +02:00
Friendika
e35a5bac55
the rest of the english html templates except for htconfig
2011-04-07 23:10:43 -07:00
Friendika
338ba48554
more templates
2011-04-07 18:00:35 -07:00
Friendika
3a6dfb9862
Merge branch 'tobiasd-master'
2011-04-07 16:26:14 -07:00
Friendika
5d5a94c88a
comment open/close anomolies in non-English languages
2011-04-07 16:19:46 -07:00
Tobias Diekershoff
9f03e871a2
some more German translations
2011-04-07 20:50:19 +02:00
Tobias Diekershoff
818af767f9
German translation updated
2011-04-07 20:17:30 +02:00
Olivier Migeot
294577a48b
Quick fix.
2011-04-07 15:13:31 +02:00
Friendika
000efa6df0
Add some text suggesting that new folks add some basic profile information if they want to make any friends.
2011-04-06 23:38:40 -07:00
Friendika
4043ede080
more templates
2011-04-06 23:03:54 -07:00
Friendika
c32ed16303
more templates converted to string files
2011-04-06 22:42:08 -07:00
Friendika
6728a11ee3
support feed attachments/enclosures, and fix for bug #30
2011-04-06 19:42:35 -07:00
Friendika
1bba63fb60
Merge branch 'erikl-master'
...
Conflicts:
view/sv/settings.tpl
2011-04-04 15:46:33 -07:00
Friendika
a0d2747d52
Merge branch 'master' of https://github.com/erikl/friendika into erikl-master
2011-04-04 15:43:54 -07:00
erik
3e4e017ffd
Edited view/sv/pagetypes.tpl via GitHub
2011-04-04 13:22:55 -07:00
erik
0de12cd297
Edited view/sv/strings.php via GitHub
2011-04-04 12:51:58 -07:00
Fabio Comuni
92156cd840
Merge remote-tracking branch 'friendika-master/master' into iconpopup
2011-04-04 09:31:12 +02:00
Fabio Comuni
b48e82d12a
put popupmenu above all
2011-04-04 09:28:19 +02:00
erik
b2f6bf7c38
Edited view/sv/strings.php via GitHub
2011-04-03 06:01:56 -07:00
erik
89103c99ef
Edited view/sv/strings.php via GitHub
2011-04-01 11:33:46 -07:00
Fabio Comuni
8fbc606616
popup styles to loozah theme
2011-03-31 17:02:13 +02:00
Fabio Comuni
fe67c346e5
Moved popup logic in boot.php, added 'item_photo_menu' hook
2011-03-31 16:52:51 +02:00
Friendika
08032e0453
change language dynamically - bound to F8 key
2011-03-31 04:57:31 -07:00
Fabio Comuni
3f94721d62
first work
2011-03-30 17:10:14 +02:00
Olivier Migeot
ddf13d8c97
Some corrections to PO workflow, and integrated latest templates "stringization" for french.
2011-03-30 16:46:22 +02:00
Friendika
4aa60a7aaf
oexchange
2011-03-29 21:59:28 -07:00
Friendika
8357c064ae
remove obsolete template
2011-03-29 19:23:02 -07:00
Friendika
066bdca30d
optionally set article title
2011-03-29 18:57:26 -07:00
Friendika
f1db34eebc
more templates gone
2011-03-29 17:19:12 -07:00
Friendika
e1fd2ecb16
another template
2011-03-29 15:27:14 -07:00
erik
2f48135b71
Edited view/sv/settings.tpl via GitHub
2011-03-29 11:42:04 -07:00
erik
80e3241bc1
Edited view/sv/profile_edit.tpl via GitHub
2011-03-29 11:24:07 -07:00
erik
47169d71fd
Edited view/sv/settings.tpl via GitHub
2011-03-29 11:19:49 -07:00
erik
a406534c00
Edited view/sv/register_open_eml.tpl via GitHub
2011-03-29 11:10:25 -07:00
fabrixxm
341a6f90ec
Updated IT strings
2011-03-29 18:05:24 +02:00
fabrixxm
6631bc64d3
Merge remote-tracking branch 'friendika/master'
2011-03-29 18:00:19 +02:00
Friendika
6a280c321d
small wording change
2011-03-28 18:06:36 -07:00
fabrixxm
2a23147042
Updated IT strings
2011-03-28 21:19:27 +02:00
Olivier Migeot
3b709a074a
French translation considered done, yet not fully tested.
2011-03-28 19:59:16 +02:00
Olivier Migeot
581349de59
Some more templates for french translation
2011-03-28 14:31:57 +02:00
Olivier Migeot
10d44f2bb9
More french templates (except emails, everything should be ok now)
2011-03-28 13:59:05 +02:00
Olivier Migeot
c8fb1008f5
Some more templates translated to french.
2011-03-28 13:50:56 +02:00
Olivier Migeot
da546588db
Merge remote branch 'mike/master'
2011-03-28 12:11:10 +02:00
Friendika
1f6c6c466a
author collapse: close off before pagination
2011-03-28 00:49:20 -07:00
erik
4068a21b37
Edited view/sv/register_verify_eml.tpl via GitHub
2011-03-26 03:11:41 -07:00
erik
17b4f9f8a7
Edited view/sv/register_verify_eml.tpl via GitHub
2011-03-26 03:09:00 -07:00
Tobias Diekershoff
9808b0378d
fixed wrong colors for links
2011-03-25 13:03:30 +01:00
Friendika
067626380d
Merge branch 'erikl-master'
...
Conflicts:
view/sv/insecure_net.tpl
view/sv/jot-header.tpl
view/sv/msg-header.tpl
view/sv/profile_edit.tpl
view/sv/profile_tabs.tpl
view/sv/strings.php
2011-03-24 04:36:53 -07:00
Friendika
ba99ce3d0a
Merge branch 'master' of https://github.com/erikl/friendika into erikl-master
2011-03-24 04:06:01 -07:00
Friendika
51447932f7
link same as visited
2011-03-24 01:16:14 -07:00
Friendika
f0bd849555
Merge branch 'fabrixxm-master'
2011-03-23 14:32:23 -07:00
Fabio Comuni
1f1fe4d5be
Merge branch 'master' of github.com:fabrixxm/friendika
2011-03-23 14:04:35 +01:00
Fabio Comuni
4a14269349
Added plural string for contact block
2011-03-23 13:58:46 +01:00
erik
af12c696cb
Edited view/sv/strings.php via GitHub
2011-03-22 14:12:33 -07:00
erik
eb02adb163
Edited view/sv/wall_received_eml.tpl via GitHub
2011-03-22 12:22:25 -07:00
erik
93b1f32170
Edited view/sv/settings_nick_unset.tpl via GitHub
2011-03-22 12:21:15 -07:00
erik
0353b36f5d
Edited view/sv/settings_nick_subdir.tpl via GitHub
2011-03-22 12:19:04 -07:00
erik
42a5eb5d9b
Edited view/sv/settings_nick_set.tpl via GitHub
2011-03-22 12:18:09 -07:00
erik
b57b89516f
Edited view/sv/settings.tpl via GitHub
2011-03-22 12:17:25 -07:00
erik
fe7e6ad064
Edited view/sv/request_notify_eml.tpl via GitHub
2011-03-22 12:14:59 -07:00
erik
250d467f33
Edited view/sv/registrations.tpl via GitHub
2011-03-22 12:13:15 -07:00
erik
8c245a5d2f
Edited view/sv/registrations-top.tpl via GitHub
2011-03-22 12:12:23 -07:00
erik
61ba37b1ed
Edited view/sv/register_verify_eml.tpl via GitHub
2011-03-22 12:11:15 -07:00
erik
b2089c559c
Edited view/sv/register_open_eml.tpl via GitHub
2011-03-22 12:08:25 -07:00
erik
aa0915a2ad
Edited view/sv/pwdreset.tpl via GitHub
2011-03-22 12:07:38 -07:00
erik
a7601bc1a6
Edited view/sv/profile-in-netdir.tpl via GitHub
2011-03-22 12:04:06 -07:00
erik
5dae05f275
Edited view/sv/profile-in-directory.tpl via GitHub
2011-03-22 12:03:00 -07:00
erik
2856664eeb
Edited view/sv/profile-hide-friends.tpl via GitHub
2011-03-22 12:01:47 -07:00
erik
59a7ff8331
Edited view/sv/profile_tabs.tpl via GitHub
2011-03-22 12:00:49 -07:00
erik
5ead1a8599
Edited view/sv/profile_photo.tpl via GitHub
2011-03-22 11:59:50 -07:00
erik
0cbe80aeea
Edited view/sv/profile_listing_header.tpl via GitHub
2011-03-22 11:59:03 -07:00
erik
143b9ef1d5
Edited view/sv/profile_entry_default.tpl via GitHub
2011-03-22 11:58:04 -07:00
erik
6f2b633787
Edited view/sv/profile_edit.tpl via GitHub
2011-03-22 11:54:48 -07:00
erik
2e6f718f0d
Edited view/sv/profile_advanced.php via GitHub
2011-03-22 11:53:34 -07:00
erik
c7b671aa2d
Edited view/sv/profile.php via GitHub
2011-03-22 11:07:18 -07:00
erik
15ef0e601e
Edited view/sv/passchanged_eml.tpl via GitHub
2011-03-22 11:05:36 -07:00
erik
196ba3c51a
Edited view/sv/pagetypes.tpl via GitHub
2011-03-22 11:04:26 -07:00
erik
82bf55666f
Edited view/sv/msg-header.tpl via GitHub
2011-03-22 11:03:30 -07:00
erik
90826f8a7d
Edited view/sv/mail_received_text_body_eml.tpl via GitHub
2011-03-22 11:02:24 -07:00
erik
091cecec02
Edited view/sv/mail_received_html_body_eml.tpl via GitHub
2011-03-22 11:01:09 -07:00
erik
0f61fa8de1
Edited view/sv/lostpass_eml.tpl via GitHub
2011-03-22 10:59:40 -07:00
erik
d578c45ef8
Edited view/sv/lostpass.tpl via GitHub
2011-03-22 10:58:50 -07:00
erik
f88b5f75ad
Edited view/sv/jot-header.tpl via GitHub
2011-03-22 10:58:03 -07:00
erik
02975027da
Edited view/sv/intros-top.tpl via GitHub
2011-03-22 10:57:00 -07:00
erik
ea1a69c84f
Edited view/sv/intro_complete_eml.tpl via GitHub
2011-03-22 10:56:22 -07:00
erik
06b76e47d9
Edited view/sv/install_db.tpl via GitHub
2011-03-22 10:55:11 -07:00
erik
2f982c9332
Edited view/sv/insecure_net.tpl via GitHub
2011-03-22 10:54:20 -07:00
erik
d99d46631e
Edited view/sv/head.tpl via GitHub
2011-03-22 10:52:45 -07:00
erik
f8faa73fb8
Edited view/sv/group_new.tpl via GitHub
2011-03-22 10:51:30 -07:00
erik
fff72ffe27
Edited view/sv/group_edit.tpl via GitHub
2011-03-22 10:50:36 -07:00
erik
189abd2edf
Edited view/sv/friend_complete_eml.tpl via GitHub
2011-03-22 10:48:52 -07:00
erik
9b7df09e7a
Edited view/sv/follow_notify_eml.tpl via GitHub
2011-03-22 10:46:49 -07:00
erik
232ed2bdc5
Edited view/sv/directory_header.tpl via GitHub
2011-03-22 10:45:16 -07:00
erik
bc49c08dc7
Edited view/sv/dfrn_req_confirm.tpl via GitHub
2011-03-22 10:43:45 -07:00
erik
4eb8270fbe
Edited view/sv/cropbody.tpl via GitHub
2011-03-22 10:42:02 -07:00
erik
8747c12c80
Edited view/sv/contact_edit.tpl via GitHub
2011-03-22 10:41:01 -07:00
erik
6b1348c5f2
Edited view/sv/cmnt_received_eml.tpl via GitHub
2011-03-22 10:38:31 -07:00
erik
771acb9cf7
Edited view/sv/follow_notify_eml.tpl via GitHub
2011-03-22 10:36:15 -07:00
erik
8de46dbc0d
Edited view/sv/directory_header.tpl via GitHub
2011-03-22 10:33:24 -07:00
erik
6c41e6af61
Edited view/sv/dfrn_req_confirm.tpl via GitHub
2011-03-22 10:32:07 -07:00
erik
4a14e51e25
Edited view/sv/cropbody.tpl via GitHub
2011-03-22 10:29:53 -07:00
erik
7c3f3f92c9
Edited view/sv/contact_edit.tpl via GitHub
2011-03-22 10:28:44 -07:00
erik
37811e691b
Edited view/sv/cmnt_received_eml.tpl via GitHub
2011-03-22 10:26:49 -07:00
erik
26f0b37738
commit001
2011-03-22 18:09:19 +01:00
erik
2102ca2fc0
commit001
2011-03-22 18:09:19 +01:00
erik
a5bca7ea4e
commit001
2011-03-22 18:09:02 +01:00
erik
a5e1a4b1dc
Edited view/sv/group_new.tpl via GitHub
2011-03-22 07:48:22 -07:00
erik
60c9c444dc
Edited view/sv/directory_header.tpl via GitHub
2011-03-22 07:45:05 -07:00
erik
c3db186bd9
Edited view/sv/cropbody.tpl via GitHub
2011-03-22 07:42:30 -07:00
erik
29972b4005
Edited view/sv/profile_entry_default.tpl via GitHub
2011-03-22 07:27:07 -07:00
erik
9672d22797
Edited view/sv/profile_listing_header.tpl via GitHub
2011-03-22 07:26:00 -07:00
Friendika
c4b292a4f1
account/profile/contacts export
2011-03-22 03:07:46 -07:00
Olivier Migeot
19d7e7fefe
Defined plurals (as explained by Fabio)
2011-03-22 10:28:22 +01:00
Friendika
cd2a0802e4
horizontal match layout
2011-03-22 02:21:53 -07:00
Friendika
89977cd87c
de keywords not saving
2011-03-21 23:54:03 -07:00
Friendika
ee11a74d0b
profile match
2011-03-21 21:43:22 -07:00
Friendika
c74367e4c2
pagination in keyword match
2011-03-21 21:26:11 -07:00
Friendika
64e92f34d9
Merge branch 'omigeot-master'
2011-03-21 15:09:13 -07:00
Olivier Migeot
b8b77adad5
More templates frenchized
2011-03-21 14:02:01 +01:00
Olivier Migeot
0926532323
Started to convert french translation to the new format.
2011-03-21 13:45:41 +01:00
Friendika
94cbf3bb80
another template down
2011-03-21 04:10:08 -07:00
Friendika
798c83b6aa
localise some more templates
2011-03-21 00:21:35 -07:00
Friendika
5f9f03daf7
simplify insecure network warning
2011-03-20 19:29:01 -07:00
Friendika
b7292bc673
user pref -> block remote wall posting
2011-03-20 17:54:50 -07:00
Friendika
2b0af1456c
editor consistency on profile edit page
2011-03-20 15:51:09 -07:00
Fabio Comuni
894e88d792
Updated IT language
2011-03-18 14:35:41 +01:00
Friendika
9838245c6c
Merge branch 'gettext' of https://github.com/fabrixxm/friendika into fabrixxm-gettext
2011-03-18 05:07:42 -07:00
Fabio Comuni
8ef6077d4d
Update IT strings
2011-03-18 11:04:12 +01:00
Friendika
9f5201dcaa
edit posting after submission
2011-03-18 00:30:34 -07:00
Friendika
6380d22229
better colour matching on toolbar, replace "share" with "recycle"
2011-03-17 17:31:39 -07:00
Friendika
a5d5ae5efa
updated swedish templates
2011-03-17 15:26:45 -07:00
Friendika
0bce69fe9c
swedush string update via erikl
2011-03-17 14:55:25 -07:00
Friendika
40956faf6d
swedish string update via erikl
2011-03-17 14:54:15 -07:00
Friendika
6b37e6d48d
Merge branch 'master' of http://github.com/erikl/friendika into erikl-master
...
Conflicts:
view/sv/contact_edit.tpl
view/sv/strings.php
2011-03-17 14:44:06 -07:00
Friendika
334353e502
vorbis audio/video link buttons
2011-03-16 21:14:22 -07:00
Friendika
9e1ca52e45
small position adjustment
2011-03-16 20:14:19 -07:00
Friendika
3f432a7b82
share,retweet,relay,forward, whatever
2011-03-16 19:36:59 -07:00
Friendika
f01538a54f
content expiration
2011-03-15 17:31:49 -07:00
Friendika
7b92b42603
keywords split into public and private. Public will be used by the friend finder.
2011-03-14 00:28:49 -07:00
Friendika
0d161c6ef6
Merge branch 'omigeot-master'
2011-03-13 19:13:40 -07:00
Friendika
a912a0d3ca
Swedish translation
2011-03-12 03:15:38 -08:00
Friendika
ee210718cc
photo album prev/next links
2011-03-11 20:06:13 -08:00
erik
e94ae8d396
commit001
2011-03-11 20:12:32 +01:00
fabrixxm
a00beafe7f
updated strings
2011-03-11 07:28:13 +01:00
fabrixxm
692cb54d35
it messages
2011-03-11 07:12:16 +01:00
Friendika
35c3e12df5
ability to edit image permissions
2011-03-09 21:10:16 -08:00
Friendika
d6e4cd9d6b
bring loozah theme up to date, move name slightly lower
2011-03-09 17:59:26 -08:00
Friendika
ddaa751222
Merge branch 'issue-11' of https://github.com/fabrixxm/friendika into fabrixxm-issue-11
2011-03-09 02:17:44 -08:00
Fabio Comuni
a543ae6d8e
Update search_item.tpl
2011-03-09 09:33:08 +01:00
Friendika
5f54503780
Merge branch 'issue-11' of https://github.com/fabrixxm/friendika into fabrixxm-issue-11
2011-03-09 00:17:47 -08:00
Fabio Comuni
37a87b0f58
reworked wall-to-wall style
2011-03-09 08:43:17 +01:00
Friendika
0de88eb6b0
yet another template converted to language neutral format
2011-03-08 18:53:52 -08:00
Friendika
0784c072ce
Italian string file typo
2011-03-08 13:47:10 -08:00
Fabio Comuni
b00abf7e32
reworked items template
2011-03-08 16:51:14 +01:00
Fabio Comuni
e776024b3a
Fix IT strings
2011-03-08 15:40:23 +01:00
olivierm
25c674b73a
Merge remote branch 'mike/master'
2011-03-08 14:39:26 +01:00
Friendika
c248b28f92
indicate preference to register/communicate-with real people and not fictitious entities.
2011-03-08 04:06:37 -08:00
Friendika
989b1b209e
one more template free from translation, allow for later item editing within jot.tpl
2011-03-07 19:58:22 -08:00
Friendika
216f038456
icon changes, feed security improvements
2011-03-04 20:55:32 -08:00
Friendika
3c076b53fe
use prepare_text instead of prepare_body
2011-03-03 23:13:16 -08:00
Friendika
15d3be18a9
use prepare_body for text preparation
2011-03-03 22:53:20 -08:00
olivierm
593d7037c5
Slight change in strings (now guess better whether 'likes' are plural or singular)
2011-03-02 14:38:30 +01:00
Friendika
377f991ac5
switch identities to manage pages
2011-03-01 20:18:47 -08:00
Friendika
80ed4242ee
singleuser site mode plus fix search template layout
2011-02-28 19:44:47 -08:00
Tobias Diekershoff
2b2d43cce5
more strings translated to German
2011-02-27 10:24:34 +01:00
Tobias Diekershoff
efbe8a46f6
some more translations into German
2011-02-27 10:13:57 +01:00
Tobias Diekershoff
9d9efb2bee
translated some more strings to German
2011-02-27 08:35:01 +01:00
Friendika
05d3eb59ec
status.net mentions to non-followers require the numeric profile URL, not the nickname profile URL. Though it works when they are a follower.
2011-02-26 01:53:18 -08:00
Friendika
3195ad8d2e
Totally tacky...
2011-02-24 19:17:52 -08:00
Friendika
32b9546d76
provide examples for relationship partner linkage
2011-02-24 19:04:37 -08:00
olivierm
d2c47924eb
Merge commit 'mike/master'
2011-02-24 18:52:08 +01:00
Friendika
5641532936
yet another template
2011-02-24 02:46:06 -08:00
Friendika
c98ed12e10
generalise wallwall template and fix "via wall-to-wall" float
2011-02-24 02:32:46 -08:00
Friendika
a247a3cedb
another template down
2011-02-23 20:43:22 -08:00
Friendika
b92150297f
more consistency to plugins
2011-02-23 19:54:29 -08:00
Friendika
15780914ec
another template made language neutral
2011-02-23 19:30:57 -08:00
Friendika
834439b730
cleanup plugin and post settings
2011-02-23 18:24:29 -08:00