Merge lp:studentersamfundet-web into lp:studentersamfundet-web/production

[Thomas Misund]

Initial import.

We're making a production branch. Yay us!

[Thomas Misund (misund)]

Let's do this!

review: Approve

[lp:studentersamfundet-web]

201. By Thomas Misund <thomas@dolly> on 2010-11-15

Reverting to unstable code again (-r 199), revert to -r 187 before merging with lp:studentersamfundet-web/peoduction

202. By Nikolai Kristiansen on 2010-11-22

Updated opening hours and its styling.

203. By Nikolai Kristiansen on 2010-11-22

Opening hours v2

204. By Thomas Misund <thomas@dolly> on 2010-11-23

Moving social sharing buttons to below article content in nyhet.php as well.

205. By oyvinbak on 2010-11-24

image resize cache fixed both for clearing cache and handeling file modification

206. By oyvinbak on 2010-11-24

fixed bug with blank image on events

207. By oyvinbak on 2010-11-24

fixed bug with blank image on events 2

208. By oyvinbak on 2010-11-24

fixed issue with broken image

209. By oyvinbak on 2010-11-24

logging for imagecache to check performance

210. By oyvinbak on 2010-11-24

fixed bug in cache clearing

211. By oyvinbak on 2010-11-24

added max cache size

212. By Thomas Misund on 2010-11-25

Removing padding from element previously over the quickmenu.

213. By Thomas Misund on 2011-02-15

Adding sponsor Norsk Rockforbund

214. By Thomas Misund on 2011-02-15

Adding sponsor Norsk Rockforbund

215. By oyvinbak <oyvinbak@portaoli> on 2011-02-17

merged

216. By oyvinbak <email address hidden> on 2011-02-18

oppdaterte pris

217. By oyvinbak <email address hidden> on 2011-02-18

oppdaterte litt info

218. By oyvinbak <email address hidden> on 2011-02-21

added event

219. By oyvinbak <email address hidden> on 2011-02-21

Merged

220. By oyvinbak <email address hidden> on 2011-02-21

fix

221. By oyvinbak <email address hidden> on 2011-02-21

fix

222. By oyvinbak <email address hidden> on 2011-02-21

added campaign for kroplingen

223. By oyvinbak <email address hidden> on 2011-02-21

kroplingen

224. By oyvinbak <email address hidden> on 2011-02-21

kroplingen

225. By oyvinbak <email address hidden> on 2011-02-21

kroplingen

226. By oyvinbak <email address hidden> on 2011-02-21

kroplingen

227. By oyvinbak <email address hidden> on 2011-02-21

merged

228. By oyvinbak <email address hidden> on 2011-02-21

fixed time

229. By oyvinbak <email address hidden> on 2011-02-22

added bokkaféen to opening hours

230. By oyvinbak <email address hidden> on 2011-02-22

edited

231. By oyvinbak <email address hidden> on 2011-02-22

final fix

232. By oyvinbak <email address hidden> on 2011-02-22

merged with live

233. By oyvinbak <email address hidden> on 2011-03-01

removed international flag party

234. By oyvinbak <email address hidden> on 2011-03-01

removed international flagparty

235. By oyvinbak <email address hidden> on 2011-03-01

fjernet flagparty

236. By oyvinbak <email address hidden> on 2011-03-01

fixed bug in kroplingen

237. By oyvinbak <email address hidden> on 2011-03-01

skriveleif og bilde

238. By oyvinbak <email address hidden> on 2011-03-07

removed kroplingen

239. By Nikolai Kristiansen on 2011-03-08

oppdatert tlf til petter sveen

240. By Fredrik Larsen Stave <email address hidden> on 2011-03-08

Oppdaterte info pÃaa Eksternansvarlig og Foreningsansvarlig

241. By Nikolai Kristiansen on 2011-03-09

glassbaren er åpent fra 13 på hverdager

242. By Paal Braathen on 2011-03-24

Lagt inn bryggarlauget

243. By Paal Braathen on 2011-03-25

Oppdatert foreningsliste

244. By oyvinbak <email address hidden> on 2011-03-28

added afm

245. By glium337 <email address hidden> on 2011-03-28

updated encoding

246. By glium337 <email address hidden> on 2011-03-28

merged

247. By oyvinbak <email address hidden> on 2011-03-28

updated header

248. By Paal Braathen on 2011-03-31

Oppdatert kontaktinfo

249. By oyvinbak <email address hidden> on 2011-04-11

merged with live

250. By oyvinbak <email address hidden> on 2011-04-11

merged with live

251. By Nikolai Kristiansen on 2011-04-12

riktig tlfnr for kjøkkensjef. standard format mobilnr.

252. By oyvinbak <email address hidden> on 2011-04-28

fjernet notis om paasken

