Commit graph

4259 commits

Author SHA1 Message Date
friendica
acc4bbeb6e Merge pull request #129 from CatoTH/master
CSRF-Protection and minor changes
2012-03-13 14:36:52 -07:00
friendica
5a41676465 initial tag display for categories and save-to-file - suitable for testing but needs cleanup, links to delete term, and theming. 2012-03-13 04:04:26 -07:00
friendica
bf7425c591 click anywhere to close notifications -> zeros and bubbles 2012-03-12 20:21:32 -07:00
friendica
e12706e825 Merge branch 'pull' 2012-03-12 19:12:39 -07:00
friendica
acf75e85c8 revup 2012-03-12 19:12:00 -07:00
tomtom84
691f5b11f7 Merge pull request #128 from tomtom84/master
fixes in diabook-derivates
2012-03-12 16:40:10 -07:00
tommy tomson
8358b9247f fix css 2012-03-13 00:38:38 +01:00
tomtom84
ecc9f4ba70 Merge pull request #127 from tomtom84/master
fixes in diabook-derivates
2012-03-12 16:06:15 -07:00
tommy tomson
27bc8052d0 use fancybox instead of lightbox 2012-03-13 00:04:19 +01:00
tomtom84
8a85914e1d Merge pull request #126 from tomtom84/master
fixes in diabook-derivates
2012-03-12 15:33:29 -07:00
tommy tomson
caffb217c1 fixes 2012-03-12 23:31:54 +01:00
Tobias Hößl
59766b944c Some security against XSRF-attacks 2012-03-12 20:17:37 +00:00
tomtom84
a1305433b8 Merge pull request #125 from tomtom84/master
fixes in diabook-derivates
2012-03-12 13:11:19 -07:00
tommy tomson
9436175746 add lightbox, fixex in css 2012-03-12 21:09:16 +01:00
Tobias Hößl
9574f7df03 Merge branch 'master' of git://github.com/friendica/friendica 2012-03-12 19:06:45 +00:00
friendica
38cb4a362f Merge branch 'pull' 2012-03-12 00:57:06 -07:00
friendica
3bc990f718 more save to file backend 2012-03-11 21:32:11 -07:00
friendica
93058af4fc backend for "save to file" feature 2012-03-11 20:19:56 -07:00
Simon L'nu
9f52e3df8d fix dispy-dark photo album stuff
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-11 21:34:51 -04:00
Simon L'nu
8629d90818 Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:

* master:
2012-03-11 21:33:06 -04:00
Simon
18ef942f62 Merge pull request #124 from simonlnu/master
fix dispys' css and layout
2012-03-11 17:37:29 -07:00
Simon L'nu
e9b82bb5ee fix dispys' css and layout
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-11 20:36:16 -04:00
Simon L'nu
de70b2f30f Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
  community meta tag renamed from "ika"

* master:
2012-03-11 20:33:10 -04:00
friendica
1401f763ec Merge branch 'pull' 2012-03-11 17:09:07 -07:00
friendica
d9bee73edf community meta tag renamed from "ika" 2012-03-11 15:50:23 -07:00
Simon L'nu
6e5f837609 Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:

* master:
2012-03-11 17:05:08 -04:00
Tobias Hößl
d9cb46f0de Merge branch 'master' of git://github.com/friendica/friendica 2012-03-11 14:43:16 +00:00
Simon
1dad15a021 Merge pull request #123 from simonlnu/master
screwed up on the font-size for screen last push
2012-03-11 07:29:45 -07:00
Simon L'nu
258a8c0871 screwed up on the font-size for screen last push
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-11 10:29:12 -04:00
Simon L'nu
467aa66d37 Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:

* master:
2012-03-11 10:25:39 -04:00
Simon
ac2a81a273 Merge pull request #122 from simonlnu/master
add some '@media handheld' types for dispys
2012-03-11 07:25:27 -07:00
Simon L'nu
fa0cb8514d add some '@media handheld' types for dispys
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-11 10:24:49 -04:00
Simon
48306e1fae Merge pull request #121 from simonlnu/master
fix more stuff
2012-03-11 07:15:35 -07:00
Simon L'nu
62fe48f064 fix more stuff
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-11 10:14:31 -04:00
Simon
076393c9e7 Merge pull request #120 from simonlnu/master
fix some stuff right away
2012-03-11 06:13:10 -07:00
Simon L'nu
57d8370376 fix some stuff right away
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-11 09:12:31 -04:00
Tobias Hößl
4df08433c6 Merge branch 'master' of git://github.com/friendica/friendica 2012-03-11 11:27:47 +00:00
Simon
50863a19eb Merge pull request #119 from simonlnu/master
preliminary dispy-dark theme. WIP! did i say "WIP!"? yes, i did. WIP!
2012-03-10 22:33:40 -08:00
Simon L'nu
f7ade749b8 preliminary dispy-dark theme. WIP! did i say "WIP!"? yes, i did. WIP!
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-11 01:32:11 -05:00
Simon L'nu
dfdf0f1335 Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
  bug #328
  default the text template var on conversations
  bug #327 - composed private message is lost if no recip specified.
  revup
  fixed login-fields, fixed. notofication.png, changed locations
  German translation

* master:
2012-03-11 01:24:59 -05:00
friendica
5915325367 bug #328 2012-03-10 18:52:50 -08:00
friendica
d9c5d9d2eb default the text template var on conversations 2012-03-10 15:53:36 -08:00
friendica
1bddd48661 bug #327 - composed private message is lost if no recip specified. 2012-03-10 15:50:51 -08:00
friendica
4f606ff633 Merge branch 'pull' 2012-03-10 14:45:23 -08:00
friendica
20d1a16dbb revup 2012-03-10 14:44:43 -08:00
tomtom84
c79cb57e1e Merge pull request #118 from tomtom84/master
fixes in diabook-derivates
2012-03-10 04:24:49 -08:00
tommy tomson
0f3255467e fixed login-fields, fixed. notofication.png, changed locations 2012-03-10 13:22:41 +01:00
1e37477fdc German translation 2012-03-10 10:36:20 +01:00
Simon L'nu
665ad7e660 Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
  spec directory
  allow user to set number of items to show on network page
  revup

* master:
2012-03-10 00:15:29 -05:00
friendica
d50a839c04 Merge branch 'pull' 2012-03-09 19:50:45 -08:00