mexon/friendica
1
0
Fork 0
Code Pull requests Activity
6490 commits 5 branches 60 tags 188 MiB
Commit graph

2193 commits

Author SHA1 Message Date
Fabrixxm
fde3edaa21 quattro: readd sparkle cursor 2012-08-01 04:45:27 -04:00
Fabrixxm
bf04fb450a quattro: style for "show more" addon 2012-08-01 04:41:21 -04:00
friendica
14282a40bb Merge pull request #419 from fermionic/more-div-problems 
fix almost all errant divs in view/ and frost folders
 2012-07-31 21:58:08 -07:00
Zach Prezkuta
fc22c356ff fix almost all errant divs in view/ and frost folders 2012-07-31 22:43:18 -06:00
friendica
764ee653ba Provide backend ability to poke as a comment rather than top-level post 2012-07-31 20:59:51 -07:00
Simon L'nu
0e7f6d1417 Merge remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:
  fix /display bug; oembed audio bug; other tweaks
  Frost: reduce DOM elements by about 20%; other tweaks and fixes
  rev update
  errant div in events_reminder.tpl
  pass deleted flag to display
  rev update
  fix filer bug; some interface tweaks
  Update view/theme/frost/nav.tpl
  Update view/theme/frost-mobile/nav.tpl
  don't show birthday/event details on mobile devices
  rev update
  remove server-specific change
  update version of frost and frost-mobile
  Modify Javascript to improve page loading times
  rev update
  Friendicaland got bigger.
 2012-07-31 23:16:56 -04:00
Zach Prezkuta
885bb50f0d fix /display bug; oembed audio bug; other tweaks 2012-07-31 18:53:18 -06:00
Zach Prezkuta
b522ffeea5 Frost: reduce DOM elements by about 20%; other tweaks and fixes 2012-07-31 08:00:50 -06:00
Zach Prezkuta
72df6ff664 errant div in events_reminder.tpl 2012-07-30 07:59:08 -06:00
Domovoy
07f87848b4 Merge branch 'master' of https://github.com/friendica/friendica into threaded_items 2012-07-30 13:36:33 +02:00
Zach Prezkuta
067865db9e fix filer bug; some interface tweaks 2012-07-29 14:49:12 -06:00
Domovoy
30d7db5e42 Merge branch 'master' of https://github.com/friendica/friendica into threaded_items 2012-07-29 22:43:49 +02:00
fermionic
4f13618b18 Merge pull request #414 from 23n/patch-1 
Update view/theme/frost-mobile/nav.tpl
 2012-07-29 12:36:22 -07:00
Domovoy
2fc0fcdc18 Unlimited level threading is now a site option. 2012-07-29 19:53:04 +02:00
Domovoy
25015d3ab9 Update now handles threaded items. 2012-07-29 18:39:38 +02:00
Domovoy
8ea3087342 Collapsing is back for threaded comments. 
Comment box is displayed at the end of the thread.
Comments on comments are all collapsed
 2012-07-29 17:13:21 +02:00
23n
5b5e4b6cb7 Update view/theme/frost/nav.tpl 
moved identity/page management-link to system-menu
 2012-07-29 15:28:59 +03:00
23n
0f1b33a278 Update view/theme/frost-mobile/nav.tpl 
move identity management link to menu
 2012-07-29 15:07:52 +03:00
Domovoy
10eb873f7c Merge branch 'master' of https://github.com/friendica/friendica into threaded_items 2012-07-29 10:03:17 +02:00
Zach Prezkuta
38d4df77c6 remove server-specific change 2012-07-28 10:14:28 -06:00
Zach Prezkuta
231b37217b update version of frost and frost-mobile 2012-07-28 10:03:56 -06:00
Zach Prezkuta
1f09e7ad23 Modify Javascript to improve page loading times 
1. Add template category 'end' that places content right before final </body> tag
	2. Move most Javascript from tpl files into one cacheable file, theme.js
	3. Load scripts at end of the HTML document instead of in the header
	4. Minify several Javascript files

Note that the second and third things were only done for Frost and Frost Mobile. Doing it for every theme means going through every .tpl for every theme and rearranging the Javascript, which is tedious.
 2012-07-28 09:57:16 -06:00
Domovoy
eaf0d04bfb Comment box is now inside the item. Makes it easier to know what we are commenting on. 2012-07-27 22:58:51 +02:00
Domovoy
d558d25540 CommentBox is now hidden by default, this can be toggled with a fake link 2012-07-27 22:47:18 +02:00
Domovoy
8ecf8167db Threaded comments are starting to work. 
For now, only on normal view, and not during update
 2012-07-27 22:08:57 +02:00
