Stefan Parviainen
|
386f361855
|
Autocmplete suggestions for non-local users, also suggest from visited channel's connections
|
2015-01-04 12:54:23 +01:00 |
|
friendica
|
edd1ad37c4
|
Merge branch 'master' into trinidad
|
2015-01-04 00:48:18 -08:00 |
|
friendica
|
9433a0ddc8
|
Merge https://github.com/friendica/red into pending_merge
|
2015-01-04 00:48:17 -08:00 |
|
friendica
|
028dff44cc
|
remove hard-coded url to caterva.eu from events code.
|
2015-01-04 00:47:44 -08:00 |
|
Jeroen
|
753e6809d9
|
update NL and text-background-fix in chat for alternatives schemas
|
2015-01-03 15:51:01 +00:00 |
|
marijus
|
0779e3ae53
|
provide some info for buttons
|
2015-01-03 13:42:05 +01:00 |
|
friendica
|
8d590068e9
|
Merge branch 'master' into trinidad
|
2015-01-02 23:08:11 -08:00 |
|
friendica
|
3e073f4b62
|
no newline at end of file
|
2015-01-02 23:07:37 -08:00 |
|
friendica
|
1ef1d1c2b7
|
Merge branch 'master' into trinidad
|
2015-01-02 19:22:46 -08:00 |
|
friendica
|
31648d65c8
|
some work on the edit connection workflow explanation and connedit page. This needs a lot more attention, but it was screaming for any improvement in documenting why we tell you that the permissions have been changed but not saved.
|
2015-01-02 19:20:52 -08:00 |
|
friendica
|
14239970a5
|
Merge branch 'master' into trinidad
|
2015-01-02 17:27:12 -08:00 |
|
friendica
|
ed2917118d
|
doc updates
|
2015-01-02 17:26:57 -08:00 |
|
friendica
|
3157304bbd
|
Merge branch 'master' into trinidad
|
2015-01-02 17:26:38 -08:00 |
|
RedMatrix
|
f6ab246d01
|
Merge pull request #813 from pafcu/checkboxes
Reworked switch to also display text
|
2015-01-03 09:50:24 +11:00 |
|
RedMatrix
|
ff2f7f55af
|
Merge pull request #812 from f03el/master
Use HTML entities
|
2015-01-03 09:50:05 +11:00 |
|
Stefan Parviainen
|
42773a1122
|
Reworked switch to also display text
|
2015-01-02 18:14:23 +01:00 |
|
Erik Lundin
|
53a2666114
|
Use HTML entities
|
2015-01-02 16:40:50 +01:00 |
|
pafcu
|
0e4a10c7ec
|
Merge pull request #810 from pafcu/aclsort
Sort acl results according to match position (only type='c' for now)
|
2015-01-02 13:19:18 +02:00 |
|
Stefan Parviainen
|
6b5f8bfbe4
|
Sort acl results according to match position (only type='c' for now)
|
2015-01-02 12:08:36 +01:00 |
|
friendica
|
8b844ed978
|
Merge branch 'master' into trinidad
|
2015-01-01 23:48:27 -08:00 |
|
friendica
|
c7aa8bf1b4
|
syntax issues (with some php versions?), unchecked intval
|
2015-01-01 23:47:14 -08:00 |
|
friendica
|
82d0a4af45
|
Merge branch 'master' into trinidad
|
2015-01-01 22:33:28 -08:00 |
|
friendica
|
68c612c597
|
fix shares that are processed with markdown (regression, this was pulled from diaspora2bb a couple weeks back as it was affecting diaspora input, but here we're dealing with red input only)
|
2015-01-01 22:30:54 -08:00 |
|
friendica
|
a0052f0176
|
htmlpurifier update - compatibility issue with language library autoloader
|
2015-01-01 22:18:27 -08:00 |
|
friendica
|
545e47933a
|
Merge https://github.com/friendica/red into pending_merge
|
2015-01-01 21:49:01 -08:00 |
|
friendica
|
9a34e18319
|
Merge branch 'master' into trinidad
|
2015-01-01 21:48:40 -08:00 |
|
friendica
|
0286c5a35b
|
revup
|
2015-01-01 21:48:21 -08:00 |
|
RedMatrix
|
9d4c4efb51
|
Merge pull request #808 from f03el/master
Swedish translation of frontpage + update from Transifex
|
2015-01-02 12:11:20 +11:00 |
|
RedMatrix
|
e7081db19b
|
Merge pull request #807 from pafcu/dblclicknewevent
Double click on day in calendar creates new event starting that day
|
2015-01-02 12:11:08 +11:00 |
|
RedMatrix
|
817b54688e
|
Merge pull request #805 from pafcu/moretpl
Move some HTML out to templates
|
2015-01-02 12:10:50 +11:00 |
|
RedMatrix
|
db811ca975
|
Merge pull request #804 from pafcu/areyousure
Warn about unsaved settings using jquery.areyousure
|
2015-01-02 12:10:27 +11:00 |
|
RedMatrix
|
b54235234f
|
Merge pull request #803 from pafcu/checkboxes
Checkboxyfy settings, style checkboxes as switches in redbasic
|
2015-01-02 12:10:08 +11:00 |
|
friendica
|
0a18ea58c6
|
Merge branch 'master' into trinidad
|
2015-01-01 17:08:34 -08:00 |
|
Erik Lundin
|
ffec1444e9
|
Update Swedish strings from Transifex
|
2015-01-02 00:56:28 +01:00 |
|
Erik Lundin
|
81c17cffdc
|
Swedish translation
Original translation provided by RedSwede, redswede@redmatrix.nl.
Proof-read and complemented by Erik Lundin.
|
2015-01-02 00:55:22 +01:00 |
|
Stefan Parviainen
|
1c2dc97a4a
|
Double click on day in calendar creats new event starting that day
|
2015-01-01 18:19:17 +01:00 |
|
Stefan Parviainen
|
85e76773a0
|
Use grouped select field for role selection
|
2015-01-01 15:54:16 +01:00 |
|
Stefan Parviainen
|
686b6ee118
|
Use grouped select field for timezone selection
|
2015-01-01 14:44:50 +01:00 |
|
Stefan Parviainen
|
ef94747e5e
|
Add field template for grouped selects
|
2015-01-01 14:36:17 +01:00 |
|
Stefan Parviainen
|
9557908875
|
Warn about unsaved settings using jquery.areyousure
|
2015-01-01 12:32:15 +01:00 |
|
Stefan Parviainen
|
ef6680f7ad
|
Possibly make switches work on IE8 (untested)
|
2015-01-01 11:33:00 +01:00 |
|
RedMatrix
|
93b9470487
|
Merge pull request #800 from pafcu/lang
Language names
|
2015-01-01 21:23:48 +11:00 |
|
Stefan Parviainen
|
70f0019905
|
Checkboxify yesno-fields, but use CSS to show them as switches in Redbasic
|
2015-01-01 10:08:20 +01:00 |
|
pafcu
|
26069e6ca1
|
Merge pull request #802 from friendica/revert-792-cssrefactor
Revert "Make redbasic css more modular"
|
2014-12-31 12:01:51 +02:00 |
|
pafcu
|
a00d88bbaf
|
Revert "Make redbasic css more modular"
|
2014-12-31 12:01:42 +02:00 |
|
pafcu
|
8fa27efa7e
|
Merge pull request #801 from friendica/revert-799-cssrefactor
Revert "Move mod_profiles.css content back into style.css, since it cont...
|
2014-12-31 12:01:16 +02:00 |
|
pafcu
|
8c8a10b819
|
Revert "Move mod_profiles.css content back into style.css, since it contains var..."
|
2014-12-31 12:00:47 +02:00 |
|
Stefan Parviainen
|
127527f9e9
|
Add missing vendor/-directory (due to upstream .gitignore)
|
2014-12-31 10:44:37 +01:00 |
|
Stefan Parviainen
|
7bf7f8180d
|
Revert "Revert "Language names via intl library.""
This reverts commit 4f35efa0ba .
|
2014-12-31 10:42:08 +01:00 |
|
pafcu
|
24a16434bc
|
Merge pull request #799 from pafcu/cssrefactor
Move mod_profiles.css content back into style.css, since it contains var...
|
2014-12-31 11:31:15 +02:00 |
|