253. By oyvinbak <oyvinbak@portaoli> on 2011-05-22

updated from live

254. By Markus Igeland on 2011-05-27

prepareOutput setter nå tekster inn i paragrafer, slik det skal være. nl2br er for nubs. La til at man viser tittel på det man viser i nyhet.php og vis.php. KOZ OG KLEMZ <3

255. By Nikolai Kristiansen on 2011-05-30

Oppdaterte Regimet+++

256. By Nikolai Kristiansen on 2011-05-31

Link til viteboka

257. By Nikolai Kristiansen on 2011-05-31

Mergelol

258. By Mausern Testbruker on 2011-06-14

Live changes. STUDiO countdown.

259. By Mausern Testbruker on 2011-07-30

Contact info. Other live changes.

260. By oyvinbak <email address hidden> on 2011-08-08

Nye aktiv sider

261. By Mausern Testbruker on 2011-08-31

Updated opening hours (Bokkafeen) and fixed styling.

262. By Mausern Testbruker on 2011-08-31

English page link.

263. By Mausern Testbruker on 2011-08-31

Questions on membership go to <email address hidden>. Sivilarbeider-link removed.

264. By Mausern Testbruker on 2011-08-31

Aktiv-pages fixes.

265. By Mausern Testbruker on 2011-08-31

Default picture.

266. By Mausern Testbruker on 2011-08-31

Removed excuse.

267. By Mausern Testbruker on 2011-08-31

English pages.

268. By Mausern Testbruker on 2011-08-31

Moved to image ./images

269. By nikolark <email address hidden> on 2011-08-31

Updated text and program for buddy week.

270. By nikolark <email address hidden> on 2011-09-02

Default image in repo.

271. By Nikolai Kristiansen on 2011-09-02

Added sponsor images to repo.

272. By Nikolai Kristiansen on 2011-09-02

Fixed type.

273. By Nikolai Kristiansen on 2011-09-07

Updated buddy week program.

274. By Mausern Testbruker on 2011-09-07

Oktoberfest kampanje og medlemsmøte. Typo

275. By Mausern Testbruker on 2011-09-08

Update of buddy week text.

276. By oyvinbak <oyvinbak@tera> on 2011-09-20

Merged with live

277. By Nikolai Kristiansen on 2011-09-20

Added a temp 404-page.

278. By Sjur Hernes on 2011-09-21

Added rss for DNS_app

279. By Sjur Hernes on 2011-09-21

Removed bug in new file

280. By Sjur Hernes on 2011-09-21

another bug fixed

281. By Sjur Hernes on 2011-09-21

forgot to close id-tag in items

282. By Sjur Hernes on 2011-09-21

limited the feed to 100 items

283. By Sjur Hernes on 2011-09-21

test

284. By Sjur Hernes on 2011-09-21

test

285. By Sjur Hernes on 2011-09-21

tilbake til latin-1

286. By Sjur Hernes on 2011-09-21

Tried some more

287. By Sjur Hernes on 2011-09-21

more testing

288. By Sjur Hernes on 2011-09-21

lol

289. By Sjur Hernes on 2011-09-21

from decode to encode :D

290. By Sjur Hernes on 2011-09-21

siste commit for rss/lars_program_feed.php for i kveld

291. By Sjur Hernes on 2011-09-21

lol

292. By Sjur Hernes on 2011-09-21

lol

293. By Sjur Hernes on 2011-09-21

There I fixed it: rss for android app!

294. By Mausern Testbruker on 2011-10-09

Minor fix

295. By Mausern Testbruker on 2011-10-09

October fest is over.

296. By Mausern Testbruker on 2011-10-20

XML feed fix

297. By Nikolai Kristiansen on 2011-10-20

Opening hours.

298. By Mausern Testbruker on 2011-10-24

Contact info. 404 page.

299. By Nikolai Kristiansen on 2011-10-24

adds google map instead of gulesider crap

300. By srjsilver <srjsilver@tera> on 2011-10-24

fixes tag

Unmerged revisions

300. By srjsilver <srjsilver@tera> on 2011-10-24

fixes tag

299. By Nikolai Kristiansen on 2011-10-24

adds google map instead of gulesider crap

298. By Mausern Testbruker on 2011-10-24

Contact info. 404 page.

297. By Nikolai Kristiansen on 2011-10-20

Opening hours.

296. By Mausern Testbruker on 2011-10-20

XML feed fix

295. By Mausern Testbruker on 2011-10-09

October fest is over.

294. By Mausern Testbruker on 2011-10-09

Minor fix

293. By Sjur Hernes on 2011-09-21

There I fixed it: rss for android app!

292. By Sjur Hernes on 2011-09-21

lol

291. By Sjur Hernes on 2011-09-21

lol