Simon L'nu
c5603cf756 fixed head.tpl before the last pull. hadn't pushed and merged with upstream yet. 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-07-25 22:35:50 -04:00
Simon L'nu
794ae669ce fixes to cursor 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-07-25 22:28:09 -04:00
Fabrixxm
727c93cb8c quattro: add id to items container div 
needed to make commit 4c6a4321 work
 2012-07-25 08:12:21 -04:00
Zach Prezkuta
2e080f594e update head.tpl for dispy 2012-07-24 18:29:23 -06:00
friendica
57a75d240b Merge pull request #406 from fermionic/frost-theme 
Introducing Frost
 2012-07-24 15:28:16 -07:00
Zach Prezkuta
9378bc1375 disable tos and privacy links 2012-07-24 09:27:27 -06:00
Zach Prezkuta
178329b6dc disable tos and privacy links 2012-07-24 09:26:12 -06:00
Zach Prezkuta
f9809102a2 Introducing Frost Mobile 2012-07-24 09:16:51 -06:00
Zach Prezkuta
8126e8ea47 Introducing Frost 2012-07-24 09:15:57 -06:00
friendica
aa5e60248a Merge pull request #405 from fermionic/support-for-mobile-themes 
changes to support a mobile theme
 2012-07-23 20:18:23 -07:00
Zach Prezkuta
5cb979f5e4 changes to support a mobile theme 2012-07-23 20:37:00 -06:00
friendica
b20a80bf39 rev update 2012-07-23 15:27:25 -07:00
friendica
0ff93edeee poke privacy 2012-07-20 04:03:32 -07:00
friendica
d1243c9ad7 allow to prefill - url/poke?f=&c=nn - nn is contact id 2012-07-19 20:54:23 -07:00
friendica
a54278649f poke notifications 2012-07-19 20:13:40 -07:00
friendica
b78bd8cc94 duplicate input names 2012-07-19 19:48:33 -07:00
friendica
d442bbc482 have fun... 2012-07-19 18:17:16 -07:00
Martin Schmitt
eae6e665c0 Esperanto -> 100% 2012-07-16 22:33:23 +02:00
Simon L'nu
021f0829e6 re-add the sparkle stuff 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-07-15 12:03:53 -04:00
friendica
15cae001d9 move plink sparkles to the right html element in dispy 2012-07-13 04:22:42 -07:00
Simon L'nu
10ce535cac add doctitle thingy, and update cursor 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-07-13 04:35:16 -04:00
Simon L'nu
d08a97bb9f add some sparkle ;) 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-07-13 02:37:45 -04:00
Thomas Willingham
bd08a6b565 Add sparkle cursor to Quattro/Vier/TestBubble 2012-07-12 19:21:21 +01:00
friendica
085b589468 add some sparkle to plinks 2012-07-11 21:04:08 -07:00
tomtom84
f475850739 diabook: add notification in website-title, whenever new notifications arrive 2012-07-08 21:50:17 +02:00
Vasudev Kamath
ba4db236ec Merge branch 'master' of git://github.com/friendica/friendica 2012-07-06 22:47:27 +05:30
friendica
8b19168999 a bit more colour 2012-07-05 22:20:27 -07:00
friendica
f40b056e3b some initial code and benchmarking for "red" content rendering engine 2012-07-04 20:37:15 -07:00
friendica
fd626022ec add smarty engine, remove some obsolete zot1 stuff 2012-07-03 22:23:08 -07:00
Thomas Willingham
badaa68340 Diabook directory wide variants. 2012-07-04 01:08:50 +01:00
Zvi ben Yaakov (a.k.a rdc)
424797138f Limiting .directory-photo-wrapper styles to <section> so as not to 
interfere with .directory-photo-wrapper in <aside>
 2012-07-03 21:49:02 +03:00
friendica
f7144e671c fix diabook directory pages (only the normal style - any volunteers for the wide?) 2012-07-02 16:56:37 -07:00
Thomas Willingham
74a819980f Various theme stuff. 
Profile group list for testbubble
Screenshot for facepark
Various niggles in darkzero/NS
 2012-07-02 03:40:12 +01:00
friendica
696d78d658 Merge pull request #369 from rdc/master 
Added more profile data and CSS styling to the /directory page
 2012-07-01 16:44:21 -07:00
Martin Schmitt
85c078f862 Esperanto -> 100% 2012-07-01 19:13:24 +02:00
Zvi ben Yaakov (a.k.a rdc)
2214cd74e5 Added more profile data and CSS styling to the /directory page 2012-07-01 14:46:03 +03:00
friendica
31718968c6 advanced profile theming 2012-06-30 01:29:29 -07:00
Fabrixxm
a03e6b96ea quattro: fix Forum widget, hide edit profile link 2012-06-29 05:47:53 -04:00
Fabrixxm
8b18ee49ff quattro: some updates 
- add makefile to rebuild both css with single command
- fix icons in Forums widget
- style photos pages
 2012-06-29 05:29:58 -04:00
friendica
be658788de maintain page position when hovering on pop-outs 2012-06-28 22:19:12 -07:00
Simon L'nu
ecf9ad9a08 fix item-delete-selected* css 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-06-28 12:15:32 -04:00
friendica
eb3bbd9081 insidious little parsing bug 2012-06-26 22:32:07 -07:00
friendica
f995a11641 have no idea why the if/endif macro block was getting printed and not processed. 2012-06-26 21:35:03 -07:00
friendica
fa2a8fa9bd highlight js events-reminder on birthday events 2012-06-27 13:49:35 +10:00
friendica
359a98cd22 change event behaviour so that title is required but description is not 2012-06-25 21:20:08 -07:00
friendica
fbaca4b742 event summary/title 2012-06-25 20:55:27 -07:00
Simon L'nu
eb6bf7e7fa fix margin of wall-item-body 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-06-25 18:42:18 -04:00
Simon
d944ff7833 Merge pull request #361 from simonlnu/master 
cleaned up the css a bit
 2012-06-25 14:25:33 -07:00
Simon L'nu
2ed3af55a8 fix delete thingy, and minor clean up 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-06-25 17:17:06 -04:00
Zvi ben Yaakov (a.k.a rdc)
51ef8fb7ff Added App::get_cached_avatar_image usage for displaying "Last users" 
avatar thumbs in right sidebar
 2012-06-25 14:01:16 +03:00
friendica
35a098e0dc service limits for photo uploads 2012-06-25 01:37:44 -07:00
friendica
ad6c82bdea implement "follow" service limits 2012-06-24 22:23:17 -07:00
friendica
c464bc494c add like/dislike to profiles 2012-06-24 21:16:55 -07:00
Simon L'nu
3b1d9d9695 update jquery to 1.7.2; fix some dispy templates to be more in sync with view/ 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-06-23 13:33:58 -04:00
friendica
7614d35cad liking comments backend 2012-06-23 04:44:48 -07:00
Vasudev Kamath
6e4760dd9c Merge branch 'master' of git://github.com/friendica/friendica 2012-06-23 08:11:35 +05:30
Simon L'nu
5cfa7dd041 minor tweaks to some tpl files 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-06-22 13:07:42 -04:00
Zach Prezkuta
54c76ca822 allow rotation either CW or CCW 2012-06-20 20:51:03 -06:00
Thomas Willingham
75e82dc077 Darkzero-NS fix weeks old BBIcon error 2012-06-21 03:14:41 +01:00
Thomas Willingham
c4df339b92 Darkzero/NS - make the archives font the same colour as the other widgets. 2012-06-21 02:42:38 +01:00
Simon L'nu
0be715d271 icon change; tweak button in toolbar; move site-location 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-06-20 05:04:04 -04:00
tobiasd
79357ec60d Merge pull request #342 from fabrixxm/master 
quattro: auto scroll and flash comment in display page
 2012-06-19 10:12:09 -07:00
friendica
8b502bb486 position tweak 2012-06-19 03:34:31 -07:00
Tobias Diekershoff
c2842efd3f [DE] strings 2012-06-19 08:44:11 +02:00
Fabio Comuni
4c6a432130 quattro: in post display page, scroll to and flash selected comment 2012-06-19 06:54:41 +02:00
friendica
d614089582 make subdued elements jump out at you on hover 2012-06-17 22:50:02 -07:00
friendica
40e6d87d08 highlight the lost contact message 2012-06-14 17:41:24 -07:00
friendica
8c94fa23bf Merge https://github.com/friendica/friendica into pull 2012-06-14 17:39:17 -07:00
friendica
be090cc851 better handling of dead contacts 2012-06-14 16:56:46 -07:00
fabrixxm
2f5e891cd1 quattro theme: show uncollapsed comments on display page 2012-06-14 09:25:18 -04:00
friendica
4229debff8 ajax append placeholder, fix some html warnings 2012-06-13 21:40:02 -07:00
friendica
920ea2e1c7 archive widget 2012-06-12 20:46:30 -07:00
Vasudev Kamath
11974b4d94 Merge branch 'master' of git://github.com/friendica/friendica 2012-06-11 20:47:11 +05:30
Simon L'nu
1605bcd901 minor template update 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-06-09 18:07:19 -04:00
friendica
52d90674ea better events-reminder theming 2012-06-07 18:08:15 -07